6d31441e12
* '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.0 KiB
JavaScript
6 lines
4.0 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const e=require("../../../common/vendor.js"),o=require("../model.js"),n=require("../../../common/libraries/IsHouseExist.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:"AreaFunctional",setup(i){const l=[{label:"房屋管理",icon:"HouseIcon",url:"/INDEX/archive_houses/index"},{label:"我的事项",icon:"IconReview",url:"/INDEX/owner_audit_list/index"},{label:"我的活动",icon:"IconEvent",url:"/ME/activities_list/index"},{label:"关于我们",icon:"AboutUs",url:"https://mp.weixin.qq.com/s/g-l92Xrzb5pRlGcyS99M3Q",type:"H5"},{label:"意见反馈",icon:"Feedback",url:"/ME/feedback/index"}],u=o=>{n.getIsHouseExist()&&e.index.navigateTo({url:o})};return(i,r)=>{var s,t,c,a,d,v;return{a:e.f(l,((o,i,l)=>({a:`/static/svg/${(null==o?void 0:o.icon)||""}.svg`,b:e.t((null==o?void 0:o.label)||""),c:`items_${i}`,d:e.o((i=>{return l=o,void(n.getIsHouseExist()&&("H5"===(null==l?void 0:l.type)&&(null==l?void 0:l.url)?e.index.navigateTo({url:`/pages/web_view/index?web_url=${encodeURIComponent(null==l?void 0:l.url)}`}):(null==l?void 0:l.url)?e.index.navigateTo({url:null==l?void 0:l.url}):e.index.showModal({title:"提示",content:"该功能在当前项目暂未开放，敬请期待",confirmColor:"#0082FA",success:function(e){e.confirm?console.log("用户点击确定"):e.cancel&&console.log("用户点击取消")}})));var l}),`items_${i}`)}))),b:e.t((null==(c=null==(t=null==(s=e.unref(o.useModel))?void 0:s.countHouseData)?void 0:t.value)?void 0:c.house_count)||0),c:e.o((e=>u("/INDEX/archive_houses/index"))),d:e.t((null==(v=null==(d=null==(a=e.unref(o.useModel))?void 0:a.countHouseData)?void 0:d.value)?void 0:v.prepayment_house_count)||0),e:e.o((e=>u("/ME/payment_pre_stored/index")))}}}}),l=e._export_sfc(i,[["__scopeId","data-v-f2ee52e1"]]);wx.createComponent(l);
|
|
=======
|
|
"use strict";const e=require("../../../common/vendor.js"),o=require("../model.js"),n=require("../../../common/libraries/IsHouseExist.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"),Math||i();const i=()=>"./ContactButler.js",l=e.defineComponent({__name:"AreaFunctional",setup(i){const l=[{label:"我的事项",icon:"IconReview",url:"/INDEX/owner_audit_list/index"},{label:"我的活动",icon:"IconEvent",url:"/ME/activities_list/index"},{label:"关于我们",icon:"AboutUs",url:"https://mp.weixin.qq.com/s/g-l92Xrzb5pRlGcyS99M3Q",type:"H5"},{label:"意见反馈",icon:"Feedback",url:"/ME/feedback/index"}],t=o=>{n.getIsHouseExist()&&e.index.navigateTo({url:o})};return(i,u)=>{var r,s,c,a,d,v;return{a:e.f(l,((o,i,l)=>({a:`/static/svg/${(null==o?void 0:o.icon)||""}.svg`,b:e.t((null==o?void 0:o.label)||""),c:`items_${i}`,d:e.o((i=>{return l=o,void(n.getIsHouseExist()&&("H5"===(null==l?void 0:l.type)&&(null==l?void 0:l.url)?e.index.navigateTo({url:`/pages/web_view/index?web_url=${encodeURIComponent(null==l?void 0:l.url)}`}):(null==l?void 0:l.url)?e.index.navigateTo({url:null==l?void 0:l.url}):e.index.showModal({title:"提示",content:"该功能在当前项目暂未开放，敬请期待",confirmColor:"#0082FA",success:function(e){e.confirm?console.log("用户点击确定"):e.cancel&&console.log("用户点击取消")}})));var l}),`items_${i}`)}))),b:e.t((null==(c=null==(s=null==(r=e.unref(o.useModel))?void 0:r.countHouseData)?void 0:s.value)?void 0:c.house_count)||0),c:e.o((e=>t("/INDEX/archive_houses/index"))),d:e.t((null==(v=null==(d=null==(a=e.unref(o.useModel))?void 0:a.countHouseData)?void 0:d.value)?void 0:v.prepayment_house_count)||0),e:e.o((e=>t("/ME/payment_pre_stored/index")))}}}}),t=e._export_sfc(l,[["__scopeId","data-v-6009f5b9"]]);wx.createComponent(t);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|