* '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
2.7 KiB
JavaScript
6 lines
2.7 KiB
JavaScript
<<<<<<< HEAD
|
|
"use strict";const e=require("../../vendor.js");if(!Array){(e.resolveComponent("hs-empty")+e.resolveComponent("u-loading-icon"))()}Math||((()=>"../../../components/hs-empty/hs-empty.js")+(()=>"../../../node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js"))();const a=e.defineComponent({__name:"cc-scroll-loading",props:{meta:{type:Object,default:{}},showLoad:{type:Boolean,default:!0}},emits:["load"],setup(a,{emit:t}){const o=a,l=e.ref(""),n=e.ref(!1),u=e.ref({page:1,perPage:20});e.watch((()=>null==o?void 0:o.meta),(()=>{const{current_page:e,last_page:a}=o.meta,t=e<a;n.value=t,l.value=t?"上拉加载更多":"已经到底啦~",console.log(null==o?void 0:o.meta,"meta数据变化")})),e.onMounted((()=>{const{current_page:e,last_page:a}=o.meta,t=e<a;n.value=t,l.value=t?"上拉加载更多":"已经到底啦~"}));return e.onReachBottom((()=>{const{current_page:e,last_page:a}=o.meta,s=e<a;n.value=s,l.value=s?"上拉加载更多":"已经到底啦~",s&&(u.value.page=e+1,t("load",u.value),setTimeout((()=>{n.value=!1,l.value=""}),1e3))})),(a,t)=>{var u,s;return e.e({a:!(null==(u=o.meta)?void 0:u.total)},(null==(s=o.meta)?void 0:s.total)?e.e({b:e.p({text:l.value,mode:"circle",size:"30rpx",show:n.value}),c:!n.value},n.value?{}:{d:e.t(l.value)}):{})}}}),t=e._export_sfc(a,[["__scopeId","data-v-ead87464"]]);wx.createComponent(t);
|
|
=======
|
|
"use strict";const e=require("../../vendor.js");if(!Array){(e.resolveComponent("hs-empty")+e.resolveComponent("u-loading-icon"))()}Math||((()=>"../../../components/hs-empty/hs-empty.js")+(()=>"../../../node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js"))();const t=e.defineComponent({__name:"cc-scroll-loading",props:{meta:{type:Object,default:{}},showLoad:{type:Boolean,default:!0}},emits:["load"],setup(t,{emit:a}){const o=t,l=e.ref(""),n=e.ref(!1),u=e.ref({page:1,perPage:20});e.watch((()=>null==o?void 0:o.meta),(()=>{const{current_page:e,last_page:t}=o.meta,a=e<t;n.value=a,l.value=a?"上拉加载更多":"已经到底啦~",console.log(null==o?void 0:o.meta,"meta数据变化")})),e.onMounted((()=>{const{current_page:e,last_page:t}=o.meta,a=e<t;n.value=a,l.value=a?"上拉加载更多":"已经到底啦~"}));return e.onReachBottom((()=>{const{current_page:e,last_page:t}=o.meta,s=e<t;n.value=s,l.value=s?"上拉加载更多":"已经到底啦~",s&&(u.value.page=e+1,a("load",u.value),setTimeout((()=>{n.value=!1,l.value=""}),1e3))})),(t,a)=>{var u,s;return e.e({a:!(null==(u=o.meta)?void 0:u.total)},(null==(s=o.meta)?void 0:s.total)?e.e({c:e.p({text:l.value,mode:"circle",size:"30rpx",show:n.value}),d:!n.value},n.value?{}:{e:e.t(l.value)}):{b:e.p({height:"30vh"})})}}}),a=e._export_sfc(t,[["__scopeId","data-v-b30b93c5"]]);wx.createComponent(a);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|