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
2.7 KiB
Plaintext
6 lines
2.7 KiB
Plaintext
<<<<<<< HEAD
|
|
.type_select.data-v-8329d40b{padding:30rpx 0 0;white-space:nowrap}.type_select .type_select_item.data-v-8329d40b{color:#333;display:inline-block;border:1px solid #909399;border-radius:100rpx;background-color:#fff;padding:8rpx 20rpx;margin-left:30rpx;font-size:24rpx}.type_select .type_select_item.data-v-8329d40b:last-child{margin-right:30rpx}.type_select .type_select_item_active.data-v-8329d40b{color:#2a7efb;border:1px solid #2a7efb}.convenience_services_list.data-v-8329d40b{background-color:#fff;border-radius:15rpx;padding:0 30rpx 30rpx;margin:30rpx 30rpx 0}.convenience_services_list_title.data-v-8329d40b{color:#333;font-size:28rpx;font-weight:500;display:flex;align-items:center;padding:30rpx 0 0}.convenience_services_list_title text.data-v-8329d40b{width:3px;height:30rpx;background-color:#2a7efb;border-radius:100rpx;margin-right:10rpx;display:inline-block}.convenience_services_list_cell.data-v-8329d40b{display:flex;align-items:center;justify-content:space-between;color:#333;font-size:28rpx;padding:25rpx 30rpx;border-radius:20rpx;background-color:#f7f8fc;margin-top:25rpx}.convenience_services_list_cell .phone_btn.data-v-8329d40b{color:#2a7efb}.convenience_services_list_cell .phone_btn image.data-v-8329d40b{width:60rpx;height:60rpx}.convenience_services_list .error.data-v-8329d40b{padding-top:16rpx;color:#c45656;font-size:24rpx}
|
|
=======
|
|
.type_select.data-v-1fce6f30{padding:30rpx 0 0;white-space:nowrap}.type_select .type_select_item.data-v-1fce6f30{color:#333;display:inline-block;border:1px solid #909399;border-radius:100rpx;background-color:#fff;padding:8rpx 20rpx;margin-left:30rpx;font-size:24rpx}.type_select .type_select_item.data-v-1fce6f30:last-child{margin-right:30rpx}.type_select .type_select_item_active.data-v-1fce6f30{color:#2a7efb;border:1px solid #2a7efb}.convenience_services_list.data-v-1fce6f30{background-color:#fff;border-radius:15rpx;padding:0 30rpx 30rpx;margin:30rpx 30rpx 0}.convenience_services_list_title.data-v-1fce6f30{color:#333;font-size:28rpx;font-weight:500;display:flex;align-items:center;padding:30rpx 0 0}.convenience_services_list_title text.data-v-1fce6f30{width:3px;height:30rpx;background-color:#2a7efb;border-radius:100rpx;margin-right:10rpx;display:inline-block}.convenience_services_list_cell.data-v-1fce6f30{display:flex;align-items:center;justify-content:space-between;color:#333;font-size:28rpx;padding:25rpx 30rpx;border-radius:20rpx;background-color:#f7f8fc;margin-top:25rpx}.convenience_services_list_cell .phone_btn.data-v-1fce6f30{color:#2a7efb}.convenience_services_list_cell .phone_btn image.data-v-1fce6f30{width:60rpx;height:60rpx}.convenience_services_list .error.data-v-1fce6f30{padding-top:16rpx;color:#c45656;font-size:24rpx}
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|