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.4 KiB
Plaintext
6 lines
2.4 KiB
Plaintext
<<<<<<< HEAD
|
|
.area_functional.data-v-f2ee52e1{background-color:#fff;display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;margin:30rpx;border-radius:20rpx;color:#3d3d3d;font-size:24rpx;padding:10rpx 0 40rpx}.area_functional .item.data-v-f2ee52e1{text-align:center;position:relative;padding-top:30rpx;width:25%}.area_functional .item .icon.data-v-f2ee52e1{width:100%;height:42rpx}.area_functional .item .icon image.data-v-f2ee52e1{height:42rpx}.area_functional .item .label.data-v-f2ee52e1{padding-top:10rpx}.house_wallet.data-v-f2ee52e1{display:flex;align-items:center;justify-content:space-between;margin:0 30rpx;padding-bottom:30rpx}.house_wallet .item.data-v-f2ee52e1{background-color:#fff;border-radius:20rpx;width:330rpx;height:140rpx;display:flex;align-items:center;justify-content:space-between}.house_wallet .item .content.data-v-f2ee52e1{padding:0 0 0 30rpx}.house_wallet .item .title.data-v-f2ee52e1{color:#3d3d3d;font-size:28rpx;font-weight:500;padding-bottom:10rpx}.house_wallet .item image.data-v-f2ee52e1{width:80rpx;height:80rpx;margin-right:30rpx}.house_wallet .item .value.data-v-f2ee52e1{color:#999;font-size:24rpx}.house_wallet .item .value text.data-v-f2ee52e1{color:#c45656}
|
|
=======
|
|
.area_functional.data-v-6009f5b9{background-color:#fff;display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;margin:30rpx;border-radius:20rpx;color:#3d3d3d;font-size:24rpx;padding:10rpx 0 40rpx}.area_functional .item.data-v-6009f5b9{text-align:center;position:relative;padding-top:30rpx;width:25%}.area_functional .item .icon.data-v-6009f5b9{width:100%;height:42rpx}.area_functional .item .icon image.data-v-6009f5b9{height:42rpx}.area_functional .item .label.data-v-6009f5b9{padding-top:10rpx}.house_wallet.data-v-6009f5b9{display:flex;align-items:center;justify-content:space-between;margin:0 30rpx;padding-bottom:30rpx}.house_wallet .item.data-v-6009f5b9{background-color:#fff;border-radius:20rpx;width:330rpx;height:140rpx;display:flex;align-items:center;justify-content:space-between}.house_wallet .item .content.data-v-6009f5b9{padding:0 0 0 30rpx}.house_wallet .item .title.data-v-6009f5b9{color:#3d3d3d;font-size:28rpx;font-weight:500;padding-bottom:10rpx}.house_wallet .item image.data-v-6009f5b9{width:80rpx;height:80rpx;margin-right:30rpx}.house_wallet .item .value.data-v-6009f5b9{color:#999;font-size:24rpx}.house_wallet .item .value text.data-v-6009f5b9{color:#c45656}
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|