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
120 lines
2.9 KiB
Plaintext
120 lines
2.9 KiB
Plaintext
page {
|
|
background-color: #f8f8f8;
|
|
}
|
|
.work_contents {
|
|
<<<<<<< HEAD
|
|
padding: 100rpx 0 0 0;
|
|
=======
|
|
padding: 220rpx 0 0 0;
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|
|
}
|
|
.work_contents .work_item {
|
|
background-color: #fff;
|
|
border-radius: 10rpx;
|
|
margin: 30rpx 30rpx 0 30rpx;
|
|
border-radius: 15rpx;
|
|
padding: 0 30rpx 30rpx 30rpx;
|
|
}
|
|
.work_contents .work_item .work_item_header {
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
padding: 25rpx 0;
|
|
font-size: 24rpx;
|
|
color: #3d3d3d;
|
|
}
|
|
.work_contents .work_item .work_item_header .btn_type {
|
|
border: 1rpx solid #eee;
|
|
padding: 7rpx 19rpx;
|
|
border-radius: 100rpx;
|
|
}
|
|
.work_contents .work_item .work_item_header .btn_status {
|
|
border-radius: 100rpx;
|
|
padding: 7rpx 19rpx;
|
|
}
|
|
<<<<<<< HEAD
|
|
=======
|
|
.work_contents .work_item .work_item_header .btn_status_Pending {
|
|
color: #f97316;
|
|
background-color: #fff7ed;
|
|
}
|
|
.work_contents .work_item .work_item_header .btn_status_Processing, .work_contents .work_item .work_item_header .btn_status_PendingAcceptance {
|
|
color: #0082fa;
|
|
background-color: #edf4ff;
|
|
}
|
|
.work_contents .work_item .work_item_header .btn_status_PendingPayment {
|
|
color: #cf1322;
|
|
background-color: #ffeded;
|
|
}
|
|
.work_contents .work_item .work_item_header .btn_status_Completed {
|
|
color: #22c55e;
|
|
background-color: #f0fdf4;
|
|
}
|
|
.work_contents .work_item .work_item_header .btn_status_Closed {
|
|
color: #909399;
|
|
background-color: #f3f3f4;
|
|
}
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|
|
.work_contents .work_item .work_item_header .work_item_header_left {
|
|
display: flex;
|
|
align-items: center;
|
|
}
|
|
.work_contents .work_item .work_item_header .work_item_header_left .btn_type {
|
|
margin-right: 30rpx;
|
|
}
|
|
.work_contents .work_item .work_item_houses {
|
|
display: flex;
|
|
align-items: center;
|
|
font-size: 28rpx;
|
|
font-weight: 500;
|
|
}
|
|
.work_contents .work_item .work_item_houses .item {
|
|
height: 30rpx;
|
|
line-height: 30rpx;
|
|
}
|
|
.work_contents .work_item .work_item_houses .item:last-child {
|
|
border-left: 1rpx solid #eee;
|
|
padding-left: 15rpx;
|
|
margin-left: 15rpx;
|
|
}
|
|
.work_contents .work_item .work_item_des {
|
|
color: #444444;
|
|
font-size: 28rpx;
|
|
padding: 12rpx 0 10rpx 0;
|
|
}
|
|
.work_contents .work_item .work_item_cell {
|
|
color: #666666;
|
|
font-size: 26rpx;
|
|
padding-top: 15rpx;
|
|
display: flex;
|
|
align-items: center;
|
|
}
|
|
.work_contents .work_item .work_item_footer {
|
|
border-top: 1rpx solid #eee;
|
|
padding: 25rpx 0 0 0;
|
|
margin-top: 25rpx;
|
|
display: flex;
|
|
justify-content: flex-end;
|
|
align-items: center;
|
|
}
|
|
.work_contents .work_item .work_item_images {
|
|
display: flex;
|
|
align-items: center;
|
|
flex-wrap: wrap;
|
|
}
|
|
.work_contents .work_item .work_item_images .item {
|
|
width: 140rpx;
|
|
height: 140rpx;
|
|
border-radius: 10rpx;
|
|
background-color: #f8f8f8;
|
|
margin-top: 25rpx;
|
|
margin-right: 25rpx;
|
|
overflow: hidden;
|
|
}
|
|
.work_contents .work_item .work_item_images .item:nth-child(4n) {
|
|
margin-right: 0;
|
|
}
|
|
.work_contents .work_item .work_item_images .item image {
|
|
width: 100%;
|
|
height: 100%;
|
|
} |