6d31441e12
* '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.9 KiB
JavaScript
6 lines
6.9 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const e=require("../../common/vendor.js");require("../../common/libraries/request.js");const o=require("../../common/store/useWeAppAuthStore.js"),l=require("../../common/store/useWorkStore.js"),a=require("./model.js"),u=require("../../gen/Apis.js"),n=require("../../common/libraries/apiLoading.js"),s=require("../../common/libraries/naviHelper.js"),d=o.useWeAppAuthStore(),t=l.useWorkStore(),i={init(){var e,o,l,u,n,s,i,r,v,m,p,h,c,f,M;a.useModel.formData.value={...a.useModel.formData.value,reporter_phone:a.useModel.formData.value.reporter_phone||(null==(o=null==(e=null==d?void 0:d.data)?void 0:e.user)?void 0:o.phone)||"",reporter_name:a.useModel.formData.value.reporter_name||(null==(u=null==(l=null==d?void 0:d.data)?void 0:l.user)?void 0:u.name)||"",contact_phone:a.useModel.formData.value.contact_phone||(null==(s=null==(n=null==d?void 0:d.data)?void 0:n.user)?void 0:s.phone)},(null==(i=null==t?void 0:t.selectWorkHouse)?void 0:i.asset_house)?a.useModel.formData.value={...a.useModel.formData.value,asset_houses_id:null==(v=null==(r=null==t?void 0:t.selectWorkHouse)?void 0:r.asset_house)?void 0:v.id,full_name:null==(p=null==(m=null==t?void 0:t.selectWorkHouse)?void 0:m.asset_house)?void 0:p.full_name}:a.useModel.formData.value={...a.useModel.formData.value,asset_houses_id:null==(c=null==(h=null==d?void 0:d.data)?void 0:h.selected_house)?void 0:c.id,full_name:null==(M=null==(f=null==d?void 0:d.data)?void 0:f.selected_house)?void 0:M.full_name}},handleChangeType(e){"Complaint"===(null==e?void 0:e.value)&&(a.useModel.formData.value.location=""),console.log("handleChangeType",e)},handleSubmit(){var e,o,l,d,t,i,r,v,m,p,h,c,f,M,_,D,g,y,T,w,k,q,S,W,j,C,H,A,b;return console.log("handleSubmit",a.useModel.formData.value),(null==(l=null==(o=null==(e=a.useModel)?void 0:e.formData)?void 0:o.value)?void 0:l.type)?"Complaint"===(null==(i=null==(t=null==(d=a.useModel)?void 0:d.formData)?void 0:t.value)?void 0:i.type)||(null==(v=null==(r=a.useModel)?void 0:r.formData.value)?void 0:v.location)?"MyHome"!==(null==(h=null==(p=null==(m=a.useModel)?void 0:m.formData)?void 0:p.value)?void 0:h.location)||a.useModel.formData.value.asset_houses_id?"Complaint"!==(null==(M=null==(f=null==(c=a.useModel)?void 0:c.formData)?void 0:f.value)?void 0:M.type)||(null==(D=null==(_=a.useModel)?void 0:_.formData.value)?void 0:D.complaint_type)?a.useModel.formData.value.content?"MyHome"!==(null==(T=null==(y=null==(g=a.useModel)?void 0:g.formData)?void 0:y.value)?void 0:T.location)||"Complaint"===(null==(q=null==(k=null==(w=a.useModel)?void 0:w.formData)?void 0:k.value)?void 0:q.type)||a.useModel.formData.value.expect_start_time?"Complaint"===(null==(j=null==(W=null==(S=a.useModel)?void 0:S.formData)?void 0:W.value)?void 0:j.type)||(null==(H=null==(C=a.useModel)?void 0:C.formData.value)?void 0:H.reporter_phone)&&(null==(b=null==(A=a.useModel)?void 0:A.formData.value)?void 0:b.reporter_name)?void n.getApiLoading(u.Apis.WorkOrder.HouseWorkOrders.Store,a.useModel.formData.value).then((e=>{s.showToastBack("提交成功！",1,!0),console.log(e)})):s.showToast("请输入联系人和电话！"):s.showToast("请选择上门时间！"):s.showToast("请输入问题描述！"):s.showToast("请选择投诉类型！"):s.showToast("请选择房屋！"):s.showToast("请选择报事位置！"):s.showToast("请选择工单类型！")},handleToSelectHouse(){e.index.navigateTo({url:"/INDEX/asset_houses/index?type=work_add"})},handleSwitchChange(e){var o;a.useModel.formData.value.is_anonymous=null==(o=null==e?void 0:e.detail)?void 0:o.value,console.log(e,"e")}};exports.method=i;
|
|
=======
|
|
"use strict";const e=require("../../common/vendor.js");require("../../common/libraries/request.js");const o=require("../../common/store/useWeAppAuthStore.js"),l=require("../../common/store/useWorkStore.js"),a=require("./model.js"),u=require("../../gen/Apis.js"),s=require("../../common/libraries/apiLoading.js"),n=require("../../common/libraries/naviHelper.js"),d=o.useWeAppAuthStore(),t=l.useWorkStore(),r={init(){var e,o,l,u,s,n,r,i,v,m,h,p,c,f,_;a.useModel.formData.value={...a.useModel.formData.value,reporter_phone:a.useModel.formData.value.reporter_phone||(null==(o=null==(e=null==d?void 0:d.data)?void 0:e.user)?void 0:o.phone)||"",reporter_name:a.useModel.formData.value.reporter_name||(null==(u=null==(l=null==d?void 0:d.data)?void 0:l.user)?void 0:u.name)||"",contact_phone:a.useModel.formData.value.contact_phone||(null==(n=null==(s=null==d?void 0:d.data)?void 0:s.user)?void 0:n.phone)},(null==(r=null==t?void 0:t.selectWorkHouse)?void 0:r.asset_house)?a.useModel.formData.value={...a.useModel.formData.value,asset_houses_id:null==(v=null==(i=null==t?void 0:t.selectWorkHouse)?void 0:i.asset_house)?void 0:v.id,full_name:null==(h=null==(m=null==t?void 0:t.selectWorkHouse)?void 0:m.asset_house)?void 0:h.full_name}:a.useModel.formData.value={...a.useModel.formData.value,asset_houses_id:null==(c=null==(p=null==d?void 0:d.data)?void 0:p.selected_house)?void 0:c.id,full_name:null==(_=null==(f=null==d?void 0:d.data)?void 0:f.selected_house)?void 0:_.full_name}},handleChangeType(e){"Complaint"===(null==e?void 0:e.value)&&(a.useModel.formData.value.location=""),console.log("handleChangeType",e)},handleSubmit(){var e,o,l,d,t,r,i,v,m,h,p,c,f,_,M,D,g,y,T,k,q,w,S,W;return console.log("handleSubmit",a.useModel.formData.value),(null==(l=null==(o=null==(e=a.useModel)?void 0:e.formData)?void 0:o.value)?void 0:l.type)?"MyHome"!==(null==(r=null==(t=null==(d=a.useModel)?void 0:d.formData)?void 0:t.value)?void 0:r.location)||a.useModel.formData.value.asset_houses_id?"Complaint"!==(null==(m=null==(v=null==(i=a.useModel)?void 0:i.formData)?void 0:v.value)?void 0:m.type)||(null==(p=null==(h=a.useModel)?void 0:h.formData.value)?void 0:p.complaint_type)?a.useModel.formData.value.content?"MyHome"!==(null==(_=null==(f=null==(c=a.useModel)?void 0:c.formData)?void 0:f.value)?void 0:_.location)||"Complaint"===(null==(g=null==(D=null==(M=a.useModel)?void 0:M.formData)?void 0:D.value)?void 0:g.type)||a.useModel.formData.value.expect_start_time?"Complaint"===(null==(k=null==(T=null==(y=a.useModel)?void 0:y.formData)?void 0:T.value)?void 0:k.type)||(null==(w=null==(q=a.useModel)?void 0:q.formData.value)?void 0:w.reporter_phone)&&(null==(W=null==(S=a.useModel)?void 0:S.formData.value)?void 0:W.reporter_name)?void s.getApiLoading(u.Apis.WorkOrder.HouseWorkOrders.Store,a.useModel.formData.value).then((e=>{n.showToastBack("提交成功！",1,!0),console.log(e)})):n.showToast("请输入联系人和电话！"):n.showToast("请选择上门时间！"):n.showToast("请输入问题描述！"):n.showToast("请选择投诉类型！"):n.showToast("请选择房屋！"):n.showToast("请选择工单类型！")},handleToSelectHouse(){e.index.navigateTo({url:"/INDEX/asset_houses/index?type=work_add"})},handleSwitchChange(e){var o;a.useModel.formData.value.is_anonymous=null==(o=null==e?void 0:e.detail)?void 0:o.value,console.log(e,"e")}};exports.method=r;
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|