yangjun
/
sadjv3_jishi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单页面调整

This commit is contained in:
曹磊 2024-07-23 23:00:15 +08:00
parent 10ee602aae
commit 312a3863a5
3 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
my/order/revenueDetails.vue
View File

@ -131,7 +131,7 @@
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">会员减免</span>
<span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">是否提前结束</span>
@ -193,7 +193,7 @@
</view>
<view class="mian-view-list">
<view class="mian-view-list-title">会员减免</view>
<view class="mian-view-list-text" >-￥{{order.addVipReductionMoney}}</view>
<view class="mian-view-list-text" style="color: #FF6000;">-￥{{order.addVipReductionMoney}}</view>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务时长</span>
@ -235,10 +235,6 @@
<span class="mian-view-list-text" v-if="order.oldMassagePrice!=null">￥{{order.oldMassagePrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
<view class="mian-view-list">
<view class="mian-view-list-title">会员减免</view>
<view class="mian-view-list-text">-￥{{order.vipReductionMoney}}</view>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级后价格</span>
<span class="mian-view-list-text" v-if="order.massagePrice!=null">￥{{order.massagePrice}}</span>
@ -246,7 +242,7 @@
</view>
<view class="mian-view-list">
<view class="mian-view-list-title">会员减免</view>
<view class="mian-view-list-text">-￥{{order.vipReductionMoney}}</view>
<view class="mian-view-list-text" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">支付差价</span>
@ -493,14 +489,14 @@
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">会员减免</span>
<span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">是否提前结束</span>
<span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view>
<view class="mian-content-textarea">
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view>
</view>
@ -524,7 +520,7 @@
</view>
<view class="mian-view-list">
<view class="mian-view-list-title">会员减免</view>
<view class="mian-view-list-text" >-￥{{order.addVipReductionMoney}}</view>
<view class="mian-view-list-text" style="color: #FF6000;">-￥{{order.addVipReductionMoney}}</view>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务时长</span>
@ -573,7 +569,7 @@
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟收益</span>
<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}</span>
<span class="mian-view-list-text">￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}</span>
</view>
</view>
<view class="yiji">
@ -774,14 +770,14 @@
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">会员减免</span>
<span class="mian-view-list-text">-￥{{order.vipReductionMoney}}</span>
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">是否提前结束</span>
<span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view>
<view class="mian-content-textarea">
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view>
</view>
@ -791,7 +787,7 @@
</view>
<view class="mian-content" style="margin-bottom: 10px;">
<view class="mian-view-list">
<span class="mian-view-list-title">提成比例333</span>
<span class="mian-view-list-title">提成比例</span>
<span class="mian-view-list-text">{{order.artificerRate*100}}%</span>
</view>
<view class="mian-view-list">
@ -991,8 +987,7 @@
</view>
<view class="mian-view-list">
<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<span class="mian-view-list-text">
{{order.ordersMassageList[0].userPackageDetail.mainTitle}}
</span>
@ -1007,11 +1002,11 @@
<span class="mian-view-list-title">项目金额</span>
<span class="mian-view-list-text">￥{{order.massagePrice}}</span>
</view>
<view class="mian-view-list">
<!-- <view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
</view> -->
<view class="mian-view-list">
<span class="mian-view-list-title">项目收益</span>
<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
@ -1022,7 +1017,7 @@
<span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view>
<view class="mian-content-textarea">
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view>
</view>
@ -1116,8 +1111,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- 套餐疗程次卡 加钟 没有升级 -->
<view v-if="order.isSupplement!='2'&&order.addNum!=null">
@ -1203,8 +1197,7 @@
{{order.ordersNo}}
<u-icon name="file-text"/>
</span>
</view>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">下单时间</span>
<span class="mian-view-list-text">{{order.createTime}}</span>
@ -1243,11 +1236,11 @@
<span class="mian-view-list-title">项目金额</span>
<span class="mian-view-list-text">￥{{order.massagePrice}}</span>
</view>
<view class="mian-view-list">
<!-- <view class="mian-view-list">
<span class="mian-view-list-title">优惠券</span>
<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view>
</view> -->
<view class="mian-view-list">
<span class="mian-view-list-title">项目收益</span>
<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
@ -1258,7 +1251,7 @@
<span class="mian-view-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view>
<view class="mian-content-textarea">
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<span class="mian-view-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view>
</view>
@ -1282,7 +1275,7 @@
</view>
<view class="mian-view-list">
<view class="mian-view-list-title">会员减免</view>
<view class="mian-view-list-text" >-￥{{order.addVipReductionMoney}}</view>
<view class="mian-view-list-text" style="color: #FF6000;">-￥{{order.addVipReductionMoney}}</view>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">服务时长</span>
@ -1332,7 +1325,7 @@
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">加钟收益</span>
<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
<span class="mian-view-list-text">￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
</view>
</view>
<view class="yiji">

20
pages/index/index.vue
View File

@ -456,7 +456,10 @@
</view>
<view class="flex justify-between padding-sm ">
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
<view class="progress-text">
<text class="title-font">预约时间：</text>
<text class="value-font">{{ item.serveTime }}</text>
</view>
<view class="progress-status" v-if="item.status == 1">待付款</view>
<view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 5">已完成</view>
@ -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;
}
</style>

12
pages/order/index.vue
View File

@ -149,7 +149,7 @@
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goZhuan(item)" v-if="item.status == 8&&item.isCanSupplement=='1'">转待补单</u-button>
<u-button v-if="item.status == 6" :custom-style="customStyle1" shape="circle" :plain="true"
<u-button v-if="item.status == 6&&(item.earlyFinishReason!=null||item.endOfServiceTimer<0)" :custom-style="customStyle1" shape="circle" :plain="true"
@click="cancel(item)">服务完成</u-button>
<u-button v-if="item.status == 9&& !item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
@click="nineState(item.ordersId)">确认接单</u-button>
@ -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();
})