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.3 KiB
Plaintext

<<<<<<< HEAD
<view class="data-v-f2ee52e1"><view class="area_functional data-v-f2ee52e1"><view wx:for="{{a}}" wx:for-item="i" wx:key="c" class="item data-v-f2ee52e1" bindtap="{{i.d}}"><view class="icon data-v-f2ee52e1"><image class="data-v-f2ee52e1" src="{{i.a}}" mode="heightFix"/></view><view class="label data-v-f2ee52e1">{{i.b}}</view></view></view><view class="house_wallet data-v-f2ee52e1"><view class="item data-v-f2ee52e1" bindtap="{{c}}"><view class="content data-v-f2ee52e1"><view class="title data-v-f2ee52e1">房屋管理</view><view class="value data-v-f2ee52e1"> 已绑定<text class="data-v-f2ee52e1">{{b}}</text>个房屋 </view></view><image class="data-v-f2ee52e1" src="/static/images/IconHouse.png" mode="heightFix"/></view><view class="item data-v-f2ee52e1" bindtap="{{e}}"><view class="content data-v-f2ee52e1"><view class="title data-v-f2ee52e1">房屋预缴</view><view class="value data-v-f2ee52e1"> 已开通<text class="data-v-f2ee52e1">{{d}}</text>个房屋 </view></view><image class="data-v-f2ee52e1" src="/static/images/IconWallet.png" mode="heightFix"/></view></view></view>
=======
<view class="data-v-6009f5b9"><view class="area_functional data-v-6009f5b9"><view wx:for="{{a}}" wx:for-item="i" wx:key="c" class="item data-v-6009f5b9" bindtap="{{i.d}}"><view class="icon data-v-6009f5b9"><image class="data-v-6009f5b9" src="{{i.a}}" mode="heightFix"/></view><view class="label data-v-6009f5b9">{{i.b}}</view></view></view><my-contact-butler class="data-v-6009f5b9" u-i="6009f5b9-0" bind:__l="__l"/><view class="house_wallet data-v-6009f5b9"><view class="item data-v-6009f5b9" bindtap="{{c}}"><view class="content data-v-6009f5b9"><view class="title data-v-6009f5b9">房屋管理</view><view class="value data-v-6009f5b9"> 已绑定<text class="data-v-6009f5b9">{{b}}</text>个房屋 </view></view><image class="data-v-6009f5b9" src="/static/images/IconHouse.png" mode="heightFix"/></view><view class="item data-v-6009f5b9" bindtap="{{e}}"><view class="content data-v-6009f5b9"><view class="title data-v-6009f5b9">房屋预缴</view><view class="value data-v-6009f5b9"> 已开通<text class="data-v-6009f5b9">{{d}}</text>个房屋 </view></view><image class="data-v-6009f5b9" src="/static/images/IconWallet.png" mode="heightFix"/></view></view></view>
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82