diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 3516e9b..0bb504b 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -131,7 +131,7 @@
会员减免
- -￥{{order.vipReductionMoney}}
+ -￥{{order.vipReductionMoney}}
是否提前结束
@@ -193,7 +193,7 @@
会员减免
- -￥{{order.addVipReductionMoney}}
+ -￥{{order.addVipReductionMoney}}
服务时长
@@ -235,10 +235,6 @@
￥{{order.oldMassagePrice}}
-
-
- 会员减免
- -￥{{order.vipReductionMoney}}
-
升级后价格
￥{{order.massagePrice}}
@@ -246,7 +242,7 @@
会员减免
- -￥{{order.vipReductionMoney}}
+ -￥{{order.vipReductionMoney}}
支付差价
@@ -493,14 +489,14 @@
会员减免
- -￥{{order.vipReductionMoney}}
+ -￥{{order.vipReductionMoney}}
是否提前结束
{{order.earlyFinishReason!=null?'是':'-'}}
- 提前结束原因
+ 提前结束原因
@@ -524,7 +520,7 @@
会员减免
- -￥{{order.addVipReductionMoney}}
+ -￥{{order.addVipReductionMoney}}
服务时长
@@ -573,7 +569,7 @@
加钟收益
- ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}
+ ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}
@@ -774,14 +770,14 @@
会员减免
- -￥{{order.vipReductionMoney}}
+ -￥{{order.vipReductionMoney}}
是否提前结束
{{order.earlyFinishReason!=null?'是':'-'}}
- 提前结束原因
+ 提前结束原因
@@ -791,7 +787,7 @@
- 提成比例333
+ 提成比例
{{order.artificerRate*100}}%
@@ -991,8 +987,7 @@
- {{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称
-
+ {{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称
{{order.ordersMassageList[0].userPackageDetail.mainTitle}}
@@ -1007,11 +1002,11 @@
项目金额
￥{{order.massagePrice}}
-
+
项目收益
￥{{order.oldProjectBenefits}}
@@ -1022,7 +1017,7 @@
{{order.earlyFinishReason!=null?'是':'-'}}
- 提前结束原因
+ 提前结束原因
@@ -1116,8 +1111,7 @@
-
-
+
@@ -1203,8 +1197,7 @@
{{order.ordersNo}}
-
-
+
下单时间
{{order.createTime}}
@@ -1243,11 +1236,11 @@
项目金额
￥{{order.massagePrice}}
-
+
项目收益
￥{{order.oldProjectBenefits}}
@@ -1258,7 +1251,7 @@
{{order.earlyFinishReason!=null?'是':'-'}}
- 提前结束原因
+ 提前结束原因
@@ -1282,7 +1275,7 @@
会员减免
- -￥{{order.addVipReductionMoney}}
+ -￥{{order.addVipReductionMoney}}
服务时长
@@ -1332,7 +1325,7 @@
加钟收益
- ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}
+ ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fd05cb4..2609f26 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -456,7 +456,10 @@
- 预约时间：{{ item.serveTime }}
+
+ 预约时间：
+ {{ item.serveTime }}
+
待付款
待服务
已完成
@@ -1642,8 +1645,6 @@ page {
background-color: #f7f7f7;
}
.progress-text{
- font-size: 30rpx;
- color: #666;
padding-top: 8rpx;
}
.progress-status{
@@ -1651,13 +1652,13 @@ page {
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
- font-size: 28rpx;
+ font-size: 30rpx;
}
.progress-status-chaoshi{
color: #ff0000;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
- font-size: 28rpx;
+ font-size: 30rpx;
}
// .bg {
@@ -2058,4 +2059,13 @@ uni-switch::before {
margin-bottom: 5px;
}
+.title-font{
+ font-size: 30rpx;
+ color: #666666;
+}
+.value-font{
+ font-size: 30rpx;
+ color: #333333;
+}
+
\ No newline at end of file
diff --git a/pages/order/index.vue b/pages/order/index.vue
index dd7e06a..44ee006 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -149,7 +149,7 @@
转待补单
- 服务完成
确认接单
@@ -577,8 +577,8 @@
}).then(res => {
if (res.code == 0) {
that.$queue.showToast(res.msg);
- this.$refs.popup.close(this.type);
-
+ this.$refs.popup.close(this.type);
+ that.mescroll.resetUpScroll()
} else {
that.$queue.showToast(res.msg);
}
@@ -588,8 +588,7 @@
icon:"error",
title:'请填写拒单原因'
})
- }
-
+ }
},
nineState(ordersId){//确认接单
var that=this;
@@ -709,6 +708,9 @@
let currentTimeStamp = new Date().getTime() / 1000;
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
ret.endOfServiceTimer = formatTimeStamp;
+ console.log("dddd",ret.ordersNo);
+ console.log("eeee",ret.endOfServiceTimer);
+ console.log("ffff",ret.earlyFinishReason);
}
if (this.$refs.countDownEl) this.$refs.countDownEl.update();
})