6 lines
3.5 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><view class="show_card"><view class="card_header_type_status"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{a}}" u-i="337b3881-0" bind:__l="__l" u-p="{{a}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{b}}" u-i="337b3881-1" bind:__l="__l" u-p="{{b}}"/></view></view><view class="btn_status"><hs-enum-tag wx:if="{{c}}" u-i="337b3881-2" bind:__l="__l" u-p="{{c}}"/></view></view><view class="card_header_huse_info"><text>{{d}}</text><text>{{e}}</text></view><view class="card_header_content_info">{{f}}</view><view class="card_header_imgs"><view wx:for="{{g}}" wx:for-item="k" wx:key="b" class="item"><image src="{{k.a}}" mode="aspectFill"/></view></view><view class="show_card_footer"><view class="work_item_cell"> 工单编号 <text>{{h}}</text></view><view class="work_item_cell"> 期望上门时间 <text>{{i}}</text></view><view class="work_item_cell"> 提报时间 <text>{{j}}</text></view></view></view><hs-footer wx:if="{{m}}" bindhandleParmaryClick="{{k}}" bindhandleOtherClick="{{l}}" u-i="337b3881-3" bind:__l="__l" u-p="{{m}}"/><hs-popup-evaluate wx:if="{{p}}" bindonSubmit="{{n}}" bindonClose="{{o}}" u-i="337b3881-4" bind:__l="__l" u-p="{{p}}"/></view>
=======
<view class="work_page"><view class="show_card"><view class="card_header_type_status"><view class="work_item_header_left"><view class="btn_type"><hs-enum-tag wx:if="{{a}}" u-i="337b3881-0" bind:__l="__l" u-p="{{a}}"/></view><view class="btn_type"><hs-enum-tag wx:if="{{b}}" u-i="337b3881-1" bind:__l="__l" u-p="{{b}}"/></view></view><view class="{{d}}"><hs-enum-tag wx:if="{{c}}" u-i="337b3881-2" bind:__l="__l" u-p="{{c}}"/></view></view><view class="card_header_huse_info"><text>{{e}}</text><text>{{f}}</text></view><view class="card_header_content_info">{{g}}</view><view class="card_header_imgs"><view wx:for="{{h}}" wx:for-item="k" wx:key="b" class="item"><image src="{{k.a}}" mode="aspectFill"/></view></view><view class="show_card_footer"><view class="work_item_cell"> 工单编号: <text>{{i}}</text></view><view class="work_item_cell"> 期望上门处理时间: <text>{{j}}</text></view><view class="work_item_cell"> 提报时间:<text>{{k}}</text></view><view wx:if="{{l}}" class="work_item_cell"> 客户评价:<hs-up-rate wx:if="{{m}}" u-i="337b3881-3" bind:__l="__l" u-p="{{m}}"/></view></view></view><my-process-logs u-i="337b3881-4" bind:__l="__l"/><view wx:if="{{n}}" class="work_order_footer"><view wx:if="{{o}}" class="btn" bindtap="{{p}}"> 关闭工单 </view><view wx:if="{{q}}" class="btn_close" bindtap="{{s}}"><view class="icon_close"><up-icon wx:if="{{r}}" u-i="337b3881-5" bind:__l="__l" u-p="{{r}}"></up-icon></view><view> 关闭工单 </view></view><view wx:if="{{t}}" class="btn_close" bindtap="{{w}}"><view class="icon_close"><uni-icons wx:if="{{v}}" u-i="337b3881-6" bind:__l="__l" u-p="{{v}}"></uni-icons></view><view> 工单返工 </view></view><view wx:if="{{x}}" class="btn handle_rework_btn" bindtap="{{y}}"> 工单返工 </view><view wx:if="{{z}}" class="btn" bindtap="{{A}}"> 修改处理时间 </view><view wx:if="{{B}}" class="btn" bindtap="{{C}}"> 验收工单 </view><view wx:if="{{D}}" class="btn" bindtap="{{E}}"> 联系处理人 </view><view wx:if="{{F}}" class="btn" bindtap="{{G}}"> 支付费用 </view><view wx:if="{{H}}" class="btn" bindtap="{{I}}"> 工单评价 </view></view><hs-popup-evaluate wx:if="{{L}}" bindonSubmit="{{J}}" bindonClose="{{K}}" u-i="337b3881-7" bind:__l="__l" u-p="{{L}}"/></view>
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82