6 lines
3.1 KiB
Plaintext
Raw Normal View History

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
<<<<<<< HEAD
<view class="workorder_page"><view class="card_form"><hs-cell wx:if="{{d}}" u-s="{{['d']}}" u-i="a700fa9a-0" bind:__l="__l" u-p="{{d}}"><hs-radio wx:if="{{c}}" bindonChange="{{a}}" u-i="a700fa9a-1,a700fa9a-0" bind:__l="__l" bindupdateValueModel="{{b}}" u-p="{{c}}"/></hs-cell></view><view class="card_form"><hs-radio-cell-picker wx:if="{{e}}" u-i="a700fa9a-2" bind:__l="__l" bindupdateValueModel="{{f}}" u-p="{{g}}"/><hs-cell wx:if="{{h}}" u-s="{{['d']}}" u-i="a700fa9a-3" bind:__l="__l" u-p="{{k}}"><hs-radio wx:if="{{j}}" u-i="a700fa9a-4,a700fa9a-3" bind:__l="__l" bindupdateValueModel="{{i}}" u-p="{{j}}"/></hs-cell><hs-cell wx:if="{{l}}" bindclick="{{m}}" u-i="a700fa9a-5" bind:__l="__l" u-p="{{n}}"/><hs-cell-textarea wx:if="{{p}}" u-i="a700fa9a-6" bind:__l="__l" bindupdateValueModel="{{o}}" u-p="{{p}}"/><hs-upload wx:if="{{r}}" u-i="a700fa9a-7" bind:__l="__l" bindupdateValueModel="{{q}}" u-p="{{r}}"/></view><view class="card_form"><hs-cell wx:if="{{s}}" u-s="{{['d']}}" u-i="a700fa9a-8" bind:__l="__l" u-p="{{v}}"><switch color="#0082FA" bindchange="{{t}}"/></hs-cell><hs-reservation-picker wx:if="{{w}}" u-i="a700fa9a-9" bind:__l="__l" bindupdateValueExpectStartTime="{{x}}" bindupdateValueExpectEndTime="{{y}}" u-p="{{z}}"/></view><view wx:if="{{A}}" class="card_form"><hs-cell wx:if="{{D}}" u-s="{{['d']}}" u-i="a700fa9a-10" bind:__l="__l" u-p="{{D}}"><hs-input wx:if="{{C}}" u-i="a700fa9a-11,a700fa9a-10" bind:__l="__l" bindupdateValueModel="{{B}}" u-p="{{C}}"/></hs-cell><hs-cell wx:if="{{G}}" u-s="{{['d']}}" u-i="a700fa9a-12" bind:__l="__l" u-p="{{G}}"><hs-input wx:if="{{F}}" u-i="a700fa9a-13,a700fa9a-12" bind:__l="__l" bindupdateValueModel="{{E}}" u-p="{{F}}"/></hs-cell></view><hs-footer wx:if="{{I}}" bindhandleParmaryClick="{{H}}" u-i="a700fa9a-14" bind:__l="__l" u-p="{{I}}"/></view>
=======
<view class="workorder_page"><view class="card_form"><hs-radio-cell-picker wx:if="{{a}}" u-i="a700fa9a-0" bind:__l="__l" bindupdateValueModel="{{b}}" u-p="{{c}}"/><hs-cell wx:if="{{d}}" bindclick="{{e}}" u-i="a700fa9a-1" bind:__l="__l" u-p="{{f}}"/><hs-cell-textarea wx:if="{{h}}" u-i="a700fa9a-2" bind:__l="__l" bindupdateValueModel="{{g}}" u-p="{{h}}"/><hs-upload wx:if="{{j}}" u-i="a700fa9a-3" bind:__l="__l" bindupdateValueModel="{{i}}" u-p="{{j}}"/></view><view class="card_form"><hs-cell wx:if="{{k}}" u-s="{{['d']}}" u-i="a700fa9a-4" bind:__l="__l" u-p="{{m}}"><switch color="#0082FA" bindchange="{{l}}"/></hs-cell><hs-reservation-picker wx:if="{{n}}" u-i="a700fa9a-5" bind:__l="__l" bindupdateValueExpectStartTime="{{o}}" bindupdateValueExpectEndTime="{{p}}" u-p="{{q}}"/></view><view wx:if="{{r}}" class="card_form"><hs-cell wx:if="{{v}}" u-s="{{['d']}}" u-i="a700fa9a-6" bind:__l="__l" u-p="{{v}}"><hs-input wx:if="{{t}}" u-i="a700fa9a-7,a700fa9a-6" bind:__l="__l" bindupdateValueModel="{{s}}" u-p="{{t}}"/></hs-cell><hs-cell wx:if="{{y}}" u-s="{{['d']}}" u-i="a700fa9a-8" bind:__l="__l" u-p="{{y}}"><hs-input wx:if="{{x}}" u-i="a700fa9a-9,a700fa9a-8" bind:__l="__l" bindupdateValueModel="{{w}}" u-p="{{x}}"/></hs-cell></view><hs-footer wx:if="{{A}}" bindhandleParmaryClick="{{z}}" u-i="a700fa9a-10" bind:__l="__l" u-p="{{A}}"/></view>
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82