This commit is contained in:
parent
ca1ab92899
commit
c69d3ec345
|
|
@ -8,7 +8,7 @@
|
|||
<view class="header"></view>
|
||||
<view class="mian">
|
||||
<!-- 包含升级又加钟的信息 -->
|
||||
<view v-if="order.isSupplement=='2'&&order.addNum!=null">
|
||||
<view v-if="order.isSupplement=='2'&&order.addNum!=null&&order.earlyFinishReason!=null">
|
||||
<view class="mian-top">
|
||||
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
|
||||
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
|
||||
|
|
@ -303,7 +303,7 @@
|
|||
|
||||
</view>
|
||||
<!-- 包含加钟的信息 -->
|
||||
<view v-if="(order.isSupplement=='1'||order.addNum!=null)&&order.isSupplement!='2'">
|
||||
<view v-if="(order.isSupplement=='1'||order.addNum!=null)&&order.isSupplement!='2'&&order.earlyFinishReason==null">
|
||||
<view class="mian-top">
|
||||
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
|
||||
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
|
||||
|
|
@ -802,7 +802,7 @@
|
|||
|
||||
</view>
|
||||
<!-- 包含没有升级 加钟 套餐订单的信息 -->
|
||||
<view v-if="order.isSupplement!='2'&&order.addNum==null&&order.ordersMassageList[0].userPackageDetail==null">
|
||||
<view v-if="order.isSupplement!='2'&&order.addNum==null&&order.ordersMassageList[0].userPackageDetail==null&&order.earlyFinishReason!=null">
|
||||
<view class="mian-top">
|
||||
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
|
||||
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
|
||||
|
|
@ -1006,7 +1006,7 @@
|
|||
|
||||
</view>
|
||||
<!-- 包含套餐次卡疗程的信息 -->
|
||||
<view v-if="order.isSupplement!='2'&&order.addNum==null&&order.ordersMassageList[0].userPackageDetail">
|
||||
<view v-if="(order.isSupplement!='2'&&order.addNum==null&&order.ordersMassageList[0].userPackageDetail)&&order.earlyFinishReason!=null">
|
||||
<view class="mian-top">
|
||||
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
|
||||
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
|
||||
|
|
@ -1141,77 +1141,8 @@
|
|||
<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">否</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">服务项目</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">项目价格</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟数量</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">加钟费用</span>
|
||||
<span class="mian-view-list-text">-</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">-</span>
|
||||
</view>
|
||||
</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">否</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级前项目</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级前价格</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级后项目</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级后价格</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">支付差价</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
<view class="yingde" style="background: #EBEBEB;">
|
||||
<view class="yingde-title">小计</view>
|
||||
<view class="yingde-money">
|
||||
<span class="num-hei">-</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mina-title">
|
||||
<span class="mina-title-text">预计收益</span>
|
||||
<span class="mina-title-bor"></span>
|
||||
|
|
@ -1233,14 +1164,6 @@
|
|||
<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">-</span>
|
||||
</view>
|
||||
<view class="mian-view-list">
|
||||
<span class="mian-view-list-title">升级收益</span>
|
||||
<span class="mian-view-list-text">-</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="yiji">
|
||||
<view class="yuji-title">技师收益</view>
|
||||
|
|
@ -1295,8 +1218,6 @@
|
|||
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<view class="footers">
|
||||
<view @click="cxOrder(order)" class="footers-btn footers-true" v-if="order.status == 2">
|
||||
现在出发
|
||||
|
|
@ -1321,8 +1242,8 @@
|
|||
拒单申请
|
||||
</view>
|
||||
<view class="footers-btn footers-bor" @click="goChat">联系客服</view>
|
||||
<u-button :custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="bindphone(order.phone)">联系客户</u-button>
|
||||
<!-- <u-button :custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="bindphone(order.phone)">联系客户</u-button> -->
|
||||
<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -1511,13 +1432,13 @@
|
|||
type:'bottom',
|
||||
checkbox1: [0],
|
||||
hobby: [{
|
||||
text: '服务承诺1',
|
||||
text: '未服务全额退款',
|
||||
value: '0'
|
||||
}, {
|
||||
text: '服务承诺2',
|
||||
text: '不满意重做',
|
||||
value: '1'
|
||||
}, {
|
||||
text: '服务承诺3',
|
||||
text: '最快30分钟上门',
|
||||
value: '2'
|
||||
}],
|
||||
fuwuBtn:[],
|
||||
|
|
@ -1713,6 +1634,9 @@
|
|||
if (res.code == 0) {
|
||||
that.$queue.showToast(res.msg);
|
||||
this.$refs.popup.close(this.type);
|
||||
uni.switchTab({
|
||||
url:'/pages/order/index'
|
||||
})
|
||||
|
||||
} else {
|
||||
that.$queue.showToast(res.msg);
|
||||
|
|
@ -1839,6 +1763,9 @@
|
|||
try {
|
||||
if (resA.code == 0) {
|
||||
websocketUtils.uploadAudioEnd(); //关闭音频上传
|
||||
uni.switchTab({
|
||||
url:'/pages/order/index'
|
||||
})
|
||||
} else {
|
||||
that.$queue.showToast(resA.msg);
|
||||
}
|
||||
|
|
@ -2517,9 +2444,9 @@
|
|||
position: fixed;
|
||||
left: var(--window-left);
|
||||
right: var(--window-right);
|
||||
height: 44px;
|
||||
height: calc(44px + constant(safe-area-inset-top));
|
||||
height: calc(44px + env(safe-area-inset-top));
|
||||
height: 60px;
|
||||
height: calc(60px + constant(safe-area-inset-top));
|
||||
height: calc(60px + env(safe-area-inset-top));
|
||||
padding: 7px 3px;
|
||||
padding-top: calc(7px + constant(safe-area-inset-top));
|
||||
padding-top: calc(7px + env(safe-area-inset-top));
|
||||
|
|
@ -2527,7 +2454,7 @@
|
|||
display: -webkit-flex;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
align-items: flex-end;
|
||||
overflow: hidden;
|
||||
-webkit-box-pack: justify;
|
||||
-webkit-justify-content: space-between;
|
||||
|
|
@ -2560,7 +2487,6 @@
|
|||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
box-sizing: border-box;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.huiBtn{
|
||||
background: #E2E2E2;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<template>
|
||||
<!-- 技师实际收益公式：实付金额=（项目金额*会员比例-优惠卷）*分成比例*余额支付比例+车费 -->
|
||||
<view style="padding-bottom: 30px;">
|
||||
<view class="jishi-index">
|
||||
<view class=" u-flex padding-lr" style="padding-top: 35px;">
|
||||
|
|
@ -1734,9 +1735,13 @@ page {
|
|||
border-radius: 10rpx;
|
||||
}
|
||||
.pintuan-title{
|
||||
font-size: 30rpx;
|
||||
font-family: Helvetica Neue, Helvetica, sans-serif;
|
||||
color: #fff;
|
||||
font-size: 30rpx;
|
||||
font-family: Helvetica Neue, Helvetica, sans-serif;
|
||||
color: #fff;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.pintuan-img{
|
||||
width: 40rpx;
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@
|
|||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding:10px;
|
||||
padding: 30px 10px 10px 10px;
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue