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

<<<<<<< HEAD
"use strict";const e=require("../../../common/vendor.js"),n=require("../../../gen/Enums.js");if(!Array){(e.resolveComponent("hs-enum-tag")+e.resolveComponent("hs-empty"))()}Math||((()=>"../../../components/hs-enum-tag/hs-enum-tag.js")+(()=>"../../../components/hs-empty/hs-empty.js"))();const t=e.defineComponent({__name:"ConvenienceServices",props:["data"],emits:["change"],setup(t,{emit:o}){const l=t,a=e.ref([]);e.ref([]);const s=e.ref("PropertyExclusive");return e.onMounted((()=>{a.value=Object.values(n.ConvenienceServicesTypeEnum)})),(t,u)=>{var v,i;return e.e({a:e.f(a.value,((t,l,a)=>({a:"8329d40b-0-"+a,b:e.p({value:null==t?void 0:t.value,Enums:e.unref(n.ConvenienceServicesTypeEnum)}),c:`items_${l}`,d:e.n("type_select_item "+(s.value===(null==t?void 0:t.value)?"type_select_item_active":"")),e:e.o((e=>{return n=null==t?void 0:t.value,s.value=n,o("change",n),void console.log("切换",n);var n}),`items_${l}`)}))),b:!(null==(v=null==l?void 0:l.data)?void 0:v.length)},(null==(i=null==l?void 0:l.data)?void 0:i.length)?{}:{c:e.p({height:"20vh"})},{d:e.f(null==l?void 0:l.data,((n,t,o)=>({a:e.t(null==n?void 0:n.name),b:e.f(null==n?void 0:n.content,((n,o,l)=>({a:e.t(null==n?void 0:n.name),b:e.t(null==n?void 0:n.phone),c:e.o((t=>{var o;(o=null==n?void 0:n.phone)&&e.index.makePhoneCall({phoneNumber:o})}),`list_${t}_${o}`),d:`list_${t}_${o}`}))),c:`list_${t}`})))})}}}),o=e._export_sfc(t,[["__scopeId","data-v-8329d40b"]]);wx.createComponent(o);
=======
"use strict";const e=require("../../../common/vendor.js"),n=require("../../../gen/Enums.js");if(!Array){e.resolveComponent("hs-enum-tag")()}Math;const o=e.defineComponent({__name:"ConvenienceServices",props:["data"],emits:["change"],setup(o,{emit:t}){const l=o,a=e.ref([]);e.ref([]);const i=e.ref("PropertyExclusive");return e.onMounted((()=>{a.value=Object.values(n.ConvenienceServicesTypeEnum)})),(o,u)=>({a:e.f(a.value,((o,l,a)=>({a:"1fce6f30-0-"+a,b:e.p({value:null==o?void 0:o.value,Enums:e.unref(n.ConvenienceServicesTypeEnum)}),c:`items_${l}`,d:e.n("type_select_item "+(i.value===(null==o?void 0:o.value)?"type_select_item_active":"")),e:e.o((e=>{return n=null==o?void 0:o.value,i.value=n,t("change",n),void console.log("切换",n);var n}),`items_${l}`)}))),b:e.f(null==l?void 0:l.data,((n,o,t)=>({a:e.t(null==n?void 0:n.name),b:e.f(null==n?void 0:n.content,((n,t,l)=>({a:e.t(null==n?void 0:n.name),b:e.t(null==n?void 0:n.phone),c:e.o((o=>{var t;(t=null==n?void 0:n.phone)&&e.index.makePhoneCall({phoneNumber:t})}),`list_${o}_${t}`),d:`list_${o}_${t}`}))),c:`list_${o}`})))})}}),t=e._export_sfc(o,[["__scopeId","data-v-1fce6f30"]]);wx.createComponent(t);
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82