* '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.9 KiB
Plaintext
6 lines
3.9 KiB
Plaintext
<<<<<<< HEAD
|
|
<view class="payment_pre_stored"><view class="payment_pre_stored_header"><view class="name" bindtap="{{b}}"> 预缴房屋余额提醒 <uni-icons wx:if="{{a}}" u-i="1c2e15d3-0" bind:__l="__l" u-p="{{a}}"></uni-icons></view><view><switch color="#0082FA" style="transform:scale(0.7)"/></view></view><cc-scroll-loading wx:if="{{i}}" u-s="{{['d']}}" u-i="1c2e15d3-1" bind:__l="__l" u-p="{{i}}"><view class="pre_stored_content"><view wx:for="{{c}}" wx:for-item="i" wx:key="h" class="pre_stored_card_item"><view class="card_header">{{i.a}} <view class="label_tab_group"><text wx:if="{{i.b}}" class="label_tab label_tab1"> 预缴 </text><text wx:if="{{i.c}}" class="label_tab label_tab2"> 欠费 </text><text wx:if="{{i.d}}" class="label_tab label_tab3"> 清欠 </text></view></view><view class="card_content"><view class="price_item"><view class="price">{{i.e}}</view><view class="price_label"> 预缴余额(元) </view></view><view><view><hs-button wx:if="{{d}}" bindclick="{{i.f}}" u-i="{{i.g}}" bind:__l="__l" u-p="{{d}}"/></view><view class="group_btn"> 收支记录 </view></view></view></view><block wx:if="{{e}}"><view class="card_head_title"> 不可开通预缴房屋({{f}}) </view><view wx:for="{{g}}" wx:for-item="i" wx:key="h" class="pre_stored_card_item"><view class="card_header">{{i.a}} <view class="label_tab_group"><text wx:if="{{i.b}}" class="label_tab label_tab1"> 预缴 </text><text wx:if="{{i.c}}" class="label_tab label_tab2"> 欠费 </text><text wx:if="{{i.d}}" class="label_tab label_tab3"> 清欠 </text></view></view><view class="card_content"><view class="price_item"><view class="price">{{i.e}}</view><view class="price_label"> 预缴余额(元) </view></view><view><view><hs-button wx:if="{{h}}" bindclick="{{i.f}}" u-i="{{i.g}}" bind:__l="__l" u-p="{{h}}"/></view><view class="group_btn"> 收支记录 </view></view></view></view></block></view></cc-scroll-loading></view>
|
|
=======
|
|
<view class="payment_pre_stored"><view class="payment_pre_stored_header"><view class="name" bindtap="{{b}}"> 预缴房屋余额提醒 <uni-icons wx:if="{{a}}" u-i="1c2e15d3-0" bind:__l="__l" u-p="{{a}}"></uni-icons></view><view><switch color="#0082FA" style="transform:scale(0.7)"/></view></view><cc-scroll-loading wx:if="{{i}}" u-s="{{['d']}}" u-i="1c2e15d3-1" bind:__l="__l" u-p="{{i}}"><view class="pre_stored_content"><view wx:for="{{c}}" wx:for-item="i" wx:key="i" class="pre_stored_card_item"><view class="card_header">{{i.a}} <view class="label_tab_group"><text wx:if="{{i.b}}" class="label_tab label_tab1"> 预缴 </text><text wx:if="{{i.c}}" class="label_tab label_tab2"> 欠费 </text><text wx:if="{{i.d}}" class="label_tab label_tab3"> 清欠 </text></view></view><view class="card_content"><view class="price_item"><view class="price">{{i.e}}</view><view class="price_label"> 预缴余额(元) </view></view><view><view><hs-button wx:if="{{d}}" bindclick="{{i.f}}" u-i="{{i.g}}" bind:__l="__l" u-p="{{d}}"/></view><view class="group_btn" bindtap="{{i.h}}"> 收支记录 </view></view></view></view><block wx:if="{{e}}"><view class="card_head_title"> 不可开通预缴房屋({{f}}) </view><view wx:for="{{g}}" wx:for-item="i" wx:key="i" class="pre_stored_card_item cannot_activated_item"><view class="card_header">{{i.a}} <view class="label_tab_group"><text wx:if="{{i.b}}" class="label_tab label_tab1"> 预缴 </text><text wx:if="{{i.c}}" class="label_tab label_tab2"> 欠费 </text><text wx:if="{{i.d}}" class="label_tab label_tab3"> 清欠 </text></view></view><view class="card_content"><view class="price_item"><view class="price cannot_activated_price">{{i.e}}</view><view class="price_label"> 预缴余额(元) </view></view><view><view><hs-button wx:if="{{h}}" bindclick="{{i.f}}" u-i="{{i.g}}" bind:__l="__l" u-p="{{h}}"/></view><view class="group_btn" bindtap="{{i.h}}"> 收支记录 </view></view></view></view></block></view></cc-scroll-loading></view>
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|