* '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
2.8 KiB
JavaScript
6 lines
2.8 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const e=require("../../common/vendor.js"),o=require("../../common/libraries/userUserLogin.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"),!Array){e.resolveComponent("hs-footer")()}Math;const n=e.defineComponent({__name:"index",setup(n){const r=e.ref(!1);return e.onShow((async()=>{var n,i,s;if(await(null==(n=e.getCurrentInstance())?void 0:n.appContext.config.globalProperties.$onLaunched),null==(i=o.getUserLogin)?void 0:i.getLoginStatus()){const o=e.index.getEnterOptionsSync();let n=null==o?void 0:o.query;if(null==n?void 0:n.scene){let o=null==(s=null==n?void 0:n.scene)?void 0:s.split("_");"order"===o[0]&&e.index.redirectTo({url:`/INDEX/pay/index?id=${o[1]}`})}else r.value=!0}else e.index.showModal({title:"提示",content:"检测到您还未登录,是否去登录?",confirmText:"去登录",cancelText:"返回首页",confirmColor:"#0082FA",success:function(o){o.confirm?(e.index.redirectTo({url:"/pages/login?source=transfer"}),console.log("用户点击确定")):o.cancel&&(e.index.switchTab({url:"/pages/index/index"}),console.log("用户点击取消"))}})})),(o,n)=>e.e({a:!r.value},r.value?{b:e.p({btnParimaryName:"返回首页"})}:{})}});wx.createPage(n);
|
|
=======
|
|
"use strict";const e=require("../../common/vendor.js"),n=require("../../common/libraries/userUserLogin.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"),!Array){e.resolveComponent("hs-footer")()}Math;const o=e.defineComponent({__name:"index",setup(o){const r=e.ref(!1);return e.onShow((async()=>{var o,i,s;if(await(null==(o=e.getCurrentInstance())?void 0:o.appContext.config.globalProperties.$onLaunched),null==(i=n.getUserLogin)?void 0:i.getLoginStatus()){const n=e.index.getEnterOptionsSync();let o=null==n?void 0:n.query;if(null==o?void 0:o.scene){let n=null==(s=null==o?void 0:o.scene)?void 0:s.split("_");"order"===n[0]&&e.index.redirectTo({url:`/INDEX/pay/index?id=${n[1]}`}),"1"===n[0]&&e.index.redirectTo({url:`/WORKORDER/pay/index?id=${n[1]}`})}else r.value=!0}else e.index.showModal({title:"提示",content:"检测到您还未登录,是否去登录?",confirmText:"去登录",cancelText:"返回首页",confirmColor:"#0082FA",success:function(n){n.confirm?(e.index.redirectTo({url:"/pages/login?source=transfer"}),console.log("用户点击确定")):n.cancel&&(e.index.switchTab({url:"/pages/index/index"}),console.log("用户点击取消"))}})})),(n,o)=>e.e({a:!r.value},r.value?{b:e.p({btnParimaryName:"返回首页"})}:{})}});wx.createPage(o);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|