6 lines
4.0 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="parking_payment_card"><view class="parking_payment_header"><view class="title"> 请输入车牌号 </view><view class="headphones"><button open-type="contact"><uni-icons wx:if="{{a}}" u-i="6d6f18c6-0" bind:__l="__l" u-p="{{a}}"></uni-icons>联系客服 </button></view></view><view class="license_plate_number" bindtap="{{c}}"><block wx:for="{{b}}" wx:for-item="i" wx:key="f" class="item"><view wx:if="{{i.a}}" class="item"><view class="new_energy"><uni-icons wx:if="{{i.c}}" u-i="{{i.b}}" bind:__l="__l" u-p="{{i.c}}"></uni-icons><view> 新能源 </view></view></view><view wx:else class="item">{{i.d}}</view><view wx:if="{{i.e}}">·</view></block></view><view class="query_btn"><hs-button wx:if="{{e}}" bindclick="{{d}}" u-i="6d6f18c6-2" bind:__l="__l" u-p="{{e}}"/></view></view><view class="parking_payment_footer"><view wx:for="{{f}}" wx:for-item="i" wx:key="c" class="item" bindtap="{{i.d}}"><view class="icon"><image src="{{i.a}}" mode="widthFix"/></view><view class="label">{{i.b}}</view></view></view><view class="membership_benefits"><up-divider wx:if="{{g}}" u-i="6d6f18c6-3" bind:__l="__l" u-p="{{g}}"></up-divider><view class="membership_benefits_content"><view> 1、普卡会员任意消费并积分可免停1小时当日限免1次; </view><view> 2、金卡会员任意消费并积分可免停2小时当日限免1次 </view><view> 3、铂金卡会员当日可免停3小时当日限免1次 </view><view> 4、黑金卡会员当日免费停车单次限免8小时 </view><view> ※以上权益每天每个会员账号单日内全集团门店限享1次</view></view></view><up-keyboard wx:if="{{n}}" class="r" u-r="uKeyboard" bindclose="{{i}}" bindchange="{{j}}" bindbackspace="{{k}}" bindcancel="{{l}}" bindconfirm="{{m}}" u-i="6d6f18c6-4" bind:__l="__l" u-p="{{n}}"></up-keyboard></view>
=======
<view><view class="banner_header"><image mode="widthFix" src="https://pay-prod-1369486729.cos.ap-guangzhou.myqcloud.com/uploads/cs-test/01K7G6NKCJYMMJXQ2B27GT7VGF.png"/></view><view class="parking_payment_card"><view class="parking_payment_content"><view class="parking_payment_header"><view class="title"> 请输入车牌号 </view><view class="headphones"><button open-type="contact">联系客服</button></view></view><view class="license_plate_number" bindtap="{{b}}"><block wx:for="{{a}}" wx:for-item="i" wx:key="f" class="item"><view wx:if="{{i.a}}" class="item"><view class="new_energy"><uni-icons wx:if="{{i.c}}" u-i="{{i.b}}" bind:__l="__l" u-p="{{i.c}}"></uni-icons><view> 新能源 </view></view></view><view wx:else class="item">{{i.d}}</view><view wx:if="{{i.e}}">·</view></block></view><view class="query_btn"><hs-button wx:if="{{d}}" bindclick="{{c}}" u-i="6d6f18c6-1" bind:__l="__l" u-p="{{d}}"/></view><view class="parking_card_footer"><view class="label"> 历史使用车辆:</view><view class="items_content"><view wx:for="{{e}}" wx:for-item="i" wx:key="a" class="item"> 粤BFR2323 </view></view></view></view></view><view class="parking_payment_footer"><view wx:for="{{f}}" wx:for-item="i" wx:key="c" class="item" bindtap="{{i.d}}"><view class="icon"><image src="{{i.a}}" mode="widthFix"/></view><view class="label">{{i.b}}</view></view></view><view class="membership_benefits"><up-divider wx:if="{{g}}" u-i="6d6f18c6-2" bind:__l="__l" u-p="{{g}}"></up-divider><view class="membership_benefits_content"><view> 1、普卡会员任意消费并积分可免停1小时当日限免1次; </view><view> 2、金卡会员任意消费并积分可免停2小时当日限免1次 </view><view> 3、铂金卡会员当日可免停3小时当日限免1次 </view><view> 4、黑金卡会员当日免费停车单次限免8小时 </view><view> ※以上权益每天每个会员账号单日内全集团门店限享1次</view></view></view><up-keyboard wx:if="{{n}}" class="r" u-r="uKeyboard" bindclose="{{i}}" bindchange="{{j}}" bindbackspace="{{k}}" bindcancel="{{l}}" bindconfirm="{{m}}" u-i="6d6f18c6-3" bind:__l="__l" u-p="{{n}}"></up-keyboard></view>
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82