* 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-customer: fix:更新 # Conflicts: # .env.development # ci/project.config.json # dist/build/mp-weixin/INDEX/bill/list/index.wxml # dist/build/mp-weixin/INDEX/invitation/index.js # dist/build/mp-weixin/INDEX/invitation/index.json # dist/build/mp-weixin/INDEX/invitation/index.wxml # dist/build/mp-weixin/INDEX/invitation/index.wxss # dist/build/mp-weixin/INDEX/parking_payment/index.js # dist/build/mp-weixin/INDEX/parking_payment/index.wxml # dist/build/mp-weixin/INDEX/parking_payment/index.wxss # dist/build/mp-weixin/INDEX/parking_payment_record/index.js # dist/build/mp-weixin/INDEX/parking_payment_record/index.json # dist/build/mp-weixin/INDEX/parking_payment_record/index.wxml # dist/build/mp-weixin/INDEX/parking_payment_record/index.wxss # dist/build/mp-weixin/INDEX/pay/method.js # dist/build/mp-weixin/INDEX/pay/success.js # dist/build/mp-weixin/INDEX/pay/success.wxml # dist/build/mp-weixin/INDEX/pay/success.wxss # dist/build/mp-weixin/ME/payment_pre_stored/index.js # dist/build/mp-weixin/ME/payment_pre_stored/index.wxml # dist/build/mp-weixin/ME/payment_pre_stored/index.wxss # dist/build/mp-weixin/ME/pre_stored_form/index.js # dist/build/mp-weixin/ME/pre_stored_form/index.wxml # dist/build/mp-weixin/ME/vehicle_management/add/index.js # dist/build/mp-weixin/ME/vehicle_management/add/index.wxml # dist/build/mp-weixin/ME/vehicle_management/add/index.wxss # dist/build/mp-weixin/WORKORDER/add/index.js # dist/build/mp-weixin/WORKORDER/add/index.json # dist/build/mp-weixin/WORKORDER/add/index.wxml # dist/build/mp-weixin/WORKORDER/add/method.js # dist/build/mp-weixin/WORKORDER/list/index.js # dist/build/mp-weixin/WORKORDER/list/index.wxml # dist/build/mp-weixin/WORKORDER/list/index.wxss # dist/build/mp-weixin/WORKORDER/show/index.js # dist/build/mp-weixin/WORKORDER/show/index.json # dist/build/mp-weixin/WORKORDER/show/index.wxml # dist/build/mp-weixin/WORKORDER/show/index.wxss # dist/build/mp-weixin/WORKORDER/show/method.js # dist/build/mp-weixin/WORKORDER/show/model.js # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.js # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.wxml # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.wxss # dist/build/mp-weixin/common/libraries/day.js # dist/build/mp-weixin/common/vendor.js # dist/build/mp-weixin/components/hs-button/hs-button.js # dist/build/mp-weixin/components/hs-button/hs-button.wxml # dist/build/mp-weixin/components/hs-button/hs-button.wxss # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.js # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxml # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxss # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxml # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss # dist/build/mp-weixin/gen/Apis.js # dist/build/mp-weixin/gen/Enums.js # dist/build/mp-weixin/node-modules/uview-plus/components/u-keyboard/u-keyboard.js # dist/build/mp-weixin/pages/index/components/Classification.js # dist/build/mp-weixin/pages/index/components/Classification.wxml # dist/build/mp-weixin/pages/index/components/Classification.wxss # dist/build/mp-weixin/pages/index/components/ConvenienceServices.js # dist/build/mp-weixin/pages/index/components/ConvenienceServices.json # dist/build/mp-weixin/pages/index/components/ConvenienceServices.wxml # dist/build/mp-weixin/pages/index/components/ConvenienceServices.wxss # dist/build/mp-weixin/pages/index/index.wxss # dist/build/mp-weixin/pages/me/components/AreaFunctional.js # dist/build/mp-weixin/pages/me/components/AreaFunctional.json # dist/build/mp-weixin/pages/me/components/AreaFunctional.wxml # dist/build/mp-weixin/pages/me/components/AreaFunctional.wxss # dist/build/mp-weixin/pages/transfer/index.js # dist/dev/mp-weixin/INDEX/pay/method.js # dist/dev/mp-weixin/INDEX/pay/success.wxml # dist/dev/mp-weixin/WORKORDER/add/index.js # dist/dev/mp-weixin/WORKORDER/list/index.js # dist/dev/mp-weixin/WORKORDER/list/index.json # dist/dev/mp-weixin/WORKORDER/list/index.wxml # dist/dev/mp-weixin/WORKORDER/list/index.wxss # dist/dev/mp-weixin/WORKORDER/show/index.js # dist/dev/mp-weixin/WORKORDER/show/index.json # dist/dev/mp-weixin/WORKORDER/show/index.wxml # dist/dev/mp-weixin/WORKORDER/show/index.wxss # dist/dev/mp-weixin/WORKORDER/show/model.js # dist/dev/mp-weixin/app.js # dist/dev/mp-weixin/common/libraries/day.js # dist/dev/mp-weixin/common/libraries/request.js # dist/dev/mp-weixin/common/vendor.js # dist/dev/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.js # dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js # dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss # dist/dev/mp-weixin/gen/Enums.js # dist/dev/mp-weixin/node-modules/uview-plus/components/u-keyboard/u-keyboard.js # dist/dev/mp-weixin/pages/transfer/index.js # dist/dev/mp-weixin/project.private.config.json # src/INDEX/pay/method.ts # src/INDEX/pay/success.vue # src/WORKORDER/add/index.vue # src/WORKORDER/list/index.vue # src/WORKORDER/list/style.scss # src/WORKORDER/show/index.vue # src/WORKORDER/show/model.ts # src/WORKORDER/show/style.scss # src/common/libraries/day.ts # src/components/hs-popup-evaluate/hs-popup-evaluate.vue # src/components/hs-reservation-picker/hs-reservation-picker.vue # src/gen/ApiTypes.d.ts # src/gen/Enums.ts # src/pages/transfer/index.vue
6 lines
6.5 KiB
JavaScript
6 lines
6.5 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const e=require("../../common/vendor.js"),o=require("./method.js"),n=require("./model.js"),l=require("../../gen/Enums.js");if(require("../../common/libraries/apiLoading.js"),require("../../gen/Apis.js"),require("../../common/libraries/request.js"),require("../../common/store/useWeAppAuthStore.js"),require("../../common/store/useWorkStore.js"),!Array){(e.resolveComponent("hs-tabs")+e.resolveComponent("hs-enum-tag")+e.resolveComponent("cc-scroll-loading")+e.resolveComponent("hs-footer"))()}Math||((()=>"../../components/hs-tabs/hs-tabs.js")+(()=>"../../components/hs-enum-tag/hs-enum-tag.js")+(()=>"../../common/components/cc-scroll-loading/cc-scroll-loading.js")+(()=>"../../components/hs-footer/hs-footer.js"))();const u=e.defineComponent({__name:"index",setup(u){const r=[{label:"待处理",value:"Pending"},{label:"处理中",value:"Processing"},{label:"已完成",value:"Completed"},{label:"已关闭",value:"Closed"}];return e.onShow((()=>{var e;n.useModel.formData.value.page=1,n.useModel.dataList.value=[],null==(e=o.method)||e.getList()})),(u,s)=>{var t,a,i,d,m,v,c,h,p;return{a:e.o(null==(t=e.unref(o.method))?void 0:t.handleChangeTabs),b:e.p({list:r,current:null==(i=null==(a=e.unref(n.useModel))?void 0:a.currentTabs)?void 0:i.value}),c:e.f(null==(m=null==(d=e.unref(n.useModel))?void 0:d.dataList)?void 0:m.value,((n,u,r)=>{var s;return{a:"550638e2-2-"+r+",550638e2-1",b:e.p({value:null==n?void 0:n.type,Enums:e.unref(l.HouseWorkOrdersTypeEnum)}),c:"550638e2-3-"+r+",550638e2-1",d:e.p({value:null==n?void 0:n.location,Enums:e.unref(l.HouseWorkOrdersLocationEnum)}),e:"550638e2-4-"+r+",550638e2-1",f:e.p({value:null==n?void 0:n.status,Enums:e.unref(l.HouseWorkOrdersStatusEnum)}),g:e.t(null==(s=null==n?void 0:n.asset_house)?void 0:s.full_name),h:e.t(null==n?void 0:n.content),i:e.f(null==n?void 0:n.attachments,((e,o,n)=>({a:null==e?void 0:e.url,b:`img_${u}_${o}`}))),j:`items_${u}`,k:e.o((l=>{var u;return null==(u=e.unref(o.method))?void 0:u.handleToDetail(n)}),`items_${u}`)}})),d:e.o(null==(v=e.unref(o.method))?void 0:v.handleLoad),e:e.p({meta:null==(h=null==(c=e.unref(n.useModel))?void 0:c.meta)?void 0:h.value}),f:e.o(null==(p=e.unref(o.method))?void 0:p.handleAdd),g:e.p({btnParimaryName:"新增工单"})}}}});wx.createPage(u);
|
|
=======
|
|
"use strict";const e=require("../../common/vendor.js"),o=require("./method.js"),l=require("./model.js"),t=require("../../gen/Enums.js");if(require("../../common/libraries/apiLoading.js"),require("../../gen/Apis.js"),require("../../common/libraries/request.js"),require("../../common/store/useWeAppAuthStore.js"),require("../../common/store/useWorkStore.js"),!Array){(e.resolveComponent("hs-enum-tag")+e.resolveComponent("hs-up-rate")+e.resolveComponent("hs-button")+e.resolveComponent("cc-scroll-loading")+e.resolveComponent("hs-popup-evaluate"))()}Math||(n+(()=>"../../components/hs-enum-tag/hs-enum-tag.js")+(()=>"../../components/hs-up-rate/hs-up-rate.js")+(()=>"../../components/hs-button/hs-button.js")+(()=>"../../common/components/cc-scroll-loading/cc-scroll-loading.js")+(()=>"../../components/hs-popup-evaluate/hs-popup-evaluate.js"))();const n=()=>"./components/header.js",u=e.defineComponent({__name:"index",setup:n=>(e.onShow((()=>{var e;l.useModel.formData.value.page=1,l.useModel.dataList.value=[],null==(e=o.method)||e.getList()})),(n,u)=>{var s,a,i,d,r,v,m,p,c,h;return{a:e.f(null==(a=null==(s=e.unref(l.useModel))?void 0:s.dataList)?void 0:a.value,((l,n,u)=>{var s;return e.e({a:"550638e2-2-"+u+",550638e2-1",b:e.p({value:null==l?void 0:l.type,Enums:e.unref(t.HouseWorkOrdersTypeEnum)}),c:"550638e2-3-"+u+",550638e2-1",d:e.p({value:null==l?void 0:l.location,Enums:e.unref(t.HouseWorkOrdersLocationEnum)}),e:"550638e2-4-"+u+",550638e2-1",f:e.p({value:null==l?void 0:l.status,Enums:e.unref(t.HouseWorkOrdersStatusEnum)}),g:e.n(`btn_status btn_status_${null==l?void 0:l.status}`),h:e.t(null==(s=null==l?void 0:l.asset_house)?void 0:s.full_name),i:e.t(null==l?void 0:l.content),j:(null==l?void 0:l.expect_start_time)&&"Closed"!==(null==l?void 0:l.status)&&"Completed"!==(null==l?void 0:l.status)},(null==l?void 0:l.expect_start_time)&&"Closed"!==(null==l?void 0:l.status)&&"Completed"!==(null==l?void 0:l.status)?{k:e.t(null==l?void 0:l.expect_start_time)}:{},{l:"Completed"===(null==l?void 0:l.status)&&!(null==l?void 0:l.accept_time)},"Completed"!==(null==l?void 0:l.status)||(null==l?void 0:l.accept_time)?{n:e.t(null==l?void 0:l.created_at)}:{m:e.t(null==l?void 0:l.accept_time)},{o:null==l?void 0:l.evaluation_score},(null==l?void 0:l.evaluation_score)?{p:"550638e2-5-"+u+",550638e2-1",q:e.p({valueModel:null==l?void 0:l.evaluation_score})}:{},{r:e.o((t=>{var n;return null==(n=e.unref(o.method))?void 0:n.handleToDetail(l)}),`items_${n}`),s:"Pending"!==(null==l?void 0:l.status)&&"Closed"!==(null==l?void 0:l.status)&&!(null==l?void 0:l.evaluation_score)},"Pending"===(null==l?void 0:l.status)||"Closed"===(null==l?void 0:l.status)||(null==l?void 0:l.evaluation_score)?{}:e.e({t:"Completed"===(null==l?void 0:l.status)&&!(null==l?void 0:l.evaluation_score)},"Completed"!==(null==l?void 0:l.status)||(null==l?void 0:l.evaluation_score)?{}:{v:e.o((t=>{var n;return null==(n=e.unref(o.method))?void 0:n.handleAssignEmployee(l)}),`items_${n}`),w:"550638e2-6-"+u+",550638e2-1",x:e.p({type:"ghost",label:"评价"})},{y:"PendingPayment"===(null==l?void 0:l.status)},"PendingPayment"===(null==l?void 0:l.status)?{z:e.o((t=>{var n;return null==(n=e.unref(o.method))?void 0:n.handleAssignEmployee(l)}),`items_${n}`),A:"550638e2-7-"+u+",550638e2-1",B:e.p({type:"ghost",label:"支付费用"})}:{},{C:"PendingAcceptance"===(null==l?void 0:l.status)},"PendingAcceptance"===(null==l?void 0:l.status)?{D:e.o((t=>{var n;return null==(n=e.unref(o.method))?void 0:n.handleAssignEmployee(l)}),`items_${n}`),E:"550638e2-8-"+u+",550638e2-1",F:e.p({type:"ghost",label:"验收工单"})}:{},{G:"Processing"===(null==l?void 0:l.status)},"Processing"===(null==l?void 0:l.status)?{H:e.o((t=>{var n;return null==(n=e.unref(o.method))?void 0:n.handleAssignEmployee(l)}),`items_${n}`),I:"550638e2-9-"+u+",550638e2-1",J:e.p({type:"ghost",label:"联系处理人"})}:{}),{K:`items_${n}`})})),b:e.o(null==(i=e.unref(o.method))?void 0:i.handleLoad),c:e.p({meta:null==(r=null==(d=e.unref(l.useModel))?void 0:d.meta)?void 0:r.value}),d:e.o(null==(v=e.unref(o.method))?void 0:v.handlepopupClose),e:e.o((o=>e.unref(l.useModel).showEvaluate.value=!1)),f:e.p({show:null==(p=null==(m=e.unref(l.useModel))?void 0:m.showEvaluate)?void 0:p.value,mode:"bottom",closeable:!0,round:20,params:null==(h=null==(c=e.unref(l.useModel))?void 0:c.evaluateParams)?void 0:h.value})}})});wx.createPage(u);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|