This commit is contained in:
parent
62640100a3
commit
2eba23e019
|
|
@ -75,15 +75,18 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="diandan-num"@tap="copy(order.ordersNo)">
|
||||
订单编号: {{order.ordersNo}}<u-icon name="file-text"></u-icon>
|
||||
</view>
|
||||
|
||||
<view class="mina-title">
|
||||
<span class="mina-title-text">项目明细</span>
|
||||
<span class="mina-title-text">项目信息</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
</view>
|
||||
<view class="mian-view">
|
||||
<view class="mian-view-list" @tap="copy(order.ordersNo)">
|
||||
<span class="mian-view-list-title">订单编号</span>
|
||||
<span class="mian-view-list-text">
|
||||
{{order.ordersNo}}
|
||||
<u-icon name="file-text"/>
|
||||
</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">服务项目</span>
|
||||
<span class="mian-view-list-text" v-if="order && order.ordersMassageList">
|
||||
|
|
@ -98,117 +101,14 @@
|
|||
<span class="mian-view-list-title">预约时间</span>
|
||||
<span class="mian-view-list-text">{{order.serveTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mian-view">
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">优惠券金额</span>
|
||||
<span class="mian-view-list-text">-￥{{order.couponMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目金额</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.massageMoney}}</span>
|
||||
</view>
|
||||
<!-- <view class="mian-view-list">
|
||||
<span class="mian-view-list-title">提成比例</span>
|
||||
<span class="mian-view-list-text">70.00%</span>
|
||||
<span class="mian-view-list-title">预计开始时间</span>
|
||||
<span class="mian-view-list-text">{{order.startTime!=null?order.startTime:'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">预计结束时间</span>
|
||||
<span class="mian-view-list-text">{{order.endTime!=null?order.endTime:'-'}}</span>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="mian-view" v-if="order.status == 6">
|
||||
<view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
|
||||
<span class="mian-view-list-title">加钟信息</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">是否加钟</span>
|
||||
<span class="mian-view-list-text">{{order.addNum!=null?'是':'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟项目</span>
|
||||
<span class="mian-view-list-text">{{order.jzName!=null?order.jzName:'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟数量</span>
|
||||
<span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟金额</span>
|
||||
<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mian-view" v-if="order.status == 6">
|
||||
<view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
|
||||
<span class="mian-view-list-title">服务升级</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">是否升级</span>
|
||||
<span class="mian-view-list-text">{{order.isSupplement!=null?'是':'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级项目</span>
|
||||
<span class="mian-view-list-text">{{order.gjName!=null?order.gjName:'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级金额</span>
|
||||
<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.gjPrice}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">支付差价</span>
|
||||
<span class="mian-view-list-text" v-if="order.gjcePrice!=null">￥{{order.gjcePrice}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mian-content" style="margin-bottom: 10px;" v-if="order.status == 6">
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">是否提前结束</span>
|
||||
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-content-textarea">
|
||||
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span>
|
||||
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
|
||||
</view>
|
||||
<!-- <view class="yingde">
|
||||
<view class="yingde-title">应得收益</view>
|
||||
<view class="yingde-money">
|
||||
<span class="fuhao-hei">￥</span>
|
||||
<span class="num-hei">489</span>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="mina-title">
|
||||
<span class="mina-title-text">扣费明细</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
</view>
|
||||
<view class="mian-content" style="margin-bottom: 10px;">
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">渠道扣费</span>
|
||||
<span class="mian-content-list-text">-￥{{order.channelDeduction}}</span>
|
||||
</view>
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">储值扣费</span>
|
||||
<span class="mian-content-list-text">-￥{{order.valueStorageDeduction}}</span>
|
||||
</view>
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">管理费扣费</span>
|
||||
<span class="mian-content-list-text">-￥{{order.pingMoney}}</span>
|
||||
</view>
|
||||
<!-- <view class="mian-content-list">
|
||||
<span class="mian-content-list-title">服务费扣费</span>
|
||||
<span class="mian-content-list-text">￥4.54</span>
|
||||
</view> -->
|
||||
<view class="yingde" style="background: #FFF1DE;">
|
||||
<view class="yingde-title">合计扣费</view>
|
||||
<view class="yingde-money">
|
||||
<span class="fuhao-hei">￥</span>
|
||||
<span class="num-hei">-{{order.channelDeduction+order.valueStorageDeduction+order.pingMoney}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mina-title">
|
||||
<span class="mina-title-text">车费明细</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
</view>
|
||||
<view class="mian-content" style="margin-bottom: 10px;">
|
||||
<view class="mian-content-list" v-if="order.tripWay">
|
||||
<view class="mian-content-list-title">出行方式</view>
|
||||
<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view>
|
||||
|
|
@ -227,19 +127,193 @@
|
|||
<span class="mian-content-list-title">提现手续费</span>
|
||||
<span class="mian-content-list-text">-￥{{order.pingTaxiMoney}}</span>
|
||||
</view> -->
|
||||
<view class="yingde" style="background: #EBEBEB;">
|
||||
<view class="yingde-title">车费收益</view>
|
||||
<view class="yingde-money">
|
||||
<span class="fuhao-hei">￥</span>
|
||||
<span class="num-hei">{{order.taxiMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目金额</span>
|
||||
<span class="mian-view-list-text">￥{{order.massagePrice}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">优惠券</span>
|
||||
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">实付金额</span>
|
||||
<!-- <span class="mian-view-list-text"> ￥{{order.massageMoney+order.taxiMoney}}</span> -->
|
||||
<span class="mian-view-list-text"> ￥{{order.sumMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">是否提前结束</span>
|
||||
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-content-textarea">
|
||||
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span>
|
||||
<textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="mina-title">
|
||||
<span class="mina-title-text">加钟信息</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
</view>
|
||||
<view class="mian-view">
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">是否加钟</span>
|
||||
<span class="mian-view-list-text">{{order.addNum!=null?'是':'否'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">服务项目</span>
|
||||
<span class="mian-view-list-text">{{order.jzName!=null?order.jzName:'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目价格</span>
|
||||
<span class="mian-view-list-text" v-if="order.addPrice!=null">￥{{order.addPrice}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟数量</span>
|
||||
<span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
|
||||
</view>
|
||||
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟费用</span>
|
||||
<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
<view class="yingde" style="background: #EBEBEB;">
|
||||
<view class="yingde-title">小计</view>
|
||||
<view class="yingde-money" v-if="order.addMoney!=null">
|
||||
<span class="fuhao-hei">￥</span>
|
||||
<span class="num-hei">{{order.addMoney}}</span>
|
||||
</view>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mina-title">
|
||||
<span class="mina-title-text">服务升级</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
</view>
|
||||
<view class="mian-view">
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">是否升级</span>
|
||||
<span class="mian-view-list-text">{{order.isSupplement!=null?'是':'否'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级项目</span>
|
||||
<span class="mian-view-list-text">{{order.gjName!=null?order.gjName:'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目价格</span>
|
||||
<span class="mian-view-list-text" v-if="order.gjPrice!=null">￥{{order.gjPrice}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
<!-- <view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级金额</span>
|
||||
<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.gjPrice}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view> -->
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">支付差价</span>
|
||||
<span class="mian-view-list-text" v-if="order.gjcePrice!=null">￥{{order.gjcePrice}}</span>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
<view class="yingde" style="background: #EBEBEB;">
|
||||
<view class="yingde-title">小计</view>
|
||||
<view class="yingde-money" v-if="order.gjcePrice!=null">
|
||||
<span class="fuhao-hei">￥</span>
|
||||
<span class="num-hei">{{order.gjcePrice}}</span>
|
||||
</view>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- <view class="mina-title">
|
||||
<span class="mina-title-text">扣费明细</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
</view>
|
||||
<view class="mian-content" style="margin-bottom: 10px;">
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">渠道扣费</span>
|
||||
<span class="mian-content-list-text">-￥{{order.channelDeduction}}</span>
|
||||
</view>
|
||||
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">储值扣费</span>
|
||||
<span class="mian-content-list-text">-￥{{order.valueStorageDeduction}}</span>
|
||||
</view>
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">管理费扣费</span>
|
||||
<span class="mian-content-list-text">-￥{{order.pingMoney}}</span>
|
||||
</view>
|
||||
<view class="yingde" style="background: #FFF1DE;">
|
||||
<view class="yingde-title">小计</view>
|
||||
<view class="yingde-money">
|
||||
<span class="fuhao-hei">-￥</span>
|
||||
<span class="num-hei">{{koufeiMoney}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<view class="mina-title">
|
||||
<span class="mina-title-text">预计收益</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
</view>
|
||||
<view class="mian-content" style="margin-bottom: 10px;">
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">提成比例</span>
|
||||
<span class="mian-view-list-text">{{order.artificerRate*100}}%</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目金额</span>
|
||||
<span class="mian-view-list-text"> ￥{{xiangmuMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">优惠券</span>
|
||||
<span class="mian-view-list-text" style="color: #FF6000;">-￥{{order.couponMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">车费收益</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟费用</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.addMoney!=null?order.addMoney:0}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级费用</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.gjPrice!=null?order.gjPrice:0}}</span>
|
||||
</view>
|
||||
<!-- <view class="mian-view-list">
|
||||
<span class="mian-view-list-title">扣费信息</span>
|
||||
<span class="mian-view-list-text" style="color: rgb(255, 96, 0);"> -￥
|
||||
{{
|
||||
order.channelDeduction+order.valueStorageDeduction+order.pingMoney
|
||||
}}</span>
|
||||
</view> -->
|
||||
|
||||
<!-- <view class="mian-content-list">
|
||||
<span class="mian-content-list-title">渠道扣费</span>
|
||||
<span class="mian-content-list-text" style="color: rgb(255, 96, 0);">-￥{{order.channelDeduction}}</span>
|
||||
</view>
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">储值扣费</span>
|
||||
<span class="mian-content-list-text" style="color: rgb(255, 96, 0);">-￥{{order.valueStorageDeduction}}</span>
|
||||
</view>
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">管理费扣费</span>
|
||||
<span class="mian-content-list-text" style="color: rgb(255, 96, 0);">-￥{{order.pingMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">服务费扣费</span>
|
||||
<span class="mian-content-list-text">￥4.54</span>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="yiji">
|
||||
<view class="yuji-title">预计收益</view>
|
||||
<view class="yuji-title">技师收益</view>
|
||||
<view class="yingde-money">
|
||||
<span class="fuhao-heis">￥</span>
|
||||
<span class="num-heis">{{order.sumArtificerMoney}}</span>
|
||||
<span class="num-heis">
|
||||
{{jishishouyi}}
|
||||
</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
|
||||
|
|
@ -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%;
|
||||
|
|
|
|||
|
|
@ -129,11 +129,11 @@
|
|||
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="fuwuOrder(item)" v-if="item.status == 8">开始服务</u-button>
|
||||
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="goChat" v-if="item.status == 8">转待补单</u-button>
|
||||
@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"
|
||||
@click="cancel(item)">服务完成</u-button>
|
||||
<u-button v-if="item.status == 9 && !item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
<u-button v-if="item.status == 9 && !item.refusalContent&&judanBtnShow=='是'" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="toggle('bottom',item.ordersId)">拒单申请</u-button>
|
||||
<!-- refusalContent不等于空并且status == 9 就是拒单审核中 -->
|
||||
<u-button v-if="item.status == 9&& !item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
|
|
@ -208,6 +208,7 @@
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
judanBtnShow:'否',
|
||||
btnShow:'',
|
||||
refusalContent:'',
|
||||
type:'center',
|
||||
|
|
@ -346,6 +347,7 @@
|
|||
this.$queue.showLoading("加载中...");
|
||||
this.userId = uni.getStorageSync('userId')
|
||||
this.nickName = uni.getStorageSync('nickName')
|
||||
this.judan()
|
||||
let that = this;
|
||||
uni.getLocation({
|
||||
type: 'wgs84',
|
||||
|
|
@ -399,6 +401,35 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
judan(){//是否显示拒单按钮
|
||||
var that=this;
|
||||
console.log(11111)
|
||||
that.$Request.get('/app/common/type/451').then(res => {
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue