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.1 KiB
Plaintext
6 lines
3.1 KiB
Plaintext
<<<<<<< HEAD
|
|
page{background-color:#f3f3f4}.information_head{background:linear-gradient(180deg,#fff8f1 0%,#fff3e5 100%);padding:30rpx;margin:30rpx 30rpx 0;display:flex;align-items:self-start;color:#333;font-size:27rpx;border-radius:10rpx}.information_head text{padding-left:10rpx}.invitation_title{font-size:30rpx;font-weight:500;padding:30rpx 30rpx 0}.access_control_equipment{padding:0 30rpx;display:flex;align-items:center;flex-wrap:wrap;flex:1;justify-content:space-between;-moz-column-gap:30rpx;column-gap:30rpx}.access_control_equipment .item{width:calc(43% - 30rpx);background-color:#fff;border-radius:15rpx;padding:30rpx;margin-top:30rpx}.access_control_equipment .item .header{display:flex;align-items:center;justify-content:space-between}.access_control_equipment .item .icon{width:70rpx;height:70rpx;background-color:#f8f8f8;display:flex;align-items:center;justify-content:center;border-radius:10rpx}.access_control_equipment .item .name{width:100%;font-size:28rpx;color:#333;padding-top:20rpx}.day_list_container{display:flex;align-items:center;flex-wrap:wrap;background-color:#fff;margin:30rpx;border-radius:15rpx;padding:0 30rpx 30rpx 0}.day_list_container .item{width:20%;height:70rpx;background-color:#f8f8f8;border-radius:10rpx;display:flex;align-items:center;justify-content:center;margin-top:30rpx;font-size:26rpx;color:#333;margin-left:30rpx}.day_list_container .active{background-color:#2a7efb;color:#fff}
|
|
=======
|
|
page{background-color:#f3f3f4}.information_head{background:linear-gradient(180deg,#fff8f1 0%,#fff3e5 100%);padding:30rpx;margin:30rpx 30rpx 0;display:flex;align-items:self-start;color:#333;font-size:27rpx;border-radius:10rpx}.information_head text{padding-left:10rpx}.invitation_title{font-size:30rpx;font-weight:500;padding:30rpx 30rpx 0}.access_control_equipment{padding:0 30rpx;display:flex;align-items:center;flex-wrap:wrap;flex:1;justify-content:space-between;-moz-column-gap:30rpx;column-gap:30rpx}.access_control_equipment .item{width:calc(50% - 20rpx);background-color:#fff;border-radius:15rpx;padding:30rpx 0;margin-top:30rpx;position:relative;display:flex;align-items:center;border:1px solid #fff}.access_control_equipment .item .name{flex:1;font-size:32rpx;color:#3d3d3d;padding:0 20rpx}.access_control_equipment .item .icon{width:100rpx;height:100rpx;display:flex;align-items:center;justify-content:center;border-radius:10rpx}.access_control_equipment .item .icon image{width:100%;height:100%}.access_control_equipment .item .select_icon{position:absolute;right:-2rpx;bottom:-1px;width:44rpx;height:44rpx;z-index:100}.access_control_equipment .item .select_icon image{width:44rpx;height:44rpx}.access_control_equipment .active{border:1px solid #2a7efb}.day_list_container{display:flex;align-items:center;flex-wrap:wrap;background-color:#fff;margin:30rpx;border-radius:15rpx;padding:0 30rpx 30rpx 0}.day_list_container .item{width:20%;height:70rpx;background-color:#f8f8f8;border-radius:10rpx;display:flex;align-items:center;justify-content:center;margin-top:30rpx;font-size:26rpx;color:#333;margin-left:30rpx}.day_list_container .active{background-color:#2a7efb;color:#fff}
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|