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

<<<<<<< HEAD
"use strict";const e=require("../../../common/vendor.js"),n=require("../../../common/libraries/IsHouseExist.js"),o=require("../model.js");require("../../../common/libraries/request.js"),require("../../../common/store/useWeAppAuthStore.js"),require("../../../gen/Apis.js"),require("../../../common/store/useWorkStore.js"),require("../../../common/libraries/apiLoading.js");const i=e.defineComponent({__name:"Classification",setup(i){const l=[{label:"物业缴费",icon:"jingang_icon5.svg",url:"/INDEX/bill/list/index"},{label:"房屋工单",icon:"jingang_icon3.svg",url:"/WORKORDER/list/index"},{label:"停车缴费",icon:"jingang_icon2.svg",url:"/INDEX/parking_payment/index"},{label:"小区开门",icon:"jingang_icon4.svg",url:"/INDEX/open_door/index"},{label:"访客邀请",icon:"jingang_icon1.svg",url:"/INDEX/invitation/index"}];return(i,s)=>({a:e.f(l,((i,l,s)=>{var r,u,t,c,a,d;return e.e({a:`/static/svg/${i.icon}`,b:!l&&(null==(u=null==(r=e.unref(o.useModel))?void 0:r.countBills)?void 0:u.value)},!l&&(null==(c=null==(t=e.unref(o.useModel))?void 0:t.countBills)?void 0:c.value)?{c:e.t(null==(d=null==(a=e.unref(o.useModel))?void 0:a.countBills)?void 0:d.value)}:{},{d:e.t(i.label),e:`items_${l}`,f:e.o((o=>(async o=>{n.getIsHouseExist()&&(o?e.index.navigateTo({url:o}):e.index.showModal({title:"提示",content:"该功能在当前项目暂未开放,敬请期待",confirmColor:"#0082FA",success:function(e){e.confirm?console.log("用户点击确定"):e.cancel&&console.log("用户点击取消")}}))})(null==i?void 0:i.url)),`items_${l}`)})}))})}}),l=e._export_sfc(i,[["__scopeId","data-v-4b87907d"]]);wx.createComponent(l);
=======
"use strict";const e=require("../../../common/vendor.js"),o=require("../../../common/libraries/IsHouseExist.js"),n=require("../model.js");require("../../../common/libraries/request.js"),require("../../../common/store/useWeAppAuthStore.js"),require("../../../gen/Apis.js"),require("../../../common/store/useWorkStore.js"),require("../../../common/libraries/apiLoading.js");const i=e.defineComponent({__name:"Classification",setup(i){const l=[{label:"物业缴费",icon:"jingang_icon5.svg",url:"/INDEX/bill/list/index"},{label:"工单提报",icon:"jingang_icon3.svg",url:"/ME/work_order_home/index"},{label:"停车缴费",icon:"jingang_icon2.svg",url:"/INDEX/parking_payment/index"},{label:"小区开门",icon:"jingang_icon4.svg",url:"/INDEX/open_door/index"},{label:"访客邀请",icon:"jingang_icon1.svg",url:"/INDEX/invitation/index"}];return(i,s)=>({a:e.f(l,((i,l,s)=>{var r,u,c,t,a,d;return e.e({a:`/static/svg/${i.icon}`,b:!l&&(null==(u=null==(r=e.unref(n.useModel))?void 0:r.countBills)?void 0:u.value)},!l&&(null==(t=null==(c=e.unref(n.useModel))?void 0:c.countBills)?void 0:t.value)?{c:e.t(null==(d=null==(a=e.unref(n.useModel))?void 0:a.countBills)?void 0:d.value)}:{},{d:e.t(i.label),e:`items_${l}`,f:e.o((n=>(async n=>{o.getIsHouseExist()&&(n?e.index.navigateTo({url:n}):e.index.showModal({title:"提示",content:"该功能在当前项目暂未开放,敬请期待",confirmColor:"#0082FA",success:function(e){e.confirm?console.log("用户点击确定"):e.cancel&&console.log("用户点击取消")}}))})(null==i?void 0:i.url)),`items_${l}`)})}))})}}),l=e._export_sfc(i,[["__scopeId","data-v-200ec39d"]]);wx.createComponent(l);
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82