Your Name 6d31441e12 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-customer into develop
* '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
2025-12-15 18:26:08 +08:00

183 lines
4.1 KiB
Plaintext

page {
background-color: #f8f8f8;
}
.work_page {
padding-bottom: calc(150rpx + constant(safe-area-inset-bottom));
padding-bottom: calc(150rpx + env(safe-area-inset-bottom));
}
.show_card {
margin: 30rpx;
background-color: #fff;
border-radius: 10rpx;
padding: 0 30rpx;
}
.show_card .card_header_type_status {
display: flex;
align-items: center;
justify-content: space-between;
padding: 25rpx 0;
}
.show_card .card_header_type_status .btn_type {
border: 1rpx solid #eee;
font-size: 28rpx;
padding: 7rpx 19rpx;
border-radius: 100rpx;
}
.show_card .card_header_type_status .btn_status {
border-radius: 100rpx;
font-size: 28rpx;
padding: 7rpx 19rpx;
}
<<<<<<< HEAD
=======
.show_card .card_header_type_status .btn_status_Pending {
color: #f97316;
background-color: #fff7ed;
}
.show_card .card_header_type_status .btn_status_Processing, .show_card .card_header_type_status .btn_status_PendingAcceptance {
color: #0082fa;
background-color: #edf4ff;
}
.show_card .card_header_type_status .btn_status_PendingPayment {
color: #cf1322;
background-color: #ffeded;
}
.show_card .card_header_type_status .btn_status_Completed {
color: #22c55e;
background-color: #f0fdf4;
}
.show_card .card_header_type_status .btn_status_Closed {
color: #909399;
background-color: #f3f3f4;
}
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
.show_card .card_header_type_status .work_item_header_left {
display: flex;
align-items: center;
}
.show_card .card_header_type_status .work_item_header_left .btn_type {
margin-right: 30rpx;
}
.show_card .card_header_huse_info {
display: flex;
align-items: center;
font-size: 28rpx;
}
.show_card .card_header_huse_info text {
display: inline-block;
height: 28rpx;
line-height: 28rpx;
}
.show_card .card_header_huse_info text:last-child {
margin-left: 15rpx;
border-left: 1rpx solid #eee;
padding-left: 15rpx;
}
.show_card .card_header_content_info {
font-size: 30rpx;
color: #444;
padding: 15rpx 0 0 0;
}
.show_card .card_header_imgs {
display: flex;
align-items: center;
flex-wrap: wrap;
padding-bottom: 30rpx;
}
.show_card .card_header_imgs .item {
width: 140rpx;
height: 140rpx;
border-radius: 10rpx;
background-color: #f8f8f8;
margin-top: 25rpx;
margin-right: 25rpx;
overflow: hidden;
}
.show_card .card_header_imgs .item:nth-child(4n) {
margin-right: 0;
}
.show_card .card_header_imgs .item image {
width: 100%;
height: 100%;
}
.show_card_footer {
border-top: 1rpx solid #eee;
padding: 10rpx 0;
margin-top: 10rpx;
}
.work_item_cell {
display: flex;
align-items: center;
justify-content: space-between;
<<<<<<< HEAD
font-size: 30rpx;
=======
font-size: 28rpx;
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
color: #333;
padding-top: 25rpx;
}
.work_item_cell:last-child {
padding-bottom: 25rpx;
}
.work_item_cell text {
font-size: 27rpx;
<<<<<<< HEAD
=======
}
.show_card_title {
font-size: 28rpx;
padding: 30rpx 0;
font-weight: 500;
}
.work_order_footer {
position: fixed;
bottom: 0;
left: 0;
right: 0;
box-shadow: 0px -3px 7px rgba(206, 206, 206, 0.25);
padding: 30rpx 30rpx 0 30rpx;
z-index: 100;
background-color: #fff;
padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
display: flex;
justify-content: space-between;
align-items: center;
}
.work_order_footer .btn {
padding: 20rpx 0;
flex: 1;
border-radius: 100rpx;
text-align: center;
background-color: #0082fa;
color: #fff;
font-size: 28rpx;
margin-right: 30rpx;
}
.work_order_footer .btn:first-child, .work_order_footer .btn:nth-child(2) {
background-color: #f3f3f4;
color: #333333;
margin-right: 30rpx;
}
.work_order_footer .btn:last-child {
margin-right: 0;
background-color: #0082fa;
color: #fff;
}
.work_order_footer .handle_rework_btn {
background-color: #f3f3f4 !important;
color: #333 !important;
}
.work_order_footer .btn_close {
text-align: center;
font-size: 20rpx;
padding-right: 30rpx;
color: #3d3d3d;
}
.work_order_footer .btn_close .icon_close {
display: flex;
align-items: center;
justify-content: center;
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
}