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
3.5 KiB
Plaintext
6 lines
3.5 KiB
Plaintext
<<<<<<< HEAD
|
|
page{background-color:#f3f3f4}.payment_pre_stored_header{background-color:#fff;display:flex;align-items:center;justify-content:space-between;padding:25rpx 30rpx;position:fixed;top:0;left:0;right:0;z-index:100;color:#3d3d3d;font-size:28rpx;border-top:1rpx solid #eee}.payment_pre_stored_header .name{display:flex;align-items:center}.pre_stored_content{padding-top:110rpx}.pre_stored_content .card_head_title{padding:30rpx 30rpx 0;color:#3d3d3d;font-size:28rpx}.pre_stored_card_item{margin:30rpx 30rpx 0;border-radius:20rpx;padding:0 30rpx;background:linear-gradient(155deg,#f0f6ff 0%,#ffffff 35%,#ffffff 35%)}.pre_stored_card_item .card_header{color:#3d3d3d;font-size:28rpx;display:flex;align-items:center;border-bottom:1rpx solid #eee;padding:30rpx 0}.pre_stored_card_item .card_header .label_tab_group{display:flex;align-items:center}.pre_stored_card_item .card_header .label_tab{border-radius:4rpx;font-size:24rpx;padding:3rpx 6rpx;margin-left:10rpx}.pre_stored_card_item .card_header .label_tab1{background-color:#eee2ff;color:#722ed1}.pre_stored_card_item .card_header .label_tab2{background-color:#fff0eb;color:#df3600}.pre_stored_card_item .card_header .label_tab3{color:#389e0d;background-color:#ebffe2}.pre_stored_card_item .card_content{display:flex;align-items:center;justify-content:space-between;padding:30rpx 0 45rpx;text-align:center}.pre_stored_card_item .card_content .price_item .price{color:#333;font-size:60rpx;font-weight:700}.pre_stored_card_item .card_content .price_item .price_label{color:#666;font-size:24rpx;padding-top:20rpx}.pre_stored_card_item .card_content .group_btn{color:#2a7efb;font-size:24rpx;padding:35rpx 50rpx 0}
|
|
=======
|
|
page{background-color:#f3f3f4}.payment_pre_stored_header{background-color:#fff;display:flex;align-items:center;justify-content:space-between;padding:25rpx 30rpx;position:fixed;top:0;left:0;right:0;z-index:100;color:#3d3d3d;font-size:28rpx;border-top:1rpx solid #eee}.payment_pre_stored_header .name{display:flex;align-items:center}.pre_stored_content{padding-top:110rpx}.pre_stored_content .card_head_title{padding:30rpx 30rpx 0;color:#3d3d3d;font-size:28rpx}.pre_stored_card_item{margin:30rpx 30rpx 0;border-radius:20rpx;padding:0 30rpx;background:linear-gradient(155deg,#f0f6ff 0%,#ffffff 35%,#ffffff 35%)}.pre_stored_card_item .card_header{color:#3d3d3d;font-size:28rpx;display:flex;align-items:center;border-bottom:1rpx solid #eee;padding:30rpx 0}.pre_stored_card_item .card_header .label_tab_group{display:flex;align-items:center}.pre_stored_card_item .card_header .label_tab{border-radius:4rpx;font-size:24rpx;padding:3rpx 6rpx;margin-left:10rpx}.pre_stored_card_item .card_header .label_tab1{background-color:#eee2ff;color:#722ed1}.pre_stored_card_item .card_header .label_tab2{background-color:#fff0eb;color:#df3600}.pre_stored_card_item .card_header .label_tab3{color:#389e0d;background-color:#ebffe2}.pre_stored_card_item .card_content{display:flex;align-items:center;justify-content:space-between;padding:30rpx 0 45rpx;text-align:center}.pre_stored_card_item .card_content .price_item .price{color:#333;font-size:60rpx;font-weight:700;text-align:left}.pre_stored_card_item .card_content .price_item .price_label{color:#666;font-size:24rpx;padding-top:20rpx}.pre_stored_card_item .card_content .group_btn{color:#2a7efb;font-size:24rpx;padding:35rpx 50rpx 0}.cannot_activated_item{background:#fff}.cannot_activated_item .card_content .price_item .cannot_activated_price{color:#999}.cannot_activated_item .card_header{color:#666}
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|