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
3.3 KiB
JavaScript

<<<<<<< HEAD
"use strict";const o=require("../../../../common/vendor.js"),e={name:"u-keyboard",data:()=>({}),mixins:[o.mpMixin,o.mixin,o.props],emits:["change","close","confirm","cancel","backspace"],methods:{change(o){this.$emit("change",o)},popupClose(){this.$emit("close")},onConfirm(){this.$emit("confirm")},onCancel(){this.$emit("cancel")},backspace(){this.$emit("backspace")}}};if(!Array){(o.resolveComponent("u-number-keyboard")+o.resolveComponent("u-car-keyboard")+o.resolveComponent("u-popup"))()}Math||((()=>"../u-number-keyboard/u-number-keyboard.js")+(()=>"../u-car-keyboard/u-car-keyboard.js")+(()=>"../u-popup/u-popup.js"))();const n=o._export_sfc(e,[["render",function(e,n,a,r,s,c){return o.e({a:e.tooltip},e.tooltip?o.e({b:e.showCancel},e.showCancel?{c:o.t(e.showCancel&&e.cancelText),d:o.o(((...o)=>c.onCancel&&c.onCancel(...o)))}:{},{e:e.showTips},e.showTips?{f:o.t(e.tips?e.tips:"number"==e.mode?"数字键盘":"card"==e.mode?"身份证键盘":"车牌号键盘")}:{},{g:e.showConfirm},e.showConfirm?{h:o.t(e.showConfirm&&e.confirmText),i:o.o(((...o)=>c.onConfirm&&c.onConfirm(...o)))}:{}):{},{j:"number"==e.mode||"card"==e.mode},"number"==e.mode||"card"==e.mode?{k:o.o(c.backspace),l:o.o(c.change),m:o.p({random:e.random,mode:e.mode,dotDisabled:e.dotDisabled})}:{n:o.o(c.backspace),o:o.o(c.change),p:o.p({random:e.random,autoChange:e.autoChange})},{q:o.o(c.popupClose),r:o.p({overlay:e.overlay,closeOnClickOverlay:e.closeOnClickOverlay,mode:"bottom",popup:!1,show:e.show,safeAreaInsetBottom:e.safeAreaInsetBottom,zIndex:e.zIndex,customStyle:{backgroundColor:"rgb(214, 218, 220)"}})})}],["__scopeId","data-v-34ba8be4"]]);wx.createComponent(n);
=======
"use strict";const o=require("../../../../common/vendor.js"),e={name:"u-keyboard",data:()=>({}),mixins:[o.mpMixin,o.mixin,o.props$1],emits:["change","close","confirm","cancel","backspace"],methods:{change(o){this.$emit("change",o)},popupClose(){this.$emit("close")},onConfirm(){this.$emit("confirm")},onCancel(){this.$emit("cancel")},backspace(){this.$emit("backspace")}}};if(!Array){(o.resolveComponent("u-number-keyboard")+o.resolveComponent("u-car-keyboard")+o.resolveComponent("u-popup"))()}Math||((()=>"../u-number-keyboard/u-number-keyboard.js")+(()=>"../u-car-keyboard/u-car-keyboard.js")+(()=>"../u-popup/u-popup.js"))();const n=o._export_sfc(e,[["render",function(e,n,a,r,s,c){return o.e({a:e.tooltip},e.tooltip?o.e({b:e.showCancel},e.showCancel?{c:o.t(e.showCancel&&e.cancelText),d:o.o(((...o)=>c.onCancel&&c.onCancel(...o)))}:{},{e:e.showTips},e.showTips?{f:o.t(e.tips?e.tips:"number"==e.mode?"数字键盘":"card"==e.mode?"身份证键盘":"车牌号键盘")}:{},{g:e.showConfirm},e.showConfirm?{h:o.t(e.showConfirm&&e.confirmText),i:o.o(((...o)=>c.onConfirm&&c.onConfirm(...o)))}:{}):{},{j:"number"==e.mode||"card"==e.mode},"number"==e.mode||"card"==e.mode?{k:o.o(c.backspace),l:o.o(c.change),m:o.p({random:e.random,mode:e.mode,dotDisabled:e.dotDisabled})}:{n:o.o(c.backspace),o:o.o(c.change),p:o.p({random:e.random,autoChange:e.autoChange})},{q:o.o(c.popupClose),r:o.p({overlay:e.overlay,closeOnClickOverlay:e.closeOnClickOverlay,mode:"bottom",popup:!1,show:e.show,safeAreaInsetBottom:e.safeAreaInsetBottom,zIndex:e.zIndex,customStyle:{backgroundColor:"rgb(214, 218, 220)"}})})}],["__scopeId","data-v-34ba8be4"]]);wx.createComponent(n);
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82