* '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");if(!Array){(e.resolveComponent("uni-icons")+e.resolveComponent("hs-button")+e.resolveComponent("up-keyboard"))()}Math||((()=>"../../../uni_modules/uni-icons/components/uni-icons/uni-icons.js")+(()=>"../../../components/hs-button/hs-button.js")+(()=>"../../../node-modules/uview-plus/components/u-keyboard/u-keyboard.js"))();const o=e.defineComponent({__name:"index",setup(o){const l=e.ref(["","","","","","","",""]),n=e.ref(""),u=e.ref(!1),a=e.ref("car"),s=e.ref(!0),t=()=>{s.value=!0,a.value="car",u.value=!1},v=e=>{var o,a;if((null==(o=null==n?void 0:n.value)?void 0:o.length)<8){n.value+=e;for(let e=0;e<8;e++)l.value[e]=n.value[e]||"",console.log(n.value[e])}8===(null==(a=null==n?void 0:n.value)?void 0:a.length)&&(s.value=!1,u.value=!1)},i=()=>{var e;n.value=null==(e=n.value)?void 0:e.slice(0,-1);for(let o=0;o<8;o++)l.value[o]=n.value[o]||"",console.log(n.value[o])},c=()=>{var o;(null==(o=null==n?void 0:n.value)?void 0:o.length)<7?e.index.showToast({title:"请输入完整的车牌号!",icon:"none"}):e.index.showModal({title:"提示",content:"暂不能添加车辆!",showCancel:!1,confirmColor:"#0082FA",success:function(e){e.confirm?console.log("用户点击确定"):e.cancel&&console.log("用户点击取消")}})};return(o,n)=>({a:e.p({type:"headphones",color:"#2A7EFB",size:"14"}),b:e.f(l.value,((o,l,n)=>e.e({a:!o&&7===l},o||7!==l?{d:e.t(o)}:{b:"0e44bb83-1-"+n,c:e.p({type:"plusempty",color:"#2A7EFB",size:"13"})},{e:1===l},{},{f:`iten_${l}`}))),c:e.o(t),d:e.o(c),e:e.p({label:"添加车辆",size:"md"}),f:e.sr("uKeyboard","0e44bb83-3"),g:e.o((e=>s.value=!1)),h:e.o(v),i:e.o(i),j:e.o((e=>s.value=!1)),k:e.o((e=>s.value=!1)),l:e.p({mode:a.value,show:s.value})})}});wx.createPage(o);
|
|
=======
|
|
"use strict";const e=require("../../../common/vendor.js");if(!Array){(e.resolveComponent("uni-icons")+e.resolveComponent("hs-button")+e.resolveComponent("up-keyboard"))()}Math||((()=>"../../../uni_modules/uni-icons/components/uni-icons/uni-icons.js")+(()=>"../../../components/hs-button/hs-button.js")+(()=>"../../../node-modules/uview-plus/components/u-keyboard/u-keyboard.js"))();const o=e.defineComponent({__name:"index",setup(o){const l=e.ref(["","","","","","","",""]),n=e.ref(""),u=e.ref(!1),a=e.ref("car"),s=e.ref(!0),t=()=>{s.value=!0,a.value="car",u.value=!1},v=e=>{var o,a;if((null==(o=null==n?void 0:n.value)?void 0:o.length)<8){n.value+=e;for(let e=0;e<8;e++)l.value[e]=n.value[e]||"",console.log(n.value[e])}8===(null==(a=null==n?void 0:n.value)?void 0:a.length)&&(s.value=!1,u.value=!1)},i=()=>{var e;n.value=null==(e=n.value)?void 0:e.slice(0,-1);for(let o=0;o<8;o++)l.value[o]=n.value[o]||"",console.log(n.value[o])},c=()=>{var o;(null==(o=null==n?void 0:n.value)?void 0:o.length)<7?e.index.showToast({title:"请输入完整的车牌号!",icon:"none"}):e.index.showModal({title:"提示",content:"暂不能添加车辆!",showCancel:!1,confirmColor:"#0082FA",success:function(e){e.confirm?console.log("用户点击确定"):e.cancel&&console.log("用户点击取消")}})};return(o,n)=>({a:e.f(l.value,((o,l,n)=>e.e({a:!o&&7===l},o||7!==l?{d:e.t(o)}:{b:"0e44bb83-0-"+n,c:e.p({type:"plusempty",color:"#2A7EFB",size:"13"})},{e:1===l},{},{f:`iten_${l}`}))),b:e.o(t),c:e.o(c),d:e.p({label:"添加车辆",size:"md"}),e:e.sr("uKeyboard","0e44bb83-2"),f:e.o((e=>s.value=!1)),g:e.o(v),h:e.o(i),i:e.o((e=>s.value=!1)),j:e.o((e=>s.value=!1)),k:e.p({mode:a.value,show:s.value})})}});wx.createPage(o);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|