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
3.5 KiB
JavaScript
6 lines
3.5 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const e=require("../../common/vendor.js"),l=require("../../gen/Apis.js"),o=require("./model.js"),d=require("../../common/libraries/apiLoading.js"),a=require("../../common/libraries/pay.js"),u=d=>{var a,u,i;l.Apis.HouseOrder.HouseOrders.Show({id:null==(i=null==(u=null==(a=o.useModel)?void 0:a.OrderInfo)?void 0:u.value)?void 0:i.id}).then((l=>{var a;o.useModel.loadingShowNumber.value+=1,o.useModel.orderShow.value=null==l?void 0:l.data,"Paid"===(null==(a=null==l?void 0:l.data)?void 0:a.order_status)&&(o.useModel.payDisabled.value=!1,clearInterval(d),o.useModel.loadingLabel.value="",e.index.hideLoading(),e.index.redirectTo({url:"/INDEX/pay/success"})),console.log("orderShow",null==l?void 0:l.data)}))},i={onPay(){var e,u,i;o.useModel.loading.value=!0,d.getApiLoading(l.Apis.HouseOrder.HouseOrders.Payment,{id:null==(i=null==(u=null==(e=o.useModel)?void 0:e.OrderInfo)?void 0:u.value)?void 0:i.id}).then((e=>{console.log("onPay",null==e?void 0:e.data),o.useModel.loading.value=!1,o.useModel.payDisabled.value=!0,a.tongLianPay(null==e?void 0:e.data,(()=>{}),(()=>{o.useModel.loading.value=!1,o.useModel.payDisabled.value=!1}))}))},loadShow:()=>{o.useModel.loadingLabel.value="更新账单中...",o.useModel.timer.value=setInterval((()=>{var l,d,a,i,r;if((null==(d=null==(l=o.useModel)?void 0:l.loadingShowNumber)?void 0:d.value)>5&&"Pending"===(null==(r=null==(i=null==(a=o.useModel)?void 0:a.orderShow)?void 0:i.value)?void 0:r.order_status))return o.useModel.loading.value=!1,o.useModel.payDisabled.value=!1,o.useModel.loadingShowNumber.value=0,o.useModel.loadingLabel.value="",e.index.hideLoading(),void clearInterval(o.useModel.timer.value);o.useModel.loadingShowNumber.value<=5&&u(o.useModel.timer.value)}),1500)},getShow:u};exports.method=i;
|
|
=======
|
|
"use strict";const e=require("../../common/vendor.js"),l=require("../../gen/Apis.js"),o=require("./model.js"),d=require("../../common/libraries/apiLoading.js"),a=require("../../common/libraries/pay.js"),u=d=>{var a,u,i;l.Apis.HouseOrder.HouseOrders.Show({id:null==(i=null==(u=null==(a=o.useModel)?void 0:a.OrderInfo)?void 0:u.value)?void 0:i.id}).then((l=>{var a;o.useModel.loadingShowNumber.value+=1,o.useModel.orderShow.value=null==l?void 0:l.data,"Paid"===(null==(a=null==l?void 0:l.data)?void 0:a.order_status)&&(o.useModel.payDisabled.value=!1,clearInterval(d),o.useModel.loadingLabel.value="",e.index.hideLoading(),e.index.redirectTo({url:"/INDEX/pay/success"})),console.log("orderShow",null==l?void 0:l.data)}))},i={onPay(){var e,u,i;o.useModel.loading.value=!0,d.getApiLoading(l.Apis.HouseOrder.HouseOrders.Payment,{id:null==(i=null==(u=null==(e=o.useModel)?void 0:e.OrderInfo)?void 0:u.value)?void 0:i.id}).then((e=>{console.log("onPay",null==e?void 0:e.data),o.useModel.loading.value=!1,o.useModel.payDisabled.value=!0,a.tongLianPay(null==e?void 0:e.data,(()=>{}),(()=>{o.useModel.loading.value=!1,o.useModel.payDisabled.value=!1}))}))},loadShow:()=>{o.useModel.loadingLabel.value="更新账单中...",o.useModel.timer.value=setInterval((()=>{var l,d,a,i,r;if((null==(d=null==(l=o.useModel)?void 0:l.loadingShowNumber)?void 0:d.value)>5&&"Pending"===(null==(r=null==(i=null==(a=o.useModel)?void 0:a.orderShow)?void 0:i.value)?void 0:r.order_status))return o.useModel.loading.value=!1,o.useModel.payDisabled.value=!1,o.useModel.loadingShowNumber.value=0,o.useModel.loadingLabel.value="",e.index.hideLoading(),void clearInterval(o.useModel.timer.value);o.useModel.loadingShowNumber.value<=5&&u(o.useModel.timer.value)}),1e3)},getShow:u};exports.method=i;
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|