* '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
4.5 KiB
JavaScript
6 lines
4.5 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const e=require("../../common/vendor.js");if(!Array){(e.resolveComponent("hs-page-head-information")+e.resolveComponent("up-icon")+e.resolveComponent("uni-icons")+e.resolveComponent("hs-footer"))()}Math||((()=>"../../components/hs-page-head-information/hs-page-head-information.js")+(()=>"../../node-modules/uview-plus/components/u-icon/u-icon.js")+(()=>"../../uni_modules/uni-icons/components/uni-icons/uni-icons.js")+(()=>"../../components/hs-footer/hs-footer.js"))();const o=e.defineComponent({__name:"index",setup(o){const l=e.ref(-1),n=e.ref([]),c=e.ref([{label:"北大门闸机",checked:!1},{label:"3座1楼大堂",checked:!1},{label:"3座负1楼",checked:!1},{label:"3座负2楼",checked:!1}]),a=[{label:"1小时",checked:!1},{label:"3小时",checked:!1},{label:"6小时",checked:!1},{label:"12小时",checked:!1},{label:"1天",checked:!1},{label:"2天",checked:!1},{label:"3天",checked:!1},{label:"4天",checked:!1}],i=()=>{var o;return(null==(o=null==n?void 0:n.value)?void 0:o.length)?(null==l?void 0:l.value)<0?(e.index.showToast({title:"请选择授权时长!",icon:"none"}),!1):void 0:(e.index.showToast({title:"请选择门禁!",icon:"none"}),!1)};return e.onShareAppMessage((()=>({title:"您的好友给您授权门禁!",path:"/INDEX/open_door/index",imageUrl:"https://pay-prod-1369486729.cos.ap-guangzhou.myqcloud.com/uploads/cs-test/01K5B5RY2TQQAJ1GT2RZSK426V.jpg"}))),(o,t)=>{var s,u;return e.e({a:e.p({title:"可以把您所在的小区下单元开门权限分享给好友,好友即可一键开门,方便快捷!"}),b:e.f(c.value,((o,l,a)=>e.e({a:"814bfff0-1-"+a,b:o.checked},o.checked?{c:"814bfff0-2-"+a,d:e.p({type:"checkbox-filled",size:"22",color:"#2A7EFB"})}:{e:"814bfff0-3-"+a,f:e.p({type:"circle",size:"22",color:"#666"})},{g:e.t(o.label),h:`item_${l}`,i:e.o((e=>(e=>{var o;c.value[e].checked=!c.value[e].checked,null==(o=null==c?void 0:c.value)||o.forEach((e=>{var o;e.checked&&(null==(o=null==n?void 0:n.value)||o.push(1))}))})(l)),`item_${l}`)}))),c:e.p({name:"lock-fill",size:"25"}),d:e.f(a,((o,n,c)=>({a:e.t(o.label),b:`item_${n}`,c:e.n("item "+(l.value===n?"active":"")),d:e.o((e=>(e=>{l.value=e})(n)),`item_${n}`)}))),e:l.value>-1&&(null==(s=n.value)?void 0:s.length)},l.value>-1&&(null==(u=n.value)?void 0:u.length)?{f:e.p({btnParimaryName:"分享给访客开门",openType:"share"})}:{g:e.o(i),h:e.p({btnParimaryName:"分享给访客开门"})})}}});o.__runtimeHooks=6,wx.createPage(o);
|
|
=======
|
|
"use strict";const e=require("../../common/vendor.js");if(!Array){(e.resolveComponent("hs-page-head-information")+e.resolveComponent("hs-footer"))()}Math||((()=>"../../components/hs-page-head-information/hs-page-head-information.js")+(()=>"../../components/hs-footer/hs-footer.js"))();const l=e.defineComponent({__name:"index",setup(l){const a=e.ref(-1),o=e.ref([]),n=e.ref([{label:"北大门闸机",checked:!1},{label:"3座1楼大堂",checked:!1},{label:"3座负1楼",checked:!1},{label:"3座负2楼",checked:!1}]),c=[{label:"1小时",checked:!1},{label:"3小时",checked:!1},{label:"6小时",checked:!1},{label:"12小时",checked:!1},{label:"1天",checked:!1},{label:"2天",checked:!1},{label:"3天",checked:!1},{label:"4天",checked:!1}],t=()=>{var l;return(null==(l=null==o?void 0:o.value)?void 0:l.length)?(null==a?void 0:a.value)<0?(e.index.showToast({title:"请选择授权时长!",icon:"none"}),!1):void 0:(e.index.showToast({title:"请选择门禁!",icon:"none"}),!1)};return e.onShareAppMessage((()=>({title:"您的好友给您授权门禁!",path:"/INDEX/open_door/index",imageUrl:"https://pay-prod-1369486729.cos.ap-guangzhou.myqcloud.com/uploads/cs-test/01K5B5RY2TQQAJ1GT2RZSK426V.jpg"}))),(l,d)=>{var h,i;return e.e({a:e.p({title:"可以把您所在的小区下单元开门权限分享给好友,好友即可一键开门,方便快捷!"}),b:e.f(n.value,((l,a,c)=>e.e({a:e.t(l.label),b:l.checked},(l.checked,{}),{c:`item_${a}`,d:e.n("item "+(l.checked?"active":"")),e:e.o((e=>(e=>{var l;n.value[e].checked=!n.value[e].checked,null==(l=null==n?void 0:n.value)||l.forEach((e=>{var l;e.checked&&(null==(l=null==o?void 0:o.value)||l.push(1))}))})(a)),`item_${a}`)}))),c:e.f(c,((l,o,n)=>({a:e.t(l.label),b:`item_${o}`,c:e.n("item "+(a.value===o?"active":"")),d:e.o((e=>(e=>{a.value=e})(o)),`item_${o}`)}))),d:a.value>-1&&(null==(h=o.value)?void 0:h.length)},a.value>-1&&(null==(i=o.value)?void 0:i.length)?{e:e.p({btnParimaryName:"分享给访客开门",openType:"share"})}:{f:e.o(t),g:e.p({btnParimaryName:"分享给访客开门"})})}}});l.__runtimeHooks=6,wx.createPage(l);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|