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.9 KiB
JavaScript

<<<<<<< HEAD
"use strict";const e=require("../../common/vendor.js"),l=require("../../common/libraries/day.js");if(!Array){e.resolveComponent("uni-icons")()}Math;const t=e.defineComponent({__name:"hs-reservation-picker",props:["Enums","title","pickerIndex","value","borderTop","required","valueExpectStartTime","valueExpectEndTime","icon","iconSize"],emits:["change","update:valueExpectStartTime","update:valueExpectEndTime"],setup(t,{emit:o}){const u=t,a=e.ref([]),i=e.ref(""),n=e=>{var l;let t=null==(l=null==e?void 0:e.detail)?void 0:l.value,u=a.value[0][t[0]],n=a.value[1][t[1]];console.log(e,"e");let r=`${null==u?void 0:u.value} ${null==n?void 0:n.str}`,v=`${null==u?void 0:u.value} ${null==n?void 0:n.end}`;i.value=`${null==u?void 0:u.label}(${null==n?void 0:n.label})`,o("update:valueExpectStartTime",r),o("update:valueExpectEndTime",v),o("change",{str_time:r,end_time:v})},r=e=>{var t,o,u,i,n;if(0===(null==(t=null==e?void 0:e.detail)?void 0:t.column))if(null==(o=null==e?void 0:e.detail)?void 0:o.value){let t=null==(n=a.value[null==(u=null==e?void 0:e.detail)?void 0:u.column][null==(i=null==e?void 0:e.detail)?void 0:i.value])?void 0:n.value,o=l.generateTimeSlots(t);a.value[1]=o,console.log(o,"timeSlots")}else{let e=l.generateTimeSlots();a.value[1]=e,console.log(e,"timeSlots")}console.log(e,"e")};return e.onMounted((()=>{(()=>{let e=l.getCurrentHour(),t=l.getTheFutureDay(0),o=l.getTheFutureDay(1),u=l.getTheFutureDay(2),i=l.generateTimeSlots();a.value=[[{label:"今天",value:t},{label:"明天",value:o},{label:"后天",value:u}],i],console.log(e,"day1")})()})),(l,o)=>e.e({a:e.t((null==u?void 0:u.title)||"标题"),b:t.required},(t.required,{}),{c:e.t(i.value||"请选择"),d:e.p({type:"right",size:"15",color:"#999"}),e:e.n(i.value?"valueStyle":"valueStyle placeholderStyle"),f:u.borderTop?"1rpx solid #eee":"",g:a.value,h:e.o(n),i:e.o(r)})}}),o=e._export_sfc(t,[["__scopeId","data-v-eef11888"]]);wx.createComponent(o);
=======
"use strict";const e=require("../../common/vendor.js"),l=require("../../common/libraries/day.js");if(!Array){e.resolveComponent("uni-icons")()}Math;const t=e.defineComponent({__name:"hs-reservation-picker",props:["Enums","title","pickerIndex","value","borderTop","required","valueExpectStartTime","valueExpectEndTime","icon","iconSize"],emits:["change","update:valueExpectStartTime","update:valueExpectEndTime"],setup(t,{emit:o}){const u=t,a=e.ref([]),i=e.ref(""),n=e=>{var l;let t=null==(l=null==e?void 0:e.detail)?void 0:l.value,u=a.value[0][t[0]],n=a.value[1][t[1]];console.log(e,"e");let v=`${null==u?void 0:u.value} ${null==n?void 0:n.str}`,r=`${null==u?void 0:u.value} ${null==n?void 0:n.end}`;i.value=`${null==u?void 0:u.label}(${null==n?void 0:n.label})`,o("update:valueExpectStartTime",v),o("update:valueExpectEndTime",r),o("change",{str_time:v,end_time:r})},v=e=>{var t,o,u,i,n;if(0===(null==(t=null==e?void 0:e.detail)?void 0:t.column))if(null==(o=null==e?void 0:e.detail)?void 0:o.value){let t=null==(n=a.value[null==(u=null==e?void 0:e.detail)?void 0:u.column][null==(i=null==e?void 0:e.detail)?void 0:i.value])?void 0:n.value,o=l.generateTimeSlots(t);a.value[1]=o,console.log(o,"timeSlots")}else{let e=l.generateTimeSlots();a.value[1]=e,console.log(e,"timeSlots")}console.log(e,"e")};return e.onMounted((()=>{(()=>{let e=l.getCurrentHour(),t=l.getTheFutureDay(0),o=l.getTheFutureDay(1),u=l.getTheFutureDay(2),i=l.generateTimeSlots();(null==t?void 0:t.length)?a.value=[[{label:"今天",value:t},{label:"明天",value:o},{label:"后天",value:u}],i]:a.value=[[{label:"明天",value:o},{label:"后天",value:u}],i],console.log(e,"day1")})()})),(l,o)=>e.e({a:e.t((null==u?void 0:u.title)||"标题"),b:t.required},(t.required,{}),{c:e.t(i.value||"请选择"),d:e.p({type:"right",size:"15",color:"#999"}),e:e.n(i.value?"valueStyle":"valueStyle placeholderStyle"),f:u.borderTop?"1rpx solid #eee":"",g:a.value,h:e.o(n),i:e.o(v)})}}),o=e._export_sfc(t,[["__scopeId","data-v-c4882992"]]);wx.createComponent(o);
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82