Compare commits
3 Commits
0deef595d6
...
f6717bbb44
| Author | SHA1 | Date |
|---|---|---|
 Mr.jiang
|
f6717bbb44 | |
|
Mr.jiang
|
8766bdd69a | |
|
Mr.jiang
|
533fbf75aa |
|
|
@ -155,7 +155,7 @@
|
|||
</view>
|
||||
<view class="" style="color: #333;">
|
||||
<text style="font-size: 35rpx;font-weight: bold;">
|
||||
￥{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}
|
||||
￥{{(order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100)}}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -381,7 +381,7 @@
|
|||
<view class="item_money"> <text style="font-size: 24upx;">￥</text> <text
|
||||
v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
|
||||
/<text style="font-weight: 500;font-size: 24upx; ">{{item.duration}}分钟</text></view>
|
||||
<view class="item_btn" @click="goOrderJ(item)">确认加钟</view>
|
||||
<view class="item_btn" @click="goOrderJ(item,'加钟')">确认加钟</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -414,7 +414,7 @@
|
|||
</view>
|
||||
<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
|
||||
</view>
|
||||
<view class="xiadan" @click="goOrderS(item)">
|
||||
<view class="xiadan" @click="goOrderS(item,'升级')">
|
||||
确认升级
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -560,7 +560,9 @@
|
|||
earlyFinishReason:'',
|
||||
qurenJd:[],
|
||||
artificerlist:[],
|
||||
tordersId:''
|
||||
tordersId:'',
|
||||
jiazhong:'',
|
||||
shengji:''
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
|
|
@ -678,9 +680,10 @@
|
|||
|
||||
})
|
||||
},
|
||||
goOrderJ(item) {//加钟 生成订单
|
||||
goOrderJ(item,text) {//加钟 生成订单
|
||||
let that = this
|
||||
let payMoney = that.isVip ? item.memberPrice : item.price;
|
||||
that.jiazhong=text
|
||||
let data = {
|
||||
parentId: that.order.ordersId,
|
||||
artificerId: that.order.artificerId,
|
||||
|
|
@ -708,9 +711,10 @@
|
|||
|
||||
});
|
||||
},
|
||||
goOrderS(item) {//升级 生成订单
|
||||
goOrderS(item,text) {//升级 生成订单
|
||||
|
||||
let that = this
|
||||
that.shengji=text
|
||||
let data = {
|
||||
classifyId:item.classifyId,
|
||||
ordersId:that.order.ordersId,
|
||||
|
|
@ -1158,9 +1162,16 @@
|
|||
title: '支付成功',
|
||||
icon: 'none'
|
||||
})
|
||||
if(that.jiazhong=='加钟'){
|
||||
uni.navigateTo({
|
||||
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
|
||||
})
|
||||
}else if(that.shengji=='升级'){
|
||||
uni.navigateTo({
|
||||
url:'/my/order/payShengji?ordersId='+that.tordersId
|
||||
})
|
||||
}
|
||||
|
||||
that.getOrder()
|
||||
|
||||
} else {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -321,8 +321,11 @@
|
|||
let fullDate = `${month}-${days}`
|
||||
let Time = year + '-' + fullDate
|
||||
this.yearsDate = Time;
|
||||
this.getMsTime(Time);
|
||||
|
||||
this.jishiName=this.$queue.getData('getJishi');
|
||||
if(this.jishiName){
|
||||
this.getMsTime(Time);
|
||||
}
|
||||
this.couponId=this.$queue.getData('youhui');
|
||||
if(this.couponId){
|
||||
this.youhuiF(this.couponId)
|
||||
|
|
@ -407,8 +410,9 @@
|
|||
// }
|
||||
},
|
||||
getMsTime(artificerDate) {
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this
|
||||
.artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
let that = this;
|
||||
let artificerId = that.jishiName.artificerId;
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.msTimeList = res.data;
|
||||
console.log(res.data, "获取忙时时间")
|
||||
|
|
|
|||
|
|
@ -318,8 +318,10 @@
|
|||
let fullDate = `${month}-${days}`
|
||||
let Time = year + '-' + fullDate
|
||||
this.yearsDate = Time;
|
||||
this.getMsTime(Time);
|
||||
this.jishiName=this.$queue.getData('getJishi');
|
||||
if(this.jishiName){
|
||||
this.getMsTime(Time);
|
||||
}
|
||||
this.couponId=this.$queue.getData('youhui');
|
||||
if(this.couponId){
|
||||
this.youhuiF(this.couponId)
|
||||
|
|
@ -406,8 +408,9 @@
|
|||
// }
|
||||
},
|
||||
getMsTime(artificerDate) {
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this
|
||||
.artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
let that = this;
|
||||
let artificerId = that.jishiName.artificerId;
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.msTimeList = res.data;
|
||||
console.log(res.data, "获取忙时时间")
|
||||
|
|
|
|||
|
|
@ -254,8 +254,10 @@
|
|||
this.yearsDate = Time;
|
||||
var classifyId=this.$queue.getData('classifyId')
|
||||
this.classifyId = classifyId;
|
||||
this.getMsTime(Time);
|
||||
this.jishiName=this.$queue.getData('getJishi');
|
||||
if(this.jishiName){
|
||||
this.getMsTime(Time);
|
||||
}
|
||||
this.couponId=this.$queue.getData('youhui');
|
||||
if(this.couponId){
|
||||
this.youhuiF(this.couponId)
|
||||
|
|
@ -340,8 +342,9 @@
|
|||
// }
|
||||
},
|
||||
getMsTime(artificerDate) {
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this
|
||||
.artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
let that = this;
|
||||
let artificerId = that.jishiName.artificerId;
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.msTimeList = res.data;
|
||||
console.log(res.data, "获取忙时时间")
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
<view class="pay-title" style="">服务项目</view>
|
||||
<view class="flex justify-around">
|
||||
<view class="" style="width: 160upx;height: 160upx;">
|
||||
<image :src="order.ordersMassageList[0].massageType.massageImg"
|
||||
<image :src="order.oldOrdersMassageList[0].massageType.massageImg"
|
||||
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
|
||||
</view>
|
||||
<view class="u-flex-1 margin-left-sm">
|
||||
<view class="flex head-title-right">
|
||||
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
|
||||
{{order.ordersMassageList[0].massageType.title}}
|
||||
{{order.oldEntryName}}
|
||||
</view>
|
||||
<view class="zhuangtai">
|
||||
<view v-if="order.status ==1">待支付</view>
|
||||
|
|
@ -34,18 +34,18 @@
|
|||
<view class="flex align-center">
|
||||
<view style="width: 100%;">
|
||||
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
|
||||
<view style="justify-content: space-between;" v-if="order.oldOrdersId==null">
|
||||
{{order.ordersMassageList[0].massageType.duration}}分钟
|
||||
<view style="justify-content: space-between;">
|
||||
{{order.oldMassageDuration}}分钟
|
||||
</view>
|
||||
<view style="justify-content: space-between;" v-else>
|
||||
<!-- <view style="justify-content: space-between;" v-else>
|
||||
{{order.duration}}分钟
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
<view class="money-pay" style="justify-content: space-between;">
|
||||
<view class="money-pay-zhen">
|
||||
<span>￥</span>
|
||||
<span>{{order.massagePrice}}</span>
|
||||
<span>{{order.oldMassagePrice}}</span>
|
||||
</view>
|
||||
<view>
|
||||
<uni-number-box :disabled="true" :value="order.oldOrdersId==null?order.ordersMassageList[0].num:order.oldMassageNum" :width='27' :min="1" @change="changeValue" />
|
||||
|
|
@ -148,6 +148,10 @@
|
|||
<view style="color: #999;font-size: 26rpx;">项目价格</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.oldMassagePrice}}</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view style="color: #999;font-size: 26rpx;">下单数量</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">{{order.oldMassageNum}}</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
|
||||
|
|
@ -158,7 +162,7 @@
|
|||
</view>
|
||||
<view class="" style="color: #333;">
|
||||
<text style="font-size: 35rpx;font-weight: bold;">
|
||||
￥{{order.oldMassagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}
|
||||
￥{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -219,6 +223,14 @@
|
|||
<view style="color: #999;font-size: 26rpx;">升级项目</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.title}}</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view style="color: #999;font-size: 26rpx;">项目价格</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.massagePrice}}</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view style="color: #999;font-size: 26rpx;">服务时长</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">{{order.duration}}分钟</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view style="color: #999;font-size: 26rpx;">升级价格</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.sumMoney}}</view>
|
||||
|
|
@ -240,38 +252,40 @@
|
|||
<view class="flex align-center margin-top-lg justify-between">
|
||||
<view style="color: #333;font-size: 26rpx;">订单费用：</view>
|
||||
<view class="" style="color: #333;">￥<text
|
||||
style="font-size: 26rpx;font-weight: bold;">￥{{order.oldMassagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
|
||||
style="font-size: 26rpx;font-weight: bold;">{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}}</text></view>
|
||||
</view>
|
||||
<view class="flex align-center margin-top-lg justify-between">
|
||||
<view style="color: #333;font-size: 26rpx;">出行费用：</view>
|
||||
<view class="" style="color: #333;">￥<text
|
||||
style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
|
||||
</view>
|
||||
<view class="flex align-center margin-top-lg justify-between">
|
||||
<view class="flex align-center margin-top-lg justify-between" v-if="order.couponMoney">
|
||||
<view style="color: #333;font-size: 26rpx;">优惠券：</view>
|
||||
<view class="" style="color: #F93731;" v-if="order.couponMoney">
|
||||
-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
|
||||
<view class="" v-else>-</view>
|
||||
<view class="" style="color: #F93731;">
|
||||
-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney?order.couponMoney:0}}</text></view>
|
||||
</view>
|
||||
<view class="flex align-center margin-top-lg justify-between">
|
||||
<view class="flex align-center margin-top-lg justify-between" v-if="order.addMoney">
|
||||
<view style="color: #333;font-size: 26rpx;">加钟费用：</view>
|
||||
<view class="" style="color: #333;" v-if="order.addMoney">￥
|
||||
<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney}}</text></view>
|
||||
<view class="" v-else>-</view>
|
||||
<view class="" style="color: #333;" >￥
|
||||
<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney?order.addMoney:0}}</text></view>
|
||||
</view>
|
||||
<view class="flex align-center margin-top-lg justify-between">
|
||||
<view class="flex align-center margin-top-lg justify-between" v-if="order.oldOrdersId!=null">
|
||||
<view style="color: #333;font-size: 26rpx;">升级费用：</view>
|
||||
<view class="" style="color: #333;" v-if="order.oldOrdersId!=null">￥
|
||||
<view class="" style="color: #333;">￥
|
||||
<text style="font-size: 26rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
|
||||
<view class="" v-else>-</view>
|
||||
</view>
|
||||
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
|
||||
<view style="color: #333;font-size: 26rpx;">合计：</view>
|
||||
<view class="" style="color: #333;">￥<text
|
||||
style="font-size: 35rpx;font-weight: bold;">
|
||||
<view class="" style="color: #333;">
|
||||
￥<text style="font-size: 35rpx;font-weight: bold;">
|
||||
{{
|
||||
order.oldMassagePrice*(order.vipRate/100)*(1+order.technicianRate/100)
|
||||
+order.sumMoney+order.addMoney-order.couponMoney+order.taxiMoney}}</text></view>
|
||||
(((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100))
|
||||
+order.taxiMoney-order.couponMoney+order.addMoney+order.sumMoney).toFixed(2)
|
||||
|
||||
}}
|
||||
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
|
|
@ -343,42 +357,7 @@
|
|||
</view> -->
|
||||
|
||||
<view v-if="order.status !=6" class="flex tabber padding-top-sm padding-bottom-sm align-center">
|
||||
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
|
||||
v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
|
||||
</u-button>
|
||||
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
|
||||
v-if="order.status == 1"
|
||||
class="dingshi">立即支付
|
||||
</u-button>
|
||||
<u-button v-if="order.status == 5|| order.status == 3" :custom-style="customStyle2"
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
||||
class="dingshi">
|
||||
去投诉
|
||||
</u-button>
|
||||
<u-button v-if="order.status == 9&&order.refusalContent" :custom-style="customStyle2"
|
||||
shape="circle" :plain="true"
|
||||
@click="toggleQ('center',order)"
|
||||
class="dingshi">
|
||||
拒单详情
|
||||
</u-button>
|
||||
<u-button v-if="order.status == 10" :custom-style="customStyle2"
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
|
||||
class="dingshi">
|
||||
立即预约
|
||||
</u-button>
|
||||
<u-button v-if="order.btnShow == 'true'&&order.status==2||order.status==6||order.status==7||order.status==8||order.status == 9&&order.refusalContent==null" :custom-style="customStyle2"
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
|
||||
class="dingshi">
|
||||
修改订单
|
||||
</u-button>
|
||||
<u-button v-if="order.status == 3" :custom-style="customStyle2" shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
|
||||
class="dingshi">
|
||||
去评价
|
||||
</u-button>
|
||||
|
||||
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
|
||||
class="dingshi">联系客服</u-button>
|
||||
</view>
|
||||
|
|
@ -395,28 +374,30 @@
|
|||
提前结束
|
||||
</u-button>
|
||||
<u-button
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
|
||||
class="btns">
|
||||
修改订单
|
||||
</u-button>
|
||||
</view>
|
||||
<view class="showBtn-view" v-show="btnShow">
|
||||
<u-button
|
||||
v-if="order.status == 6"
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
||||
class="btns">
|
||||
充值
|
||||
</u-button>
|
||||
<u-button
|
||||
v-if="order.oldOrdersId && order.status == 6"
|
||||
v-if="order.addNum==null && order.status == 6"
|
||||
shape="circle" :plain="true"
|
||||
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
||||
class="btns">
|
||||
加钟
|
||||
</u-button>
|
||||
<u-button v-if="order.addNum==null && order.status == 6"
|
||||
<u-button
|
||||
v-if="order.status == 6&&order.addNum!=null||order.oldOrdersId!=null"
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
||||
class="btns">
|
||||
充值
|
||||
</u-button>
|
||||
</view>
|
||||
<view class="showBtn-view" v-show="btnShow">
|
||||
<u-button
|
||||
v-if="order.status == 6&&order.addNum==null||order.oldOrdersId==null"
|
||||
shape="circle" :plain="true"
|
||||
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
||||
class="btns">
|
||||
充值
|
||||
</u-button>
|
||||
|
||||
<u-button v-if="order.oldOrdersId==null && order.status == 6"
|
||||
shape="circle" :plain="true"
|
||||
@tap="saveJZS(order.artificerId)"
|
||||
class="btns">
|
||||
|
|
|
|||
10
pages.json
10
pages.json
|
|
@ -767,6 +767,16 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "order/payJaZ",
|
||||
"style": {
|
||||
"navigationBarTitleText": "加钟订单详情",
|
||||
"navigationStyle": "custom",
|
||||
"app-plus": {
|
||||
"titleNView": false
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "order/payShengji",
|
||||
"style": {
|
||||
|
|
|
|||
|
|
@ -316,6 +316,7 @@
|
|||
this.hyCheck = this.$queue.getData('hyCheck');
|
||||
console.log(option)
|
||||
this.artificerId = option.artificerId
|
||||
|
||||
this.massageTypeId = option.massageTypeId
|
||||
if (option.tripWay) {
|
||||
this.tripWay = option.tripWay;
|
||||
|
|
@ -332,7 +333,9 @@
|
|||
let fullDate = `${month}-${days}`
|
||||
let Time = year + '-' + fullDate
|
||||
this.yearsDate = Time;
|
||||
if(this.artificerId){
|
||||
this.getMsTime(Time);
|
||||
}
|
||||
this.getMoneyJiShi();
|
||||
// #ifdef APP
|
||||
this.openLists = [{
|
||||
|
|
@ -425,8 +428,9 @@
|
|||
});
|
||||
},
|
||||
getMsTime(artificerDate) {
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this
|
||||
.artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
let that = this;
|
||||
let artificerId = that.artificerId;
|
||||
this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.msTimeList = res.data;
|
||||
console.log(res.data, "获取忙时时间")
|
||||
|
|
|
|||
|
|
@ -1,403 +0,0 @@
|
|||
<!-- 菜单悬浮的原理: 通过给菜单添加position:sticky实现, 用法超简单, 仅APP端的低端机不兼容 https://caniuse.com/#feat=css-sticky -->
|
||||
<template>
|
||||
<view>
|
||||
<view class="sticky-tabs">
|
||||
<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#333333"
|
||||
inactive-color="#333333"></u-tabs>
|
||||
</view>
|
||||
<!-- 数据列表 -->
|
||||
<view v-if="goods.length > 0" class="margin-sm bg" v-for="(item,index) in goods" :key='index'
|
||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" style="border-radius: 20rpx;padding: 36rpx;">
|
||||
<view class="flex justify-between">
|
||||
<view class="flex align-center">
|
||||
<image src="../../static/logo.png" style="width: 48rpx;height: 48rpx;border-radius: 50%;">
|
||||
</image>
|
||||
<view class="margin-left-xs ">{{item.artificerName}}</view>
|
||||
</view>
|
||||
<view class="text-green" v-if="item.status ==1">待付款</view>
|
||||
<view class="text-green" v-if="item.status ==2">待服务</view>
|
||||
<view class="text-green" v-if="item.status ==3">待评价</view>
|
||||
<view class="text-green" v-if="item.status ==5">已完成</view>
|
||||
<view class="text-green" v-if="item.status ==6">服务中</view>
|
||||
<view class="text-green" v-if="item.status ==7">理疗师出发</view>
|
||||
<view class="text-green" v-if="item.status ==8">理疗师到达</view>
|
||||
<view class="text-green" v-if="item.status ==4" style="color: #333333;">已取消</view>
|
||||
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
|
||||
</view>
|
||||
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
|
||||
<view class=" u-flex u-p-t-30">
|
||||
<view class="u-m-r-10">
|
||||
<u-avatar
|
||||
:src="(item.ordersMassageList && item.ordersMassageList.length > 0 && item.ordersMassageList[0].massageType && item.ordersMassageList[0].massageType.massageImg)?item.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
|
||||
mode="square" size="100" style="height: 132rpx;width: 132rpx;flex: 0 0 132rpx;">
|
||||
</u-avatar>
|
||||
</view>
|
||||
<view class="u-flex-1" style="margin-left: 20rpx;">
|
||||
<view class="text-bold u-line-1" style="width: 560rpx;">
|
||||
<view class=" text-lg "
|
||||
v-if="item.ordersMassageList && item.ordersMassageList.length > 0 && item.ordersMassageList[0].massageType && item.ordersMassageList[0].massageType.title"
|
||||
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
|
||||
{{item.ordersMassageList[0].massageType.title}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
|
||||
预约时间：{{item.serveTime}}
|
||||
</view>
|
||||
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
|
||||
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.sumMoney}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
|
||||
<view class="flex text-right">
|
||||
<u-button
|
||||
v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
|
||||
:custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="cancelOrder(item)">取消订单</u-button>
|
||||
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" style="background: linear-gradient(to right, #223845, #00a85b);">去支付</u-button>
|
||||
<u-button v-if="item.status == 2" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" style="background: linear-gradient(to right, #223845, #00a85b);border: 0;">查看详情</u-button>
|
||||
<!-- <u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="cancel(item)">订单完成</u-button> -->
|
||||
<!-- <u-button v-if="item.state == 2" :custom-style="customStyle" shape="circle" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >去投诉</u-button> -->
|
||||
<u-button v-if="item.status == 3" :custom-style="customStyle1" style="background: linear-gradient(to right, #223845, #00a85b);border: 0;" shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
|
||||
去评价
|
||||
</u-button>
|
||||
<!-- <u-button v-if="item.status == 4" :custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="delOrder(item)">删除订单</u-button> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<empty v-if="goods.length == 0"></empty>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import MescrollMixin from "@/components/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
|
||||
import mescrollBody from "@/components/mescroll-uni/components/mescroll-body/mescroll-body.vue";
|
||||
import meTabs from "@/components/mescroll-uni/me-tabs/me-tabs.vue";
|
||||
import empty from '@/components/empty.vue'
|
||||
|
||||
export default {
|
||||
mixins: [MescrollMixin], // 使用mixin
|
||||
components: {
|
||||
mescrollBody,
|
||||
meTabs,
|
||||
empty
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
goods: [], // 数据列表
|
||||
game: [],
|
||||
tabs: [{
|
||||
name: '全部',
|
||||
status: '0'
|
||||
}, {
|
||||
name: '待支付',
|
||||
status: '1'
|
||||
}, {
|
||||
name: '待服务',
|
||||
status: '2'
|
||||
}, {
|
||||
name: '理疗师出发',
|
||||
status: '7'
|
||||
}, {
|
||||
name: '理疗师到达',
|
||||
status: '8'
|
||||
}, {
|
||||
name: '服务中',
|
||||
status: '6'
|
||||
}, {
|
||||
name: '待评价',
|
||||
status: '3'
|
||||
}, {
|
||||
name: '已取消',
|
||||
status: '4'
|
||||
}, {
|
||||
name: '已完成',
|
||||
status: '5'
|
||||
}],
|
||||
tabIndex: 0, // tab下标
|
||||
page: 1,
|
||||
limit: 10,
|
||||
userId: 0,
|
||||
status: 1,
|
||||
nickName: '',
|
||||
avatar: '',
|
||||
customStyle: {
|
||||
color: '#999999',
|
||||
border: '4rpx solid #999999',
|
||||
border: "8rpx",
|
||||
width: '180rpx',
|
||||
height: '60rpx',
|
||||
margin: "0 0 0 20rpx",
|
||||
fontSize: '26rpx'
|
||||
},
|
||||
customStyle1: {
|
||||
color: '#FFFFFF',
|
||||
backgroundColor: '',
|
||||
border: "8rpx",
|
||||
width: '180rpx',
|
||||
height: '60rpx',
|
||||
margin: "0 0 0 20rpx",
|
||||
fontSize: '26rpx'
|
||||
},
|
||||
yhqxSel: '否'
|
||||
// customStyle: {
|
||||
// color: '#1789FD',
|
||||
// backgroundColor: '#1E1F31',
|
||||
// border: "8rpx",
|
||||
// width: '180rpx',
|
||||
// height: '54rpx',
|
||||
// margin: "0 0 0 20rpx"
|
||||
// }
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.userId = uni.getStorageSync('userId')
|
||||
this.nickName = uni.getStorageSync('nickName')
|
||||
},
|
||||
onShow() {
|
||||
this.yhqxSel = this.$queue.getData("yhqxSel");
|
||||
let SelectIndex = this.$queue.getData('SelectIndex');
|
||||
if (SelectIndex) {
|
||||
this.tabIndex = SelectIndex;
|
||||
this.$queue.remove('SelectIndex')
|
||||
}
|
||||
|
||||
let token = this.$queue.getData('token');
|
||||
if (token) {
|
||||
uni.showLoading({
|
||||
title: '加载中...'
|
||||
})
|
||||
this.getOrderList()
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '/pages/public/login'
|
||||
});
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
//获取列表数据
|
||||
getOrderList() {
|
||||
let curTab = this.tabs[this.tabIndex].status
|
||||
|
||||
let data = {
|
||||
status: curTab,
|
||||
page: this.page,
|
||||
limit: this.limit
|
||||
}
|
||||
this.$Request.get('/app/artificer/selectOrdersList', data).then(res => {
|
||||
if (res.code == 0) {
|
||||
uni.hideLoading();
|
||||
console.log(res)
|
||||
if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
|
||||
this.goods = [...this.goods, ...res.data.list]; //追加新数据
|
||||
// this.goods.forEach(ret => {
|
||||
// switch (ret.status) {
|
||||
// case '1':
|
||||
// ret.statusName = '待付款'
|
||||
// break;
|
||||
// case '2':
|
||||
// ret.statusName = '进行中'
|
||||
// break;
|
||||
// case '3':
|
||||
// ret.statusName = '已评价'
|
||||
// break;
|
||||
// case '4':
|
||||
// ret.statusName = '已取消'
|
||||
// break;
|
||||
// case '5':
|
||||
// ret.statusName = '已完成'
|
||||
// break;
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
}).catch(() => {
|
||||
//联网失败, 结束加载
|
||||
|
||||
});
|
||||
},
|
||||
// 切换菜单
|
||||
tabChange(index) {
|
||||
uni.showLoading({
|
||||
title: '加载中...'
|
||||
})
|
||||
this.tabIndex = index
|
||||
// this.goods = []; // 置空列表,显示加载进度条
|
||||
this.page = 1
|
||||
this.getOrderList()
|
||||
},
|
||||
// 取消订单
|
||||
cancelOrder(e) {
|
||||
let contentName = '';
|
||||
let closeKC = this.$queue.getData('closeKC');
|
||||
if (e.status == 7 || e.status == 8 && closeKC) {
|
||||
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
|
||||
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
|
||||
}
|
||||
let that = this
|
||||
uni.showModal({
|
||||
title: '温馨提示',
|
||||
content: '是否确认取消订单？' + contentName,
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
let data = {
|
||||
ordersId: e.ordersId
|
||||
}
|
||||
that.$queue.showLoading('取消中...')
|
||||
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
|
||||
uni.hideLoading();
|
||||
if (res.code == 0) {
|
||||
that.page = 1
|
||||
that.getOrderList()
|
||||
} else {
|
||||
that.$queue.showToast(res.msg);
|
||||
}
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/*下拉刷新的回调 */
|
||||
downCallback() {
|
||||
// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
|
||||
// loadSwiper();
|
||||
// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
|
||||
this.mescroll.resetUpScroll()
|
||||
this.page = 1;
|
||||
this.getOrderList();
|
||||
},
|
||||
// 完成订单
|
||||
cancel(e) {
|
||||
let that = this
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确认完成订单吗?',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
let data = {
|
||||
ordersId: e.ordersId,
|
||||
}
|
||||
that.$queue.showLoading('提交中...')
|
||||
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
|
||||
uni.hideLoading();
|
||||
if (res.code == 0) {
|
||||
that.page = 1
|
||||
that.getOrderList()
|
||||
} else {
|
||||
that.$queue.showToast(res.msg);
|
||||
}
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
//删除
|
||||
delOrder(e) {
|
||||
let that = this
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确定删除订单吗?',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
let data = {
|
||||
ordersId: e.ordersId,
|
||||
}
|
||||
that.$queue.showLoading('删除中...')
|
||||
that.$Request.post('/app/artificer/removeOrders', data).then(res => {
|
||||
uni.hideLoading();
|
||||
if (res.code == 0) {
|
||||
uni.showToast({
|
||||
name: "删除成功"
|
||||
})
|
||||
that.page = 1
|
||||
that.getOrderList()
|
||||
} else {
|
||||
that.$queue.showToast(res.msg);
|
||||
}
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
goNav(url) {
|
||||
uni.navigateTo({
|
||||
url
|
||||
})
|
||||
}
|
||||
},
|
||||
onReachBottom: function() {
|
||||
this.page = this.page + 1;
|
||||
this.getOrderList();
|
||||
if (this.totalCount == this.orderList.length) {
|
||||
uni.showToast({
|
||||
title: '已经到底了~',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
},
|
||||
onPullDownRefresh: function() {
|
||||
this.page = 1;
|
||||
this.getOrderList();
|
||||
setTimeout(d => {
|
||||
uni.stopPullDownRefresh();
|
||||
}, 2000)
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
/deep/.u-scroll-box{
|
||||
display: flex;
|
||||
}
|
||||
page {
|
||||
background: #F5F5F5;
|
||||
}
|
||||
|
||||
/*
|
||||
sticky生效条件：
|
||||
1、父元素不能overflow:hidden或者overflow:auto属性。(mescroll-body设置:sticky="true"即可, mescroll-uni本身没有设置overflow)
|
||||
2、必须指定top、bottom、left、right4个值之一，否则只会处于相对定位
|
||||
3、父元素的高度不能低于sticky元素的高度
|
||||
4、sticky元素仅在其父元素内生效,所以父元素必须是 mescroll
|
||||
*/
|
||||
.sticky-tabs {
|
||||
z-index: 990;
|
||||
position: sticky;
|
||||
top: var(--window-top);
|
||||
// background-color: #fff;
|
||||
}
|
||||
|
||||
// 使用mescroll-uni,则top为0
|
||||
.mescroll-uni,
|
||||
/deep/.mescroll-uni {
|
||||
.sticky-tabs {
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.demo-tip {
|
||||
padding: 18upx;
|
||||
font-size: 24upx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
page {
|
||||
background-color: #F7F7F7;
|
||||
}
|
||||
|
||||
.bg {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
预约时间：{{item.serveTime}}
|
||||
</view>
|
||||
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
|
||||
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.sumMoney}}</text>
|
||||
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
@click="goNav('/my/wallet/index?artificerId='+item.artificerId)">
|
||||
充值
|
||||
</u-button>
|
||||
<u-button v-if="item.addNum < item.ordersMassageList[0].massageType.addNum && item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
||||
<u-button v-if="item.addNum !=null && item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
|
||||
加钟
|
||||
</u-button>
|
||||
|
|
@ -319,6 +319,10 @@
|
|||
uni.navigateTo({
|
||||
url:'/my/order/payShengji?ordersId='+item.ordersId
|
||||
})
|
||||
}else if(item.addNum){
|
||||
uni.navigateTo({
|
||||
url:'/my/order/payJaZ?ordersId='+item.ordersId
|
||||
})
|
||||
}else if(text=='修改'){
|
||||
uni.navigateTo({
|
||||
url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
|
||||
|
|
@ -485,7 +489,8 @@
|
|||
page: this.page,
|
||||
limit: this.limit
|
||||
}
|
||||
this.$Request.get('/app/artificer/selectOrdersList', data).then(res => {
|
||||
// selectOrdersList
|
||||
this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => {
|
||||
if (res.code == 0) {
|
||||
uni.hideLoading();
|
||||
if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
|
||||
|
|
|
|||
Loading…
Reference in New Issue