diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 1628586..7483389 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -75,15 +75,18 @@
-
- 订单编号: {{order.ordersNo}}
-
-
- 项目明细
+ 项目信息
+
+ 订单编号
+
+ {{order.ordersNo}}
+
+
+
服务项目
@@ -98,117 +101,14 @@
预约时间
{{order.serveTime}}
-
-
-
- 优惠券金额
- -￥{{order.couponMoney}}
-
-
- 项目金额
- ￥{{order.massageMoney}}
-
-
-
-
- 加钟信息
-
-
- 是否加钟
- {{order.addNum!=null?'是':'-'}}
-
-
- 加钟项目
- {{order.jzName!=null?order.jzName:'-'}}
-
-
- 加钟数量
- {{order.addNum!=null?order.addNum:'-'}}
-
-
- 加钟金额
- ￥{{order.addMoney}}
- -
-
-
-
-
- 服务升级
-
-
- 是否升级
- {{order.isSupplement!=null?'是':'-'}}
-
-
- 升级项目
- {{order.gjName!=null?order.gjName:'-'}}
-
-
- 升级金额
- ￥{{order.gjPrice}}
- -
-
-
- 支付差价
- ￥{{order.gjcePrice}}
- -
-
-
-
-
- 是否提前结束
- {{order.earlyFinishReason!=null?'是':'-'}}
-
-
- 提前结束原因
-
-
-
-
-
- 扣费明细
-
-
-
-
- 渠道扣费
- -￥{{order.channelDeduction}}
-
-
- 储值扣费
- -￥{{order.valueStorageDeduction}}
-
-
- 管理费扣费
- -￥{{order.pingMoney}}
-
-
-
- 合计扣费
-
- ￥
- -{{order.channelDeduction+order.valueStorageDeduction+order.pingMoney}}
-
-
-
-
- 车费明细
-
-
-
出行方式
公交
@@ -227,19 +127,193 @@
提现手续费
-￥{{order.pingTaxiMoney}}
-->
-
- 车费收益
-
- ￥
- {{order.taxiMoney}}
-
+
+ 项目金额
+ ￥{{order.massagePrice}}
+
+
+ 优惠券
+ -￥{{order.couponMoney}}
+
+
+ 实付金额
+
+ ￥{{order.sumMoney}}
+
+
+ 是否提前结束
+ {{order.earlyFinishReason!=null?'是':'-'}}
+
+
+ 提前结束原因
+
+
+
+
+ 加钟信息
+
+
+
+
+ 是否加钟
+ {{order.addNum!=null?'是':'否'}}
+
+
+ 服务项目
+ {{order.jzName!=null?order.jzName:'-'}}
+
+
+ 项目价格
+ ￥{{order.addPrice}}
+ -
+
+
+ 加钟数量
+ {{order.addNum!=null?order.addNum:'-'}}
+
+
+
+ 加钟费用
+ ￥{{order.addMoney}}
+ -
+
+
+ 小计
+
+ ￥
+ {{order.addMoney}}
+
+ -
+
+
+
+ 服务升级
+
+
+
+
+ 是否升级
+ {{order.isSupplement!=null?'是':'否'}}
+
+
+ 升级项目
+ {{order.gjName!=null?order.gjName:'-'}}
+
+
+ 项目价格
+ ￥{{order.gjPrice}}
+ -
+
+
+
+ 支付差价
+ ￥{{order.gjcePrice}}
+ -
+
+
+ 小计
+
+ ￥
+ {{order.gjcePrice}}
+
+ -
+
+
+
+
+
+
+ 预计收益
+
+
+
+
+ 提成比例
+ {{order.artificerRate*100}}%
+
+
+ 项目金额
+ ￥{{xiangmuMoney}}
+
+
+ 优惠券
+ -￥{{order.couponMoney}}
+
+
+ 车费收益
+ ￥{{order.taxiMoney}}
+
+
+ 加钟费用
+ ￥{{order.addMoney!=null?order.addMoney:0}}
+
+
+ 升级费用
+ ￥{{order.gjPrice!=null?order.gjPrice:0}}
+
+
+
+
+
- 预计收益
+ 技师收益
￥
- {{order.sumArtificerMoney}}
+
+ {{jishishouyi}}
+
@@ -504,7 +578,10 @@
textareaTxt:'',
checkbox2:[],
refusalContent:'',
- imgList:[]
+ imgList:[],
+ koufeiMoney:'',
+ xiangmuMoney:'',
+ jishishouyi:''
}
},
@@ -997,7 +1074,14 @@
this.goods = [];
this.loading = false
uni.hideLoading()
- this.order = res.data
+ this.order = res.data;
+ //扣费明细 小计
+ this.koufeiMoney=this.order.channelDeduction+this.order.valueStorageDeduction+this.order.pingMoney
+ //预计收益下面 实际金额
+ this.xiangmuMoney=this.order.massagePrice*this.order.ordersMassageList[0].num*(this.order.vipRate/100)*(1+this.order.technicianRate/100)
+ //技师的总共收益
+ this.jishishouyi=((this.xiangmuMoney-this.order.couponMoney)*this.order.artificerRate+this.order.taxiMoney).toFixed(2)
+
this.formatEndTime = res.data.endTime;
if (this.order.artificerTaxiMoney && this.order.sumArtificerMoney) {
this.sumMoney = parseFloat(parseFloat(this.order.sumArtificerMoney) - parseFloat(this
@@ -1865,6 +1949,7 @@
position: relative;
align-items: center;
justify-content: center;
+ margin-top: 10px;
}
.mian-view{
width: 100%;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 6542f52..c6efe30 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -129,11 +129,11 @@
开始服务
转待补单
+ @click="goZhuan(item)" v-if="item.status == 8&&item.isCanSupplement=='1'">转待补单
服务完成
- 拒单申请
{
+ uni.hideLoading();
+ if (res.code == 0) {
+ that.judanBtnShow=res.data.value
+ } else {
+ that.$queue.showToast(res.msg);
+ }
+ })
+ },
+ goZhuan(item){//转待补单
+ var that=this;
+ var data={
+ ordersId:item.ordersId,
+ isAuto:1,
+ type:1
+ }
+ that.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
+ uni.hideLoading();
+ if (res.code == 0) {
+ that.mescroll.resetUpScroll()
+ that.$queue.showToast(res.msg);
+ } else {
+ that.$queue.showToast(res.msg);
+ }
+ })
+ },
goLogin(e) {//登录
uni.navigateTo({
url: e