This commit is contained in:
parent
02edc47587
commit
dbce491388
|
@ -5,6 +5,7 @@
|
|||
const PROT = "http://"
|
||||
// const ROOTHOST = "47.75.182.93:8090";
|
||||
const ROOTHOST = "1.92.152.160";
|
||||
// const ROOTHOST = "1.92.152.160";
|
||||
// const ROOTHOST = "192.168.2.222:8187";
|
||||
// const ROOTHOST = "120.46.52.165";
|
||||
// const ROOTHOST = "192.168.0.115:8187";
|
||||
|
|
|
@ -303,7 +303,7 @@
|
|||
|
||||
</view>
|
||||
<!-- 包含加钟的信息 -->
|
||||
<view v-if="order.addNum!=null">
|
||||
<view v-if="(order.isSupplement=='1'||order.addNum!=null)&&order.isSupplement!='2'">
|
||||
<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"
|
||||
|
@ -469,43 +469,6 @@
|
|||
<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">否</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="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>
|
||||
|
@ -531,10 +494,6 @@
|
|||
<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"> ¥0</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="yiji">
|
||||
<view class="yuji-title">技师收益</view>
|
||||
|
@ -589,7 +548,7 @@
|
|||
|
||||
</view>
|
||||
<!-- 包含升级的信息 -->
|
||||
<view v-if="order.isSupplement=='2'">
|
||||
<view v-if="order.isSupplement=='2'&&order.addNum==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"
|
||||
|
@ -718,40 +677,6 @@
|
|||
<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>
|
||||
|
@ -819,10 +744,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"> ¥{{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.artificerMoney!=null?order.artificerMoney:0}}</span>
|
||||
|
@ -880,7 +801,7 @@
|
|||
</view>
|
||||
|
||||
</view>
|
||||
<!-- 包含没有升级或者加钟的信息 -->
|
||||
<!-- 包含没有升级 加钟 套餐订单的信息 -->
|
||||
<view v-if="order.isSupplement!='2'&&order.addNum==null&&order.ordersMassageList[0].userPackageDetail==null">
|
||||
<view class="mian-top">
|
||||
<view class="countDown" style="text-align: center;" v-if="order.status == 6">
|
||||
|
@ -1010,77 +931,6 @@
|
|||
<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>
|
||||
|
@ -1102,14 +952,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>
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue