* '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
3.1 KiB
JavaScript
6 lines
3.1 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const o=require("../../common/vendor.js");if(!Array){(o.resolveComponent("up-icon")+o.resolveComponent("hs-button")+o.resolveComponent("up-popup"))()}Math||((()=>"../../node-modules/uview-plus/components/u-icon/u-icon.js")+(()=>"../hs-button/hs-button.js")+(()=>"../../node-modules/uview-plus/components/u-popup/u-popup.js"))();const e=o.defineComponent({__name:"hs-popup-evaluate",props:["show","mode","insetBottom","round","closeable","bgColor"],emits:["onSubmit","onClose"],setup(e,{emit:t}){const n=e,l=o.ref(-1),s={1:"非常差",2:"比较差",3:"一般",4:"满意",5:"非常满意"},u=()=>{t("onClose")},a=()=>{(null==l?void 0:l.value)>-1?t("onSubmit",{rating:l.value}):o.index.showToast({title:"请先评价",icon:"none"})};return(e,t)=>o.e({a:o.f(5,((e,t,n)=>({a:t,b:o.o((o=>{return t=e,console.log(t,"idx"),void(l.value=t);var t}),t),c:"a65343d7-1-"+n+",a65343d7-0",d:o.p({name:"star-fill",size:"32",color:t<l.value?"#FFC53D":"#F3F3F4"})}))),b:l.value>-1},l.value>-1?{c:o.t(s[l.value])}:{},{d:o.o(a),e:o.p({type:"primary",label:"提交评价",size:"md"}),f:o.o(u),g:o.p({customStyle:(null==n?void 0:n.insetBottom)?{bottom:"calc(env(safe-area-inset-bottom) + 48px)"}:{},overlayStyle:(null==n?void 0:n.insetBottom)?{bottom:"calc(env(safe-area-inset-bottom) + 48px)"}:{},show:n.show,mode:(null==n?void 0:n.mode)||"top",round:(null==n?void 0:n.round)||0,closeable:null==n?void 0:n.closeable,bgColor:null==n?void 0:n.bgColor})})}}),t=o._export_sfc(e,[["__scopeId","data-v-a65343d7"]]);wx.createComponent(t);
|
|
=======
|
|
"use strict";const o=require("../../common/vendor.js");if(!Array){(o.resolveComponent("up-icon")+o.resolveComponent("hs-button")+o.resolveComponent("up-popup"))()}Math||((()=>"../../node-modules/uview-plus/components/u-icon/u-icon.js")+(()=>"../hs-button/hs-button.js")+(()=>"../../node-modules/uview-plus/components/u-popup/u-popup.js"))();const e=o.defineComponent({__name:"hs-popup-evaluate",props:["show","mode","insetBottom","round","closeable","bgColor","params"],emits:["onSubmit","onClose"],setup(e,{emit:n}){const t=e,l=o.ref(-1),s={1:"非常差",2:"比较差",3:"一般",4:"满意",5:"非常满意"},u=()=>{n("onClose")},a=()=>{(null==l?void 0:l.value)>-1?n("onSubmit",{rating:l.value,...null==t?void 0:t.params}):o.index.showToast({title:"请选择星星评价!",icon:"none"})};return(e,n)=>o.e({a:o.f(5,((e,n,t)=>({a:n,b:o.o((o=>{return n=e,console.log(n,"idx"),void(l.value=n);var n}),n),c:"5c47dbb6-1-"+t+",5c47dbb6-0",d:o.p({name:"star-fill",size:"32",color:n<l.value?"#FFC53D":"#F3F3F4"})}))),b:l.value>-1},l.value>-1?{c:o.t(s[l.value])}:{},{d:o.o(a),e:o.p({type:"primary",label:"提交评价",size:"md"}),f:o.o(u),g:o.p({customStyle:(null==t?void 0:t.insetBottom)?{bottom:"calc(env(safe-area-inset-bottom) + 48px)"}:{},overlayStyle:(null==t?void 0:t.insetBottom)?{bottom:"calc(env(safe-area-inset-bottom) + 48px)"}:{},show:t.show,mode:(null==t?void 0:t.mode)||"top",round:(null==t?void 0:t.round)||0,closeable:null==t?void 0:t.closeable,bgColor:null==t?void 0:t.bgColor})})}}),n=o._export_sfc(e,[["__scopeId","data-v-5c47dbb6"]]);wx.createComponent(n);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|