diff --git a/colorui/main.css b/colorui/main.css index fade3b2..6bebc05 100644 --- a/colorui/main.css +++ b/colorui/main.css @@ -804,6 +804,9 @@ button.cuIcon.lg { .cu-capsule .cu-tag { margin: 0; + font-size: 25rpx; + padding: 0rpx 12rpx; + height: 42rpx; } .cu-capsule .cu-tag[class*="line-"]:last-child::after { @@ -3026,8 +3029,12 @@ scroll-view.cu-steps .cu-item { .margin-top-sm { margin-top: 20upx; + + } - +.margin-top-sm .labels { + font-size: 30upx; + } .margin-top { margin-top: 30upx; } diff --git a/components/goods-card/horizontal-goods-card.vue b/components/goods-card/horizontal-goods-card.vue index 3da849c..917e69f 100644 --- a/components/goods-card/horizontal-goods-card.vue +++ b/components/goods-card/horizontal-goods-card.vue @@ -8,7 +8,7 @@ {{product.remark}} - + diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue index 0e2d906..e8ce336 100644 --- a/pages/demand-center/accept-demand-center.vue +++ b/pages/demand-center/accept-demand-center.vue @@ -71,11 +71,16 @@ {{tagContent}} - 到付单 - 有待付款 - 款已付清 - - 合约订单 + 合约单 + 到付单 + + - {{task.expectTimeStartFront + '~' + task.expectTimeEndFront}} - {{task.expectTimeStartFront}} + 期望时间:{{task.expectTimeStartFront + '~' + task.expectTimeEndFront}} + 期望时间:{{task.expectTimeStartFront}} diff --git a/pages/demand-center/demand-detail.vue b/pages/demand-center/demand-detail.vue index 1f00048..b40dd17 100644 --- a/pages/demand-center/demand-detail.vue +++ b/pages/demand-center/demand-detail.vue @@ -24,8 +24,8 @@ - {{order.expectTimeStartFront + '~' + order.expectTimeEndFront}} - {{order.expectTimeStartFront}} + 期望时间:{{order.expectTimeStartFront + '~' + order.expectTimeEndFront}} + 期望时间:{{order.expectTimeStartFront}} diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue index 9d7a54e..6b4c415 100644 --- a/pages/order-manage/modal/new-serv-price-offline.vue +++ b/pages/order-manage/modal/new-serv-price-offline.vue @@ -59,13 +59,22 @@ 退出/再次上门 - 直接完单 - 请客户支付 - 去完单 + + + diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue index 3e19087..7b9e478 100644 --- a/pages/order-manage/modal/new-serv-price-online.vue +++ b/pages/order-manage/modal/new-serv-price-online.vue @@ -56,12 +56,22 @@ 退出/再次上门 - 直接完单 - 请客户支付 - 去完单 + + + diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index ccdf739..774156a 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -110,11 +110,17 @@ {{order.goodsSpecification}} - 到付单 - 有待付款 - 款已付清 + 合约单 + 到付单 + + - 合约订单 @@ -172,40 +178,50 @@ 完成时间:{{order.workFinishTime}} - - - 距完单分帐: - - - - - - 银联发起(T+1)支付中,正在刷新... - 详情 - - - - 银联发起(T+1)支付中:{{order.drawCashTime}} - 详情 - - - - - 货款分账成功:{{order.arrivalTime}} - - - - 提现失败 - + + + - 服务地址:{{servDetail.address}} + 服务地址:{{servDetail.address}} - 客户:{{servDetail.customerName}} + 客户:{{servDetail.customerName}} {{servDetail.customerPhone.substring(0, 3) + "****" + servDetail.customerPhone.substring(7)}} - 派单公司:{{servDetail.masterCompanyName}} + 派单公司:{{servDetail.masterCompanyName}} {{servDetail.masterWorkerPhone}} - 预约时间:{{servDetail.expectTimeStartFront + '~' + servDetail.expectTimeEndFront}} - 预约时间:{{servDetail.expectTimeStartFront}} + 预约时间:{{servDetail.expectTimeStartFront + '~' + servDetail.expectTimeEndFront}} + 预约时间:{{servDetail.expectTimeStartFront}} - 上门时间:{{servDetail.workBeginTime}} + 上门时间:{{servDetail.workBeginTime}} - + - 备注:{{servDetail.customerRemark}} + 备注:{{servDetail.customerRemark}} - 服务金额: + 服务金额: {{servDetail.payAddMoney}} 【订单加价,单独到账】 @@ -122,7 +122,7 @@ - {{servDetail.remark}} + 订单备注: {{servDetail.remark}}