This commit is contained in:
parent
2eba23e019
commit
c06d851b6d
|
|
@ -45,8 +45,11 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view>
|
||||
<uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" />
|
||||
<view class="jiajian">
|
||||
<view class="jian">-</view>
|
||||
<view class="view-num">{{order.ordersMassageList[0].num}}</view>
|
||||
<view class="jia">+</view>
|
||||
<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -69,7 +72,7 @@
|
|||
</view>
|
||||
<view class="mian-top-foot-view" style="margin-top: 5px;">
|
||||
<view class="mian-top-foot-view-title">服务地址: </view>
|
||||
<view class="mian-top-foot-view-text" style="width: 70%;">
|
||||
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
|
||||
{{order.address}}
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -129,17 +132,16 @@
|
|||
</view> -->
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目金额</span>
|
||||
<span class="mian-view-list-text">￥{{order.massagePrice}}</span>
|
||||
<span class="mian-view-list-text">￥{{order.oldMassagePrice}}</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> -->
|
||||
<!-- <view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级金额</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.sumMoney}}</span>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="mian-content-list">
|
||||
<span class="mian-content-list-title">是否提前结束</span>
|
||||
<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
|
||||
|
|
@ -162,7 +164,7 @@
|
|||
</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>
|
||||
<span class="mian-view-list-text">{{order.addEntryName!=null?order.addEntryName:'-'}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目价格</span>
|
||||
|
|
@ -176,14 +178,14 @@
|
|||
|
||||
<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-if="order.addArtificerMoney!=null">￥{{order.addArtificerMoney}}</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">
|
||||
<view class="yingde-money" v-if="order.addArtificerMoney!=null">
|
||||
<span class="fuhao-hei">￥</span>
|
||||
<span class="num-hei">{{order.addMoney}}</span>
|
||||
<span class="num-hei">{{order.addArtificerMoney}}</span>
|
||||
</view>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
|
|
@ -198,12 +200,21 @@
|
|||
<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>
|
||||
<span class="mian-view-list-title">升级前项目</span>
|
||||
<span class="mian-view-list-text">{{order.oldEntryName!=null?order.oldEntryName:'-'}}</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-title">升级前价格</span>
|
||||
<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">
|
||||
<span class="mian-view-list-title">升级后项目</span>
|
||||
<span class="mian-view-list-text">{{order.entryName!=null?order.entryName:'-'}}</span>
|
||||
</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>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
<!-- <view class="mian-view-list">
|
||||
|
|
@ -213,14 +224,14 @@
|
|||
</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-if="order.payMoney!=null">￥{{order.payMoney}}</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">
|
||||
<view class="yingde-money" v-if="order.artificerMoney!=null">
|
||||
<span class="fuhao-hei">￥</span>
|
||||
<span class="num-hei">{{order.gjcePrice}}</span>
|
||||
<span class="num-hei">{{order.artificerMoney}}</span>
|
||||
</view>
|
||||
<span class="mian-view-list-text" v-else>-</span>
|
||||
</view>
|
||||
|
|
@ -263,8 +274,8 @@
|
|||
<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>
|
||||
<span class="mian-view-list-title">项目收益</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.oldArtificerMoney}}</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">优惠券</span>
|
||||
|
|
@ -275,12 +286,12 @@
|
|||
<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>
|
||||
<span class="mian-view-list-title">加钟收益</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney: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>
|
||||
<span class="mian-view-list-title">升级收益</span>
|
||||
<span class="mian-view-list-text"> ￥{{order.artificerMoney!=null?order.artificerMoney:0}}</span>
|
||||
</view>
|
||||
<!-- <view class="mian-view-list">
|
||||
<span class="mian-view-list-title">扣费信息</span>
|
||||
|
|
@ -312,7 +323,8 @@
|
|||
<view class="yingde-money">
|
||||
<span class="fuhao-heis">￥</span>
|
||||
<span class="num-heis">
|
||||
{{jishishouyi}}
|
||||
<!-- {{jishishouyi}} -->
|
||||
{{order.artificerMoneyTotal}}
|
||||
</span>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -690,6 +702,54 @@
|
|||
}
|
||||
},
|
||||
methods:{
|
||||
getOrder() {
|
||||
let data = {
|
||||
ordersId: this.ordersId
|
||||
}
|
||||
this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.goods = [];
|
||||
this.loading = false
|
||||
uni.hideLoading()
|
||||
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)
|
||||
//技师的总共收益
|
||||
//技师收益（升级）=（升级后项目价格（488）*会议折扣（0.9）-优惠卷（14））* 分成比例（0.65）* 用户余额比例（0.9) + 车费（14）
|
||||
// this.jishishouyi=((this.xiangmuMoney-this.order.couponMoney)*this.order.artificerRate*(this.order.walletRate/100)+this.order.taxiMoney+order.addMoney).toFixed(2)
|
||||
this.jishishouyi=(((this.xiangmuMoney+this.order.addMoney+this.order.taxiMoney-this.order.couponMoney)-this.order.couponMoney)*this.order.artificerRate*(this.order.walletRate/100)+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
|
||||
.order.artificerTaxiMoney)).toFixed(2);
|
||||
} else {
|
||||
this.sumMoney = this.order.sumArtificerMoney;
|
||||
}
|
||||
if (this.order.startImg) {
|
||||
this.order.startImg = this.order.startImg.split(',')
|
||||
}
|
||||
if (this.order.endServiceImg) {
|
||||
this.order.endServiceImg = this.order.endServiceImg.split(',')
|
||||
}
|
||||
let aliphone = this.$queue.getData('aliphone');
|
||||
if (aliphone === '是' && this.order.artificer) {
|
||||
this.ysPhone(this.order.phone, this.order.artificer.phone);
|
||||
}
|
||||
if (res.data.status == 6 && res.data.endTime) {
|
||||
let afterTimeStamp = new Date(res.data.endTime).getTime() / 1000;
|
||||
let currentTimeStamp = new Date().getTime() / 1000;
|
||||
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
|
||||
console.log("eeee",currentTimeStamp);
|
||||
this.endOfServiceTimer = formatTimeStamp;
|
||||
}
|
||||
this.goods = res.data;
|
||||
// if (this.$refs.countDownEl) this.$refs.countDownEl.update();
|
||||
uni.stopPullDownRefresh();
|
||||
}
|
||||
})
|
||||
},
|
||||
goBack(){//返回上一页
|
||||
console.log("asdsad")
|
||||
uni.switchTab({
|
||||
|
|
@ -1065,53 +1125,7 @@
|
|||
}
|
||||
});
|
||||
},
|
||||
getOrder() {
|
||||
let data = {
|
||||
ordersId: this.ordersId
|
||||
}
|
||||
this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.goods = [];
|
||||
this.loading = false
|
||||
uni.hideLoading()
|
||||
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
|
||||
.order.artificerTaxiMoney)).toFixed(2);
|
||||
} else {
|
||||
this.sumMoney = this.order.sumArtificerMoney;
|
||||
}
|
||||
if (this.order.startImg) {
|
||||
this.order.startImg = this.order.startImg.split(',')
|
||||
}
|
||||
if (this.order.endServiceImg) {
|
||||
this.order.endServiceImg = this.order.endServiceImg.split(',')
|
||||
}
|
||||
let aliphone = this.$queue.getData('aliphone');
|
||||
if (aliphone === '是' && this.order.artificer) {
|
||||
this.ysPhone(this.order.phone, this.order.artificer.phone);
|
||||
}
|
||||
if (res.data.status == 6 && res.data.endTime) {
|
||||
let afterTimeStamp = new Date(res.data.endTime).getTime() / 1000;
|
||||
let currentTimeStamp = new Date().getTime() / 1000;
|
||||
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
|
||||
console.log("eeee",currentTimeStamp);
|
||||
this.endOfServiceTimer = formatTimeStamp;
|
||||
}
|
||||
this.goods = res.data;
|
||||
// if (this.$refs.countDownEl) this.$refs.countDownEl.update();
|
||||
uni.stopPullDownRefresh();
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
delOrder(e) {
|
||||
let that = this
|
||||
uni.showModal({
|
||||
|
|
@ -1517,6 +1531,38 @@
|
|||
</script>
|
||||
|
||||
<style scoped>
|
||||
.view-num{
|
||||
margin: 0 2px;
|
||||
height: 26px;
|
||||
text-align: center;
|
||||
font-size: 14px;
|
||||
border-width: 0;
|
||||
background: rgb(245, 245, 245);
|
||||
color: rgb(51, 51, 51);
|
||||
width: 27px;
|
||||
line-height: 26px;
|
||||
}
|
||||
.jia{
|
||||
line-height: 28px !important;
|
||||
}
|
||||
.jian,.jia{
|
||||
height: 28px;
|
||||
line-height: 28px;
|
||||
color: #c0c0c0 !important;
|
||||
cursor: not-allowed;
|
||||
font-size: 20px;
|
||||
font-weight: 300;
|
||||
padding: 0 8px;
|
||||
background: rgb(245, 245, 245);
|
||||
cursor: pointer;
|
||||
border-top-left-radius: 2px;
|
||||
border-bottom-left-radius: 2px;
|
||||
}
|
||||
.jiajian{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
.nav-text{
|
||||
font-weight: 700;
|
||||
font-size: 16px;
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
{{ item.title }}
|
||||
</view>
|
||||
<view class="flex-sub ">
|
||||
实收：<text class="text-df">￥</text><text class="text-xl text-bold">{{ item.sumArtificerMoney
|
||||
实收：<text class="text-df">￥</text><text class="text-xl text-bold">{{ item.artificerMoneyTotal
|
||||
}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue