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
2.6 KiB
JavaScript
6 lines
2.6 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const o=require("../../common/vendor.js");if(!Array){(o.resolveComponent("uni-icons")+o.resolveComponent("up-loading-icon"))()}Math||((()=>"../../uni_modules/uni-icons/components/uni-icons/uni-icons.js")+(()=>"../../node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js"))();const n=o.defineComponent({__name:"hs-button",props:["type","label","icon","size","openType","iconColor","buttonStyle","disabled","loading","loading_label"],emits:["click","onGetPhoneNumber"],setup(n,{emit:e}){const l=n,i=()=>{e("click")},t=o=>{var n;"getPhoneNumber:ok"===(null==(n=null==o?void 0:o.detail)?void 0:n.errMsg)&&e("onGetPhoneNumber",o)};return(n,e)=>o.e({a:null==l?void 0:l.icon},(null==l?void 0:l.icon)?{b:o.p({type:null==l?void 0:l.icon,size:"16",color:(null==l?void 0:l.iconColor)||"#0082fa"})}:{},{c:null==l?void 0:l.loading},(null==l?void 0:l.loading)?{d:o.p({mode:"circle",size:"15"})}:{},{e:o.t((null==l?void 0:l.loading_label)||(null==l?void 0:l.label)||"我是按钮"),f:o.s(l.buttonStyle),g:(null==l?void 0:l.openType)||"",h:o.n(`nchl_button ${null==l?void 0:l.type}_button ${(null==l?void 0:l.size)||"sm"}_size`),i:o.o(i),j:null==l?void 0:l.disabled,k:o.o(t)})}}),e=o._export_sfc(n,[["__scopeId","data-v-186abeaa"]]);wx.createComponent(e);
|
|
=======
|
|
"use strict";const o=require("../../common/vendor.js");if(!Array){(o.resolveComponent("uni-icons")+o.resolveComponent("up-loading-icon"))()}Math||((()=>"../../uni_modules/uni-icons/components/uni-icons/uni-icons.js")+(()=>"../../node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js"))();const n=o.defineComponent({__name:"hs-button",props:["type","label","icon","size","openType","iconColor","buttonStyle","disabled","loading","loading_label"],emits:["click","onGetPhoneNumber"],setup(n,{emit:l}){const e=n,i=()=>{l("click")},t=o=>{var n;"getPhoneNumber:ok"===(null==(n=null==o?void 0:o.detail)?void 0:n.errMsg)&&l("onGetPhoneNumber",o)};return(n,l)=>o.e({a:null==e?void 0:e.icon},(null==e?void 0:e.icon)?{b:o.p({type:null==e?void 0:e.icon,size:"16",color:(null==e?void 0:e.iconColor)||"#0082fa"})}:{},{c:null==e?void 0:e.loading},(null==e?void 0:e.loading)?{d:o.p({mode:"circle",size:"15"})}:{},{e:o.t((null==e?void 0:e.loading_label)||(null==e?void 0:e.label)||"我是按钮"),f:o.n((null==e?void 0:e.loading)||(null==e?void 0:e.icon)?"btn_text":""),g:o.s(e.buttonStyle),h:(null==e?void 0:e.openType)||"",i:o.n(`nchl_button ${null==e?void 0:e.type}_button ${(null==e?void 0:e.size)||"sm"}_size`),j:o.o(i),k:null==e?void 0:e.disabled,l:o.o(t)})}}),l=o._export_sfc(n,[["__scopeId","data-v-f4073073"]]);wx.createComponent(l);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|