diff --git a/manifest.json b/manifest.json index ade7ac4..ffded07 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,8 @@ "OAuth" : {}, "Maps" : {}, "Camera" : {}, - "Record" : {} + "Record" : {}, + "Push" : {} }, /* 应用发布信息 */ "distribute" : { diff --git a/my/fund/index.css b/my/fund/index.css index dc175cd..522dc34 100644 --- a/my/fund/index.css +++ b/my/fund/index.css @@ -34,7 +34,7 @@ .innerTopRight { height: fit-content; - font-size: 16px; + font-size: 13px; display: flex; justify-content: right; padding-right: 10px; @@ -64,9 +64,9 @@ } .innerTimer{ - font-size: 14px; + font-size: 13px; margin-top: 5px; - color: #666; + color: #999; margin-right: 10px; } .totalIntegral { @@ -159,7 +159,7 @@ color: #0aa86a; background-color: #FFFFFF; padding: 6px; - border-radius: 10px; + border-radius: 30px; width: 60px; text-align: center; } @@ -224,12 +224,14 @@ .storedIntegralMiddle view:nth-child(1) { margin-left: 3px; - color: #666; + color: #999; + font-size: 30rpx; } .storedIntegralMiddleofRight { margin-right: 19px; - color: #666; + color: #333; + font-size: 30rpx; } .storedIntegralBottom { @@ -238,6 +240,7 @@ margin-left: 3px; border-bottom: 1px solid #f4f4f4; color:#999; + font-size: 26rpx; } .withdrawalMoneyBtn { diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue index c6c4349..537874f 100644 --- a/my/order/revenueDetails.vue +++ b/my/order/revenueDetails.vue @@ -16,14 +16,15 @@ {{(order.ordersMassageList[0].massageType || {}).title}} - 待付款 + 待服务 - 待评价 - 已完成 + 待评价 + + 已完成 服务中 - 已出发 - 已到达 - 已取消 + 技师出发 + 技师到达 + 确认接单 服务时长: {{(order.ordersMassageList[0].massageType || {}).duration}}分钟 @@ -103,50 +104,59 @@ 70.00% --> - + + + 加钟信息 + 是否加钟 - {{order.addNum!=''?'是':'否'}} + {{order.addNum!=null?'是':'-'}} 加钟项目 - {{order.jzName!=''?order.jzName:'无'}} + {{order.jzName!=null?order.jzName:'-'}} 加钟数量 - {{order.addNum}} + {{order.addNum!=null?order.addNum:'-'}} 加钟金额 - ¥{{order.addMoney}} + ¥{{order.addMoney}} + - - - - 是否改价 - {{order.isSupplement!=''?'是':'否'}} + + + 服务升级 - 改价项目 - {{order.gjName!=''?order.gjName:'无'}} + 是否升级 + {{order.isSupplement!=null?'是':'-'}} - 改价金额 - ¥{{order.gjPrice}} + 升级项目 + {{order.gjName!=null?order.gjName:'-'}} + + + 升级金额 + ¥{{order.gjPrice}} + - 支付差价 - ¥{{order.gjcePrice}} + ¥{{order.gjcePrice}} + - - + 是否提前结束 - {{order.earlyFinishReason!=''?'是':'否'}} + {{order.earlyFinishReason!=null?'是':'-'}} 提前结束原因 - + - -