Your Name 6d31441e12 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-customer into develop
* '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
2025-12-15 18:26:08 +08:00

6 lines
8.4 KiB
JavaScript

<<<<<<< HEAD
"use strict";const e=require("../../common/vendor.js"),o=require("./method.js"),r=require("./model.js"),a=require("../../gen/Enums.js");if(require("../../common/libraries/request.js"),require("../../common/store/useWeAppAuthStore.js"),require("../../gen/Apis.js"),require("../../common/store/useWorkStore.js"),require("../../common/libraries/apiLoading.js"),require("../../common/libraries/naviHelper.js"),!Array){(e.resolveComponent("hs-radio")+e.resolveComponent("hs-cell")+e.resolveComponent("hs-radio-cell-picker")+e.resolveComponent("hs-cell-textarea")+e.resolveComponent("hs-upload")+e.resolveComponent("hs-reservation-picker")+e.resolveComponent("hs-input")+e.resolveComponent("hs-footer"))()}Math||((()=>"../../components/hs-radio/hs-radio.js")+(()=>"../../components/hs-cell/hs-cell.js")+(()=>"../../components/hs-radio-cell-picker/hs-radio-cell-picker.js")+(()=>"../../components/hs-cell-textarea/hs-cell-textarea.js")+(()=>"../../components/hs-upload/hs-upload.js")+(()=>"../../components/hs-reservation-picker/hs-reservation-picker.js")+(()=>"../../components/hs-input/hs-input.js")+(()=>"../../components/hs-footer/hs-footer.js"))();const t=e.defineComponent({__name:"index",setup:t=>(e.onShow((()=>{var e;null==(e=o.method)||e.init()})),e.onUnload((()=>{r.useModel.formData.value={is_anonymous:!1}})),(t,l)=>{var u,n,s,m,i,p;return e.e({a:e.o(null==(u=e.unref(o.method))?void 0:u.handleChangeType),b:e.o((o=>e.unref(r.useModel).formData.value.type=o)),c:e.p({Enums:e.unref(a.HouseWorkOrdersTypeEnum),valueModel:e.unref(r.useModel).formData.value.type}),d:e.p({title:"工单类型",required:!0}),e:"Complaint"===e.unref(r.useModel).formData.value.type},"Complaint"===e.unref(r.useModel).formData.value.type?{f:e.o((o=>e.unref(r.useModel).formData.value.complaint_type=o)),g:e.p({Enums:e.unref(a.HouseWorkOrdersComplaintTypeEnum),title:"投诉类型",required:!0,valueModel:e.unref(r.useModel).formData.value.complaint_type})}:{},{h:"Complaint"!==e.unref(r.useModel).formData.value.type},"Complaint"!==e.unref(r.useModel).formData.value.type?{i:e.o((o=>e.unref(r.useModel).formData.value.location=o)),j:e.p({Enums:e.unref(a.HouseWorkOrdersLocationEnum),valueModel:e.unref(r.useModel).formData.value.location}),k:e.p({title:"报事位置",required:!0})}:{},{l:"Complaint"!==e.unref(r.useModel).formData.value.type&&"MyHome"===e.unref(r.useModel).formData.value.location},"Complaint"!==e.unref(r.useModel).formData.value.type&&"MyHome"===e.unref(r.useModel).formData.value.location?{m:e.o(null==(n=e.unref(o.method))?void 0:n.handleToSelectHouse),n:e.p({title:"房屋信息",required:!0,borderTop:!0,isLink:!0,value:null==(i=null==(m=null==(s=e.unref(r.useModel))?void 0:s.formData)?void 0:m.value)?void 0:i.full_name})}:{},{o:e.o((o=>e.unref(r.useModel).formData.value.content=o)),p:e.p({borderTop:!0,required:!0,title:"问题描述",placeholder:"请详细描述问题情况,包括具体位置现象等",valueModel:e.unref(r.useModel).formData.value.content}),q:e.o((o=>e.unref(r.useModel).formData.value.attachments=o)),r:e.p({borderTop:!0,title:"上传图片",count:6,valueModel:e.unref(r.useModel).formData.value.attachments}),s:"Complaint"===e.unref(r.useModel).formData.value.type},"Complaint"===e.unref(r.useModel).formData.value.type?{t:e.o(((...r)=>e.unref(o.method).handleSwitchChange&&e.unref(o.method).handleSwitchChange(...r))),v:e.p({title:"匿名投诉"})}:{},{w:"MyHome"===e.unref(r.useModel).formData.value.location&&"Complaint"!==e.unref(r.useModel).formData.value.type},"MyHome"===e.unref(r.useModel).formData.value.location&&"Complaint"!==e.unref(r.useModel).formData.value.type?{x:e.o((o=>e.unref(r.useModel).formData.value.expect_start_time=o)),y:e.o((o=>e.unref(r.useModel).formData.value.expect_end_time=o)),z:e.p({title:"期望上门时间",required:!0,valueExpectStartTime:e.unref(r.useModel).formData.value.expect_start_time,valueExpectEndTime:e.unref(r.useModel).formData.value.expect_end_time})}:{},{A:"Complaint"!==e.unref(r.useModel).formData.value.type},"Complaint"!==e.unref(r.useModel).formData.value.type?{B:e.o((o=>e.unref(r.useModel).formData.value.reporter_name=o)),C:e.p({valueModel:e.unref(r.useModel).formData.value.reporter_name}),D:e.p({title:"联系人",required:!0}),E:e.o((o=>e.unref(r.useModel).formData.value.reporter_phone=o)),F:e.p({valueModel:e.unref(r.useModel).formData.value.reporter_phone}),G:e.p({title:"联系电话",required:!0,borderTop:!0})}:{},{H:e.o(null==(p=e.unref(o.method))?void 0:p.handleSubmit),I:e.p({btnParimaryName:"提交"})})})});wx.createPage(t);
=======
"use strict";const e=require("../../common/vendor.js"),o=require("./method.js"),r=require("./model.js"),a=require("../../gen/Enums.js");if(require("../../common/libraries/request.js"),require("../../common/store/useWeAppAuthStore.js"),require("../../gen/Apis.js"),require("../../common/store/useWorkStore.js"),require("../../common/libraries/apiLoading.js"),require("../../common/libraries/naviHelper.js"),!Array){(e.resolveComponent("hs-radio-cell-picker")+e.resolveComponent("hs-cell")+e.resolveComponent("hs-cell-textarea")+e.resolveComponent("hs-upload")+e.resolveComponent("hs-reservation-picker")+e.resolveComponent("hs-input")+e.resolveComponent("hs-footer"))()}Math||((()=>"../../components/hs-radio-cell-picker/hs-radio-cell-picker.js")+(()=>"../../components/hs-cell/hs-cell.js")+(()=>"../../components/hs-cell-textarea/hs-cell-textarea.js")+(()=>"../../components/hs-upload/hs-upload.js")+(()=>"../../components/hs-reservation-picker/hs-reservation-picker.js")+(()=>"../../components/hs-input/hs-input.js")+(()=>"../../components/hs-footer/hs-footer.js"))();const t=e.defineComponent({__name:"index",setup:t=>(e.onShow((()=>{var e;null==(e=o.method)||e.init()})),e.onLoad((e=>{r.useModel.formData.value.type=(null==e?void 0:e.type)||"",r.useModel.formData.value.location=(null==e?void 0:e.location)||""})),(t,l)=>{var u,n,s,m,i;return e.e({a:"Complaint"===e.unref(r.useModel).formData.value.type},"Complaint"===e.unref(r.useModel).formData.value.type?{b:e.o((o=>e.unref(r.useModel).formData.value.complaint_type=o)),c:e.p({Enums:e.unref(a.HouseWorkOrdersComplaintTypeEnum),title:"投诉类型",borderTop:!0,required:!0,valueModel:e.unref(r.useModel).formData.value.complaint_type})}:{},{d:"Complaint"!==e.unref(r.useModel).formData.value.type&&"MyHome"===e.unref(r.useModel).formData.value.location},"Complaint"!==e.unref(r.useModel).formData.value.type&&"MyHome"===e.unref(r.useModel).formData.value.location?{e:e.o(null==(u=e.unref(o.method))?void 0:u.handleToSelectHouse),f:e.p({title:"房屋信息",required:!0,borderTop:!0,isLink:!0,value:null==(m=null==(s=null==(n=e.unref(r.useModel))?void 0:n.formData)?void 0:s.value)?void 0:m.full_name})}:{},{g:e.o((o=>e.unref(r.useModel).formData.value.content=o)),h:e.p({borderTop:!0,required:!0,title:"问题描述",placeholder:"请详细描述问题情况,包括具体位置现象等",valueModel:e.unref(r.useModel).formData.value.content}),i:e.o((o=>e.unref(r.useModel).formData.value.attachments=o)),j:e.p({borderTop:!0,title:"上传图片",count:6,valueModel:e.unref(r.useModel).formData.value.attachments}),k:"Complaint"===e.unref(r.useModel).formData.value.type},"Complaint"===e.unref(r.useModel).formData.value.type?{l:e.o(((...r)=>e.unref(o.method).handleSwitchChange&&e.unref(o.method).handleSwitchChange(...r))),m:e.p({title:"匿名投诉"})}:{},{n:"MyHome"===e.unref(r.useModel).formData.value.location&&"Complaint"!==e.unref(r.useModel).formData.value.type},"MyHome"===e.unref(r.useModel).formData.value.location&&"Complaint"!==e.unref(r.useModel).formData.value.type?{o:e.o((o=>e.unref(r.useModel).formData.value.expect_start_time=o)),p:e.o((o=>e.unref(r.useModel).formData.value.expect_end_time=o)),q:e.p({title:"期望上门时间",required:!0,valueExpectStartTime:e.unref(r.useModel).formData.value.expect_start_time,valueExpectEndTime:e.unref(r.useModel).formData.value.expect_end_time})}:{},{r:"Complaint"!==e.unref(r.useModel).formData.value.type},"Complaint"!==e.unref(r.useModel).formData.value.type?{s:e.o((o=>e.unref(r.useModel).formData.value.reporter_name=o)),t:e.p({valueModel:e.unref(r.useModel).formData.value.reporter_name}),v:e.p({title:"联系人",required:!0}),w:e.o((o=>e.unref(r.useModel).formData.value.reporter_phone=o)),x:e.p({valueModel:e.unref(r.useModel).formData.value.reporter_phone}),y:e.p({title:"联系电话",required:!0,borderTop:!0})}:{},{z:e.o(null==(i=e.unref(o.method))?void 0:i.handleSubmit),A:e.p({btnParimaryName:"提交"})})})});wx.createPage(t);
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82