6d31441e12
* '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
4.6 KiB
Plaintext
6 lines
4.6 KiB
Plaintext
<<<<<<< HEAD
|
|
page{background-color:#f3f3f4}.parking_payment_card{margin:30rpx;background-color:#fff;border-radius:15rpx;padding:0 30rpx}.parking_payment_card .parking_payment_header{display:flex;align-items:center;justify-content:space-between;padding:30rpx 0}.parking_payment_card .parking_payment_header .title{font-size:30rpx;font-weight:500}.parking_payment_card .parking_payment_header .headphones{font-size:24rpx}.parking_payment_card .parking_payment_header .headphones button{background:#fff;padding:0;margin:0;font-size:23rpx;border:none;color:#2a7efb}button:after{border:none!important}.license_plate_number{display:flex;align-items:center;justify-content:space-between;padding:20rpx 0 0;position:relative}.license_plate_number .item{width:65rpx;height:90rpx;background-color:#f8f8f8;border-radius:10rpx;display:flex;align-items:center;justify-content:center}.query_btn{padding:50rpx 0 40rpx}.member_benefits{text-align:center;font-size:24rpx;display:flex;align-items:center;justify-content:center;padding:0 0 30rpx;color:#999}.new_energy{font-size:17rpx;text-align:center;color:#2a7efb}.parking_payment_footer{display:flex;align-items:center;justify-content:space-between;text-align:center;margin:30rpx;background-color:#fff;border-radius:10rpx;padding:40rpx 30rpx}.parking_payment_footer .label{font-size:24rpx;color:#666}.parking_payment_footer .item{text-align:center;flex:1}.parking_payment_footer .item .icon{width:100%;display:flex;align-items:center;justify-content:center;padding:0 0 10rpx}.parking_payment_footer .item .icon image{width:38rpx;height:38rpx}.parking_payment_footer .item:nth-child(2){border-left:1rpx solid #eee;border-right:1rpx solid #eee}.parking_payment_footer .item:nth-child(2) image{width:48rpx;height:48rpx}.membership_benefits{margin:30rpx;padding-top:30rpx}.membership_benefits .membership_benefits_content{line-height:50rpx;font-size:27rpx;color:#333}
|
|
=======
|
|
page{background-color:#f3f3f4}.banner_header{margin:30rpx 30rpx 0;height:200rpx}.banner_header image{width:100%;font-size:0;height:200rpx}.parking_payment_card{margin:30rpx;background-color:#fff;border-radius:15rpx}.parking_payment_card .parking_payment_content{background:linear-gradient(180deg,#f3f9ff 0%,#ffffff 27%,#ffffff 100%);padding:0 30rpx;border-radius:15rpx;border:1rpx solid #fff}.parking_payment_card .parking_payment_header{display:flex;align-items:center;justify-content:space-between;padding:30rpx 0}.parking_payment_card .parking_payment_header .title{font-size:32rpx;font-weight:500;color:#3d3d3d}.parking_payment_card .parking_payment_header .headphones{font-size:24rpx}.parking_payment_card .parking_payment_header .headphones button{background:#fff;padding:0 30rpx;border-radius:100rpx;margin:0;height:60rpx;line-height:60rpx;font-size:23rpx;border:none;color:#666}.parking_payment_card .parking_card_footer{display:flex;align-items:self-start;font-size:28rpx}.parking_payment_card .parking_card_footer .label{color:#3d3d3d}.parking_payment_card .parking_card_footer .items_content{flex:1;display:flex;align-items:center;flex-wrap:wrap;color:#666}.parking_payment_card .parking_card_footer .items_content .item{background-color:#f3f3f4;margin-left:20rpx;padding:6rpx 12rpx;margin-bottom:20rpx;border-radius:10rpx}button:after{border:none!important}.license_plate_number{display:flex;align-items:center;justify-content:space-between;padding:20rpx 0 0;position:relative}.license_plate_number .item{width:65rpx;height:80rpx;border-radius:10rpx;display:flex;align-items:center;justify-content:center;border:1rpx solid #aaccff}.license_plate_number .item:nth-child(1),.license_plate_number .item:nth-child(2){background-color:#2a7efb;color:#fff}.query_btn{padding:40rpx 0}.member_benefits{text-align:center;font-size:24rpx;display:flex;align-items:center;justify-content:center;padding:0 0 30rpx;color:#999}.new_energy{font-size:17rpx;text-align:center;color:#2a7efb}.parking_payment_footer{display:flex;align-items:center;justify-content:space-between;text-align:center;margin:30rpx;background-color:#fff;border-radius:10rpx;padding:40rpx 30rpx}.parking_payment_footer .label{font-size:24rpx;color:#666}.parking_payment_footer .item{text-align:center;flex:1}.parking_payment_footer .item .icon{width:100%;display:flex;align-items:center;justify-content:center;padding:0 0 10rpx}.parking_payment_footer .item .icon image{width:38rpx;height:38rpx}.parking_payment_footer .item:nth-child(2){border-left:1rpx solid #eee;border-right:1rpx solid #eee}.parking_payment_footer .item:nth-child(2) image{width:48rpx;height:48rpx}.membership_benefits{margin:30rpx;padding-top:30rpx}.membership_benefits .membership_benefits_content{line-height:50rpx;font-size:27rpx;color:#333}
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|