* '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.5 KiB
Plaintext
6 lines
3.5 KiB
Plaintext
<<<<<<< HEAD
|
|
<view><my-tabs bindchange="{{a}}" u-i="4cd12ba6-0" bind:__l="__l"/><view class="bill_content"><hs-empty wx:if="{{b}}" u-i="4cd12ba6-1" bind:__l="__l" u-p="{{c}}"/><view wx:for="{{d}}" wx:for-item="i" wx:key="f" class="item_content"><block wx:if="{{i.a}}"><view class="huse_name">{{i.b}}</view><view wx:for="{{i.c}}" wx:for-item="k" wx:key="n" class="card_content"><view class="collapse_hader"><view class="collapse_hader_left" bindtap="{{k.g}}"><view wx:if="{{i.d}}"><uni-icons wx:if="{{k.a}}" u-i="{{k.b}}" bind:__l="__l" u-p="{{k.c}}"></uni-icons><uni-icons wx:else u-i="{{k.d}}" bind:__l="__l" u-p="{{k.e||''}}"></uni-icons></view><view class="bill_title">{{k.f}}账单 </view></view><view class="collapse_hader_right" bindtap="{{k.j}}"><view class="bill_price">¥{{k.h}}</view><uni-icons wx:if="{{i.e}}" u-i="{{k.i}}" bind:__l="__l" u-p="{{i.e}}"></uni-icons></view></view><view wx:if="{{k.k}}" class="collapse_body"><view wx:for="{{k.l}}" wx:for-item="i" wx:key="i" class="collapse_cell" bindtap="{{i.j}}"><view class="collapse_cell_find_select"><view wx:if="{{k.m}}"><uni-icons wx:if="{{i.a}}" u-i="{{i.b}}" bind:__l="__l" u-p="{{i.c}}"></uni-icons><uni-icons wx:else u-i="{{i.d}}" bind:__l="__l" u-p="{{i.e||''}}"></uni-icons></view><view><hs-enum-tag wx:if="{{i.g}}" u-i="{{i.f}}" bind:__l="__l" u-p="{{i.g}}"/></view></view><view class="collapse_cell_price">¥{{i.h}}</view></view></view></view></block></view></view><view wx:if="{{e}}" class="footer"><hs-collection u-i="4cd12ba6-8" bind:__l="__l"/><view class="footer_content"><view class="item total_price"> 已选<view class="number_price"><text>¥</text>{{f}}</view></view><view class="item btn"><hs-button wx:if="{{h}}" bindclick="{{g}}" u-i="4cd12ba6-9" bind:__l="__l" u-p="{{h}}"/></view></view></view></view>
|
|
=======
|
|
<view><my-tabs bindchange="{{a}}" u-i="4cd12ba6-0" bind:__l="__l"/><view class="bill_content"><hs-empty wx:if="{{b}}" u-i="4cd12ba6-1" bind:__l="__l" u-p="{{c}}"/><block wx:for="{{d}}" wx:for-item="i" wx:key="f"><view wx:if="{{i.a}}" class="item_content"><view class="huse_name">{{i.b}}</view><view wx:for="{{i.c}}" wx:for-item="k" wx:key="n" class="card_content"><view class="collapse_hader"><view class="collapse_hader_left" bindtap="{{k.g}}"><view wx:if="{{i.d}}"><uni-icons wx:if="{{k.a}}" u-i="{{k.b}}" bind:__l="__l" u-p="{{k.c}}"></uni-icons><uni-icons wx:else u-i="{{k.d}}" bind:__l="__l" u-p="{{k.e||''}}"></uni-icons></view><view class="bill_title">{{k.f}}账单 </view></view><view class="collapse_hader_right" bindtap="{{k.j}}"><view class="bill_price">¥{{k.h}}</view><uni-icons wx:if="{{i.e}}" u-i="{{k.i}}" bind:__l="__l" u-p="{{i.e}}"></uni-icons></view></view><view wx:if="{{k.k}}" class="collapse_body"><view wx:for="{{k.l}}" wx:for-item="i" wx:key="i" class="collapse_cell" bindtap="{{i.j}}"><view class="collapse_cell_find_select"><view wx:if="{{k.m}}"><uni-icons wx:if="{{i.a}}" u-i="{{i.b}}" bind:__l="__l" u-p="{{i.c}}"></uni-icons><uni-icons wx:else u-i="{{i.d}}" bind:__l="__l" u-p="{{i.e||''}}"></uni-icons></view><view><hs-enum-tag wx:if="{{i.g}}" u-i="{{i.f}}" bind:__l="__l" u-p="{{i.g}}"/></view></view><view class="collapse_cell_price">¥{{i.h}}</view></view></view></view></view></block></view><view wx:if="{{e}}" class="footer"><hs-collection u-i="4cd12ba6-8" bind:__l="__l"/><view class="footer_content"><view class="item total_price"> 已选<view class="number_price"><text>¥</text>{{f}}</view></view><view class="item btn"><hs-button wx:if="{{h}}" bindclick="{{g}}" u-i="4cd12ba6-9" bind:__l="__l" u-p="{{h}}"/></view></view></view></view>
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|