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
2.9 KiB
Plaintext

<<<<<<< HEAD
<view><view class="header"><hs-tabs wx:if="{{b}}" bindonChange="{{a}}" u-i="550638e2-0" bind:__l="__l" u-p="{{b}}"/></view><view class="work_contents"><cc-scroll-loading wx:if="{{e}}" u-s="{{['d']}}" bindload="{{d}}" u-i="550638e2-1" bind:__l="__l" u-p="{{e}}"><view wx:for="{{c}}" wx:for-item="i" wx:key="j" class="work_item" bindtap="{{i.k}}"><view class="work_item_header"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{i.b}}" u-i="{{i.a}}" bind:__l="__l" u-p="{{i.b}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{i.d}}" u-i="{{i.c}}" bind:__l="__l" u-p="{{i.d}}"/></view></view><view class="btn_status"><hs-enum-tag wx:if="{{i.f}}" u-i="{{i.e}}" bind:__l="__l" u-p="{{i.f}}"/></view></view><view class="work_item_houses">{{i.g}} </view><view class="work_item_des">{{i.h}}</view><view class="work_item_images"><view wx:for="{{i.i}}" wx:for-item="k" wx:key="b" class="item"><image src="{{k.a}}" mode="aspectFill"/></view></view></view></cc-scroll-loading></view><hs-footer wx:if="{{g}}" bindhandleParmaryClick="{{f}}" u-i="550638e2-5" bind:__l="__l" u-p="{{g}}"/></view>
=======
<view><my-header u-i="550638e2-0" bind:__l="__l"/><view class="work_contents"><cc-scroll-loading wx:if="{{c}}" u-s="{{['d']}}" bindload="{{b}}" u-i="550638e2-1" bind:__l="__l" u-p="{{c}}"><view wx:for="{{a}}" wx:for-item="i" wx:key="K" class="work_item"><view bindtap="{{i.r}}"><view class="work_item_header"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{i.b}}" u-i="{{i.a}}" bind:__l="__l" u-p="{{i.b}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{i.d}}" u-i="{{i.c}}" bind:__l="__l" u-p="{{i.d}}"/></view></view><view class="{{i.g}}"><hs-enum-tag wx:if="{{i.f}}" u-i="{{i.e}}" bind:__l="__l" u-p="{{i.f}}"/></view></view><view class="work_item_houses">{{i.h}} </view><view class="work_item_des">{{i.i}}</view><view wx:if="{{i.j}}" class="work_item_cell"> 期望处理时间:{{i.k}}(两小时内) </view><view wx:if="{{i.l}}" class="work_item_cell"> 工单完成时间: {{i.m}}</view><view wx:else class="work_item_cell"> 工单创建时间: {{i.n}}</view><view wx:if="{{i.o}}" class="work_item_cell"> 客户评价:<hs-up-rate wx:if="{{i.q}}" u-i="{{i.p}}" bind:__l="__l" u-p="{{i.q}}"/></view></view><view wx:if="{{i.s}}" class="work_item_footer"><hs-button wx:if="{{i.t}}" bindclick="{{i.v}}" u-i="{{i.w}}" bind:__l="__l" u-p="{{i.x}}"/><hs-button wx:if="{{i.y}}" bindclick="{{i.z}}" u-i="{{i.A}}" bind:__l="__l" u-p="{{i.B}}"/><hs-button wx:if="{{i.C}}" bindclick="{{i.D}}" u-i="{{i.E}}" bind:__l="__l" u-p="{{i.F}}"/><hs-button wx:if="{{i.G}}" bindclick="{{i.H}}" u-i="{{i.I}}" bind:__l="__l" u-p="{{i.J}}"/></view></view></cc-scroll-loading></view><hs-popup-evaluate wx:if="{{f}}" bindonSubmit="{{d}}" bindonClose="{{e}}" u-i="550638e2-10" bind:__l="__l" u-p="{{f}}"/></view>
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82