This commit is contained in:
parent
e00f688ee8
commit
5b0c1a6166
|
@ -97,6 +97,14 @@
|
||||||
uni.navigateTo({//返回项目订单
|
uni.navigateTo({//返回项目订单
|
||||||
url:'/my/order/payModifyDzhifu'
|
url:'/my/order/payModifyDzhifu'
|
||||||
})
|
})
|
||||||
|
}else if(this.content=='疗程'){
|
||||||
|
uni.navigateTo({//返回项目订单
|
||||||
|
url:'/my/order/payModifyLiaoCi'
|
||||||
|
})
|
||||||
|
}else if(this.content=='次卡'){
|
||||||
|
uni.navigateTo({//返回项目订单
|
||||||
|
url:'/my/order/payModifyCi'
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
|
@ -207,7 +207,7 @@
|
||||||
<view style="color: #333;font-size: 26rpx;">合计:</view>
|
<view style="color: #333;font-size: 26rpx;">合计:</view>
|
||||||
<view class="" style="color: #333;">¥
|
<view class="" style="color: #333;">¥
|
||||||
<text style="font-size: 35rpx;font-weight: bold;">
|
<text style="font-size: 35rpx;font-weight: bold;">
|
||||||
{{order.oldMassageMoney==null?order.payMoney:(order.payMoney+order.oldMassageMoney)}}
|
{{order.oldMassageMoney==null?order.payMoney:((order.payMoney+order.oldMassageMoney).toFixed(2))}}
|
||||||
</text>
|
</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -282,14 +282,18 @@
|
||||||
|
|
||||||
<view v-if="order.status !=6" class="flex tabber padding-top-sm padding-bottom-sm align-center">
|
<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"
|
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
|
||||||
v-if="order.status != 3 && order.status != 4 && order.status != 5">
|
v-if="order.status != 3 &&
|
||||||
|
order.status != 4 &&
|
||||||
|
order.status != 5&&
|
||||||
|
order.status != 10"
|
||||||
|
>
|
||||||
取消订单
|
取消订单
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
|
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
|
||||||
v-if="order.status == 1"
|
v-if="order.status == 1"
|
||||||
class="dingshi">立即支付
|
class="dingshi">立即支付
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button v-if="order.status == 5|| order.status == 3" :custom-style="customStyle2"
|
<u-button v-if="order.status == 6|| order.status == 3" :custom-style="customStyle2"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
||||||
class="dingshi">
|
class="dingshi">
|
||||||
|
@ -307,7 +311,9 @@
|
||||||
class="dingshi">
|
class="dingshi">
|
||||||
立即预约
|
立即预约
|
||||||
</u-button>
|
</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"
|
<u-button
|
||||||
|
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==2||order.status==6||order.status==7||order.status==8)&&!order.refusalContent"
|
||||||
|
:custom-style="customStyle2"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
|
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
|
||||||
class="dingshi">
|
class="dingshi">
|
||||||
|
@ -328,12 +334,14 @@
|
||||||
<u-button shape="circle" :plain="true" @click="goChat"
|
<u-button shape="circle" :plain="true" @click="goChat"
|
||||||
class="btns">联系客服</u-button>
|
class="btns">联系客服</u-button>
|
||||||
<u-button
|
<u-button
|
||||||
|
v-if="order.status == 6"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="toggle('center',order)"
|
@click="toggle('center',order)"
|
||||||
class="btns">
|
class="btns">
|
||||||
提前结束
|
提前结束
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button
|
<u-button
|
||||||
|
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==2||order.status==6||order.status==7||order.status==8)&&!order.refusalContent"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
|
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
|
||||||
class="btns">
|
class="btns">
|
||||||
|
@ -349,17 +357,17 @@
|
||||||
充值
|
充值
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button
|
<u-button
|
||||||
v-if="order.status == 6"
|
v-if="order.addNum ==null && order.status == 6"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
||||||
class="btns">
|
class="btns">
|
||||||
加钟
|
加钟
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button v-if="order.addNum==null && order.status == 6"
|
<u-button v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@tap="saveJZS(order.artificerId)"
|
@tap="saveJZS(order.artificerId)"
|
||||||
class="btns">
|
class="btns">
|
||||||
升级项目
|
服务升级
|
||||||
</u-button>
|
</u-button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -690,7 +698,7 @@
|
||||||
},
|
},
|
||||||
goOrderJ(item,text) {//加钟 生成订单
|
goOrderJ(item,text) {//加钟 生成订单
|
||||||
let that = this
|
let that = this
|
||||||
let payMoney = that.isVip ? item.memberPrice : item.price;
|
let payMoney = item.price;
|
||||||
that.jiazhong=text
|
that.jiazhong=text
|
||||||
let data = {
|
let data = {
|
||||||
parentId: that.order.ordersId,
|
parentId: that.order.ordersId,
|
||||||
|
@ -710,7 +718,7 @@
|
||||||
that.showorder = false
|
that.showorder = false
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
that.tordersId = res.data.ordersId;
|
that.tordersId = res.data.ordersId;
|
||||||
that.tpayMoney = payMoney;
|
that.tpayMoney = res.data.payMoney;
|
||||||
that.showpay = true;
|
that.showpay = true;
|
||||||
that.paySel = 1;
|
that.paySel = 1;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -386,7 +386,7 @@
|
||||||
<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center" :style="{'height':btnShow?'100px':'60px'}">
|
<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center" :style="{'height':btnShow?'100px':'60px'}">
|
||||||
<view class="showBtn-mian">
|
<view class="showBtn-mian">
|
||||||
<view class="showBtn">
|
<view class="showBtn">
|
||||||
<view class="gengduo" @click.stop="gengBtn">更多</view>
|
<!-- <view class="gengduo" @click.stop="gengBtn">更多</view> -->
|
||||||
<u-button shape="circle" :plain="true" @click="goChat"
|
<u-button shape="circle" :plain="true" @click="goChat"
|
||||||
class="btns">联系客服</u-button>
|
class="btns">联系客服</u-button>
|
||||||
<u-button
|
<u-button
|
||||||
|
@ -395,34 +395,39 @@
|
||||||
class="btns">
|
class="btns">
|
||||||
提前结束
|
提前结束
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button
|
<u-button :custom-style="customStyle2"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
|
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
||||||
class="btns">
|
class="dingshi">
|
||||||
修改订单
|
去投诉
|
||||||
</u-button>
|
</u-button>
|
||||||
</view>
|
|
||||||
<view class="showBtn-view" v-show="btnShow">
|
|
||||||
<u-button
|
<u-button
|
||||||
v-if="order.status == 6"
|
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
||||||
class="btns">
|
class="btns">
|
||||||
充值
|
充值
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button
|
</view>
|
||||||
|
<view class="showBtn-view" v-show="btnShow">
|
||||||
|
<!-- <u-button
|
||||||
|
shape="circle" :plain="true"
|
||||||
|
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
||||||
|
class="btns">
|
||||||
|
充值
|
||||||
|
</u-button> -->
|
||||||
|
<!-- <u-button
|
||||||
v-if="order.addNum==null && order.status == 6"
|
v-if="order.addNum==null && order.status == 6"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
||||||
class="btns">
|
class="btns">
|
||||||
加钟
|
加钟
|
||||||
</u-button>
|
</u-button> -->
|
||||||
<u-button v-if="order.oldOrdersId==null && order.status == 6"
|
<!-- <u-button v-if="order.oldOrdersId==null && order.status == 6"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@tap="saveJZS(order.artificerId)"
|
@tap="saveJZS(order.artificerId)"
|
||||||
class="btns">
|
class="btns">
|
||||||
升级项目
|
升级项目
|
||||||
</u-button>
|
</u-button> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -6,7 +6,7 @@
|
||||||
<view class="pay-title" style="">服务项目</view>
|
<view class="pay-title" style="">服务项目</view>
|
||||||
<view class="flex">
|
<view class="flex">
|
||||||
<view class="" style="width: 160upx;height: 160upx;">
|
<view class="" style="width: 160upx;height: 160upx;">
|
||||||
<image :src="orderXm.massageImg"
|
<image :src="orderXm.packageImg"
|
||||||
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
|
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="head-bottom margin-left-sm">
|
<view class="head-bottom margin-left-sm">
|
||||||
|
@ -34,6 +34,8 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<view class="detail-foot">
|
<view class="detail-foot">
|
||||||
<view class="detail-foot-nav">
|
<view class="detail-foot-nav">
|
||||||
<span class="detail-foot-nav-text">套餐详情</span>
|
<span class="detail-foot-nav-text">套餐详情</span>
|
||||||
|
@ -45,19 +47,26 @@
|
||||||
<span style="margin-right: 5px;">{{item.title}}</span>
|
<span style="margin-right: 5px;">{{item.title}}</span>
|
||||||
<span style="display: none;">详情</span>
|
<span style="display: none;">详情</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="header-bottom-money" style="margin: 7px 0px;">
|
<view class="detail-view">
|
||||||
<view class="header-bottom-money-zhen">
|
<image class="detail-view-img" :src="item.massageImg" mode=""></image>
|
||||||
<span>¥</span>
|
<view class="detail-view-mina">
|
||||||
<span style="font-size: 38rpx;font-weight: bold">{{item.price}}</span>
|
<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
|
||||||
<span>元/套</span>
|
<view class="header-bottom-money-zhen">
|
||||||
<span class="header-bottom-money-jia" style="margin-left: 20px; color: #666;">¥{{item.oldPrice}}</span>
|
<span>¥</span>
|
||||||
<span style="color: #019c88;">服务时长:{{item.duration}}分钟</span>
|
<span>{{item.price}}</span>
|
||||||
|
</view>
|
||||||
|
<view class="header-bottom-money-jia" style="margin-left: 20px; ">
|
||||||
|
¥{{item.oldPrice}}
|
||||||
|
</view>
|
||||||
|
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
|
||||||
|
</view>
|
||||||
|
<view class="tese">
|
||||||
|
<span>项目特色: </span>
|
||||||
|
<span>{{item.jianjie}}</span>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
|
||||||
<view class="tese">
|
|
||||||
<span>项目特色: </span>
|
|
||||||
<span>{{item.jianjie}}</span>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="detail-foot-title">
|
<view class="detail-foot-title">
|
||||||
服务项目{{index+1}}
|
服务项目{{index+1}}
|
||||||
</view>
|
</view>
|
||||||
|
@ -233,7 +242,7 @@
|
||||||
couponDataList:'',
|
couponDataList:'',
|
||||||
orderXm:[],
|
orderXm:[],
|
||||||
detailData:[],
|
detailData:[],
|
||||||
number:1
|
number:1,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(e) {
|
onLoad(e) {
|
||||||
|
@ -242,7 +251,8 @@
|
||||||
} else {
|
} else {
|
||||||
this.msTimeDate = 60;
|
this.msTimeDate = 60;
|
||||||
}
|
}
|
||||||
this.orderXm=this.$queue.getData('mainData')
|
this.orderXm=this.$queue.getData('mainData');
|
||||||
|
console.log("this.orderXm",this.orderXm)
|
||||||
this.detailData=this.$queue.getData('detailData');
|
this.detailData=this.$queue.getData('detailData');
|
||||||
var date = new Date();
|
var date = new Date();
|
||||||
var year = date.getFullYear();
|
var year = date.getFullYear();
|
||||||
|
@ -357,7 +367,7 @@
|
||||||
},
|
},
|
||||||
youhuijuan(){
|
youhuijuan(){
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:'/my/hongbao/youhuijuanList?text='+'套餐'
|
url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
openpay() {//验证
|
openpay() {//验证
|
||||||
|
@ -1239,6 +1249,30 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
.header-bottom-money{
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: flex-end;
|
||||||
|
}
|
||||||
|
.detail-view-mina{
|
||||||
|
width: 68%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-around;
|
||||||
|
}
|
||||||
|
.detail-view-img{
|
||||||
|
width: 76px;
|
||||||
|
height: 76px;
|
||||||
|
border-radius: 9px;
|
||||||
|
}
|
||||||
|
.detail-view{
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
.head-bottom{
|
.head-bottom{
|
||||||
width: 68%;
|
width: 68%;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -254,7 +254,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="flex justify-between jusitify-line">
|
<view class="flex justify-between jusitify-line">
|
||||||
<view class="line-word">升级价格</view>
|
<view class="line-word">升级价格</view>
|
||||||
<view class="line-word-r">¥{{order.sumMoney}}</view>
|
<view class="line-word-r">¥{{order.payMoney}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="flex justify-between jusitify-line">
|
<view class="flex justify-between jusitify-line">
|
||||||
<view class="line-word">会员折扣</view>
|
<view class="line-word">会员折扣</view>
|
||||||
|
@ -263,7 +263,7 @@
|
||||||
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
|
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
|
||||||
<view style="color: #333;font-size: 26rpx;">小计:</view>
|
<view style="color: #333;font-size: 26rpx;">小计:</view>
|
||||||
<view class="" style="color: #333;">¥<text
|
<view class="" style="color: #333;">¥<text
|
||||||
style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
|
style="font-size: 35rpx;font-weight: bold;">{{order.payMoney}}</text></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="jusitify-line-end"></view>
|
<view class="jusitify-line-end"></view>
|
||||||
|
@ -294,7 +294,7 @@
|
||||||
<view class="flex justify-between jusitify-line" v-if="order.oldOrdersId!=null">
|
<view class="flex justify-between jusitify-line" v-if="order.oldOrdersId!=null">
|
||||||
<view class="line-word">升级费用:</view>
|
<view class="line-word">升级费用:</view>
|
||||||
<view class="" style="color: #333;">¥
|
<view class="" style="color: #333;">¥
|
||||||
<text style="font-size: 26rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
|
<text style="font-size: 26rpx;font-weight: bold;">{{order.payMoney}}</text></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
|
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
|
||||||
<view class="line-word">合计:</view>
|
<view class="line-word">合计:</view>
|
||||||
|
@ -302,7 +302,7 @@
|
||||||
¥<text style="font-size: 35rpx;font-weight: bold;">
|
¥<text style="font-size: 35rpx;font-weight: bold;">
|
||||||
{{
|
{{
|
||||||
(((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100))
|
(((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100))
|
||||||
+order.taxiMoney-order.couponMoney+order.addMoney+order.sumMoney).toFixed(2)
|
+order.taxiMoney-order.couponMoney+order.addMoney+order.payMoney).toFixed(2)
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
@ -394,34 +394,24 @@
|
||||||
提前结束
|
提前结束
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button
|
<u-button
|
||||||
v-if="order.addNum==null && order.status == 6"
|
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
|
||||||
class="btns">
|
class="btns">
|
||||||
加钟
|
加钟
|
||||||
</u-button>
|
</u-button>
|
||||||
<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>
|
||||||
<view class="showBtn-view" v-show="btnShow">
|
<view class="showBtn-view" v-show="btnShow">
|
||||||
<u-button
|
<u-button
|
||||||
v-if="order.status == 6&&order.addNum==null||order.oldOrdersId==null"
|
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
|
||||||
class="btns">
|
class="btns">
|
||||||
充值
|
充值
|
||||||
</u-button>
|
</u-button>
|
||||||
|
<u-button :custom-style="customStyle2"
|
||||||
<u-button v-if="order.oldOrdersId==null && order.status == 6"
|
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@tap="saveJZS(order.artificerId)"
|
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
||||||
class="btns">
|
class="dingshi">
|
||||||
升级项目
|
去投诉
|
||||||
</u-button>
|
</u-button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
|
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
|
||||||
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
|
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
|
||||||
<view class="flex align-center" style="width: 80%;justify-content: space-between;">
|
<view class="flex align-center" style="width: 80%;justify-content: space-between;">
|
||||||
<view class="d-title">{{order.artificer.artificerName}}1</view>
|
<view class="d-title">{{order.artificer.artificerName}}</view>
|
||||||
<!-- <image
|
<!-- <image
|
||||||
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
|
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
|
||||||
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
|
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -13,7 +13,7 @@
|
||||||
<image :src="order.ordersPackageList[0].packageImg"
|
<image :src="order.ordersPackageList[0].packageImg"
|
||||||
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
|
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="u-flex-1 margin-left-sm">
|
<view class="u-flex-1 margin-left-sm" style="display: flex;flex-direction: column;justify-content: space-around;">
|
||||||
<view class="flex head-title-right">
|
<view class="flex head-title-right">
|
||||||
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
|
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
|
||||||
{{order.ordersPackageList[0].title}}
|
{{order.ordersPackageList[0].title}}
|
||||||
|
@ -23,32 +23,54 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="flex align-center">
|
<view class="flex align-center">
|
||||||
<view>
|
<view class="money-pay" style="width: 100%;justify-content: space-between;">
|
||||||
<!-- <view class="flex justify-between margin-tb-sm" style="color: #999999;">
|
<view class="money-pay-zhen">
|
||||||
<view style="justify-content: space-between;">
|
<span>¥</span>
|
||||||
{{order.ordersPackageList[0].duration}}分钟
|
<span>{{order.sumMoney}}</span>
|
||||||
x{{order.ordersPackageList[0].num}}
|
</view>
|
||||||
</view>
|
<view>
|
||||||
</view> -->
|
<uni-number-box :disabled="true" :value="order.ordersPackageList[0].num" :width='27' :min="1" @change="changeValue" />
|
||||||
|
|
||||||
<view class="money-pay">
|
|
||||||
<view class="money-pay-zhen">
|
|
||||||
<span>¥</span>
|
|
||||||
<span>{{order.sumMoney}}</span>
|
|
||||||
</view>
|
|
||||||
<!-- <view class="money-pay-jia">¥298</view> -->
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- <view class="jz_btn"
|
|
||||||
v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
|
|
||||||
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)">
|
|
||||||
加钟/补价</view> -->
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="ske-padding margin-top-sm header-view">
|
||||||
|
<view v-if="!detailaddress">请选择地址</view>
|
||||||
|
<view class="margin-right-xs">
|
||||||
|
<view class="flex justify-between margin-top-lg">
|
||||||
|
<view class="header-view-text">联系人</view>
|
||||||
|
<view class="header-view-data">
|
||||||
|
<text>{{name}}</text>
|
||||||
|
<text class="xuanzhe" @click="getAddressList()">修改</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="flex justify-between margin-top-lg">
|
||||||
|
<view class="header-view-text">手机号码</view>
|
||||||
|
<view class="header-view-data">
|
||||||
|
{{mobile}}
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="flex justify-between margin-top-lg">
|
||||||
|
<view class="header-view-text">详细地址</view>
|
||||||
|
<view class="flex adders-view">
|
||||||
|
<span>
|
||||||
|
{{province}}/{{city}}/{{district}}/{{detailaddress}}
|
||||||
|
</span>
|
||||||
|
<span class="view-more"></span>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="flex justify-between margin-top-lg" v-if="order.remark">
|
||||||
|
<view style="width: 170rpx;">备注内容</view>
|
||||||
|
<view class="flex">
|
||||||
|
<view class="">
|
||||||
|
{{order.remark}}
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
<view class="margin-top-xl pay-ding">
|
<view class="margin-top-xl pay-ding">
|
||||||
|
|
||||||
|
@ -61,23 +83,26 @@
|
||||||
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
|
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="flex justify-between" v-if="order.couponMoney" style="margin-top: 19rpx;">
|
<!-- <view class="flex justify-between" v-if="order.couponMoney" style="margin-top: 19rpx;">
|
||||||
<view style="color: #999;font-size: 26rpx;">优惠券</view>
|
<view style="color: #999;font-size: 26rpx;">优惠券</view>
|
||||||
<view class="" style="color: #F93731;font-size: 26rpx;">¥{{order.couponMoney}}</view>
|
<view class="" style="color: #F93731;font-size: 26rpx;">-¥{{order.couponMoney}}</view>
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="pay-ding feiuong">
|
<view class="pay-ding feiuong">
|
||||||
<view class="fei-title">费用明细</view>
|
<view class="fei-title">费用明细</view>
|
||||||
<view class="fei-view">
|
<view class="fei-view">
|
||||||
<view class="fei-view-list">
|
<view class="fei-view-list">
|
||||||
<span>服务价格</span>
|
<span>套餐价格</span>
|
||||||
<span>¥{{order.sumMoney}}</span>
|
<span>¥{{order.sumMoney}}</span>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="fei-view-list">
|
<view class="fei-view-list">
|
||||||
|
<span>套餐数量</span>
|
||||||
|
<span>{{order.ordersPackageList[0].num}}</span>
|
||||||
|
</view>
|
||||||
|
<view class="fei-view-list" v-if="order.couponMoney">
|
||||||
<span>优惠券</span>
|
<span>优惠券</span>
|
||||||
<span>-¥{{order.couponMoney}}</span>
|
<span style="color: rgb(249, 55, 49);">-¥{{order.couponMoney}}</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="fei-view-list-z">
|
<view class="fei-view-list-z">
|
||||||
<span>总金额</span>
|
<span>总金额</span>
|
||||||
|
@ -88,11 +113,8 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
|
<view 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 == 3) && yhqxSel != '否'">取消订单
|
|
||||||
</u-button>
|
|
||||||
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
|
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
|
||||||
v-if="order.status == 3"
|
|
||||||
class="dingshi">立即支付
|
class="dingshi">立即支付
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
|
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
|
||||||
|
@ -101,65 +123,8 @@
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
|
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
|
||||||
<!-- 加钟-->
|
|
||||||
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
|
|
||||||
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
|
|
||||||
<view class="list_item" v-for="(item,index) in orderList" :key="index">
|
|
||||||
<image :src="item.massageImg"></image>
|
|
||||||
<view class="listitem_rightview">
|
|
||||||
<view class="titleview">
|
|
||||||
<view class="item_title">{{item.title}}</view>
|
|
||||||
<view class="item_yishou">已售{{item.sales}}</view>
|
|
||||||
</view>
|
|
||||||
<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
|
|
||||||
<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
|
|
||||||
:key="index">{{items}}</text>
|
|
||||||
</view>
|
|
||||||
<view class="btnview">
|
|
||||||
<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="goOrder(item)">确认加钟</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
|
||||||
</u-popup>
|
|
||||||
<!-- 升级 -->
|
|
||||||
<u-popup v-model="showorderS" mode="bottom" :closeable="closeable">
|
|
||||||
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
|
|
||||||
<view class="xiangmu" v-for="(item,index) in artificerlist" :key="index">
|
|
||||||
<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
|
|
||||||
<view class="xiangmu-cont">
|
|
||||||
<view class="xiangmu-cont-top">
|
|
||||||
<view class="xiangmu-cont-top-title">
|
|
||||||
{{item.title}}
|
|
||||||
</view>
|
|
||||||
<view class="xiangmu-cont-top-time">
|
|
||||||
<view class="xiangmu-cont-top-left">服务时长:{{item.duration}}分钟</view>
|
|
||||||
<view class="xiangmu-cont-top-left">已售:{{item.sales}}</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="xiangmu-about">
|
|
||||||
{{item.jianjie}}
|
|
||||||
</view>
|
|
||||||
<view class="xiangmu-foot">
|
|
||||||
<view class="xiangmu-foot-left">
|
|
||||||
<view class="xiangmu-foot-left-shiji">
|
|
||||||
<span>¥</span>
|
|
||||||
<span>{{item.price}}</span>
|
|
||||||
<span>/元套</span>
|
|
||||||
</view>
|
|
||||||
<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
|
|
||||||
</view>
|
|
||||||
<view class="xiadan" @click="goOrder(item)">
|
|
||||||
确认升级
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
|
||||||
</u-popup>
|
|
||||||
<!-- 支付方式 -->
|
<!-- 支付方式 -->
|
||||||
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
|
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
|
||||||
<view class="popup_pay">
|
<view class="popup_pay">
|
||||||
|
@ -184,54 +149,6 @@
|
||||||
<view class="pay_btn" @click="pay()">确认支付</view>
|
<view class="pay_btn" @click="pay()">确认支付</view>
|
||||||
</view>
|
</view>
|
||||||
</u-popup>
|
</u-popup>
|
||||||
<!-- 提前结束 -->
|
|
||||||
<view>
|
|
||||||
<!-- 提前结束 -->
|
|
||||||
<uni-popup ref="popup" background-color="#fff">
|
|
||||||
<view class="popup-content">
|
|
||||||
<view class="popup-head">
|
|
||||||
<span>请输入提前结束的原因</span>
|
|
||||||
<span @click="closePopup(type)">x</span>
|
|
||||||
</view>
|
|
||||||
<view class="popup-mian">
|
|
||||||
<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
|
|
||||||
<view class="popup-mian-btn">
|
|
||||||
<span @click="closePopup(type)">
|
|
||||||
取消
|
|
||||||
</span>
|
|
||||||
<span @click="tiqian('center')">
|
|
||||||
确定
|
|
||||||
</span>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</uni-popup>
|
|
||||||
</view>
|
|
||||||
<!-- 确认拒绝 -->
|
|
||||||
<view>
|
|
||||||
<!-- 确认拒绝 -->
|
|
||||||
<uni-popup ref="popupQ" background-color="#fff">
|
|
||||||
<view class="popup-content">
|
|
||||||
<view class="popup-head">
|
|
||||||
<span>确认拒单</span>
|
|
||||||
<span @click="closePopupQ(type)">x</span>
|
|
||||||
</view>
|
|
||||||
<view class="popup-mian">
|
|
||||||
<view class="popup-mian-textarea">
|
|
||||||
{{qurenJd.refusalContent}}
|
|
||||||
</view>
|
|
||||||
<view class="popup-mian-btn">
|
|
||||||
<span @click="TuiPopup(type,'1')">
|
|
||||||
同意
|
|
||||||
</span>
|
|
||||||
<span @click="TuiPopup(type,'3')">
|
|
||||||
全额退款
|
|
||||||
</span>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</uni-popup>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
@ -248,7 +165,6 @@
|
||||||
tpayMoney: '',
|
tpayMoney: '',
|
||||||
paySel: 0,
|
paySel: 0,
|
||||||
showorder: false,
|
showorder: false,
|
||||||
showorderS: false,
|
|
||||||
orderList: [],
|
orderList: [],
|
||||||
loading: true,
|
loading: true,
|
||||||
customStyle: {
|
customStyle: {
|
||||||
|
@ -295,18 +211,17 @@
|
||||||
btnShow:false,
|
btnShow:false,
|
||||||
tiqianData:'',
|
tiqianData:'',
|
||||||
type:'center',
|
type:'center',
|
||||||
earlyFinishReason:'',
|
|
||||||
qurenJd:[],
|
qurenJd:[],
|
||||||
artificerlist:[]
|
artificerlist:[],
|
||||||
|
province:'',
|
||||||
|
city:'',
|
||||||
|
district:'',
|
||||||
|
addressId:'',
|
||||||
|
mobile:'',
|
||||||
|
detailaddress:'',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(e) {
|
onLoad(e) {
|
||||||
// uni.showLoading({
|
|
||||||
// title: '加载中......',
|
|
||||||
// })
|
|
||||||
// setTimeout(() => {
|
|
||||||
// // this.loading = false;
|
|
||||||
// }, 2000)
|
|
||||||
this.isTrue = e.isTrue
|
this.isTrue = e.isTrue
|
||||||
if (this.isTrue) {
|
if (this.isTrue) {
|
||||||
uni.setNavigationBarTitle({
|
uni.setNavigationBarTitle({
|
||||||
|
@ -317,8 +232,13 @@
|
||||||
this.getOrder()
|
this.getOrder()
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
this.addressId = this.$queue.getData('EditAddress');
|
||||||
|
if (this.addressId) {
|
||||||
|
this.getAddressList(this.addressId);
|
||||||
|
} else {
|
||||||
|
this.addressMy()
|
||||||
|
}
|
||||||
this.yhqxSel = this.$queue.getData("yhqxSel");
|
this.yhqxSel = this.$queue.getData("yhqxSel");
|
||||||
this.getOrder()
|
|
||||||
if (uni.getStorageSync('token')) {
|
if (uni.getStorageSync('token')) {
|
||||||
this.getIsVip()
|
this.getIsVip()
|
||||||
}
|
}
|
||||||
|
@ -354,65 +274,55 @@
|
||||||
// #endif
|
// #endif
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
saveJZS(artificerId) {//升级查询技师项目
|
addressMy() {
|
||||||
let data = {
|
this.$Request.getT('/app/address/selectAddressById').then(res => {
|
||||||
artificerId: artificerId,
|
console.log(res)
|
||||||
status: 0
|
|
||||||
}
|
|
||||||
let that = this;
|
|
||||||
this.$queue.showLoading('查询中...')
|
|
||||||
that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => {
|
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
if (res.data && res.data.length > 0) {
|
this.name = res.data.name;
|
||||||
that.artificerlist = res.data
|
this.mobile = res.data.phone;
|
||||||
// for (let i = 0; i < that.artificerlist.length; i++) {
|
this.cityaddress = res.data.province + res.data.city + res.data.district;
|
||||||
// if (that.artificerlist[i].labels) {
|
this.detailaddress = res.data.detailsAddress;
|
||||||
// that.artificerlist[i].labels = that.artificerlist[i].labels.split(",");
|
this.isDefault = res.data.isDefault;
|
||||||
// }
|
this.userId = res.data.userId;
|
||||||
// }
|
this.latitude = res.data.latitude;
|
||||||
uni.hideLoading();
|
this.longitude = res.data.longitude;
|
||||||
that.showorderS = true;
|
this.province = res.data.province
|
||||||
} else {
|
this.city = res.data.city
|
||||||
uni.hideLoading();
|
this.district = res.data.district
|
||||||
that.$queue.showToast('暂无可升级项目');
|
this.addressId = res.data.addressId
|
||||||
}
|
// this.getChuXing();
|
||||||
} else {
|
// this.$queue.setData('EditAddress', res.data.addressId);
|
||||||
uni.hideLoading();
|
|
||||||
that.$queue.showToast(res.msg);
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
})
|
|
||||||
},
|
},
|
||||||
saveJZ(classifyId) {
|
// 选中地址
|
||||||
let data = {
|
getAddressList(addressId) {
|
||||||
parentId: classifyId,
|
if (addressId) {
|
||||||
page: 1,
|
this.$Request.getT('/app/address/selectAddressByAddressId?addressId=' + this.addressId).then(res => {
|
||||||
limit: 50,
|
console.log(res)
|
||||||
status: 1
|
if (res.code == 0) {
|
||||||
}
|
this.name = res.data.name;
|
||||||
let that = this;
|
this.mobile = res.data.phone;
|
||||||
this.$queue.showLoading('查询中...')
|
this.cityaddress = res.data.province + res.data.city + res.data.district;
|
||||||
that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
|
this.detailaddress = res.data.detailsAddress;
|
||||||
if (res.code == 0) {
|
this.isDefault = res.data.isDefault;
|
||||||
if (res.data.list && res.data.list.length > 0) {
|
this.userId = res.data.userId;
|
||||||
that.orderList = res.data.list
|
this.latitude = res.data.latitude;
|
||||||
for (let i = 0; i < that.orderList.length; i++) {
|
this.longitude = res.data.longitude;
|
||||||
if (that.orderList[i].labels) {
|
this.province = res.data.province
|
||||||
that.orderList[i].labels = that.orderList[i].labels.split(",");
|
this.city = res.data.city
|
||||||
}
|
this.district = res.data.district
|
||||||
}
|
|
||||||
uni.hideLoading();
|
// this.getChuXing();
|
||||||
that.showorder = true;
|
|
||||||
} else {
|
|
||||||
uni.hideLoading();
|
|
||||||
that.$queue.showToast('暂无可加钟项目');
|
|
||||||
}
|
}
|
||||||
} else {
|
// uni.hideLoading();
|
||||||
uni.hideLoading();
|
});
|
||||||
that.$queue.showToast(res.msg);
|
} else {
|
||||||
}
|
uni.navigateTo({
|
||||||
|
url: '../address/address?id=' + 2
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
getTimeStampWithoutSeconds(date) {
|
getTimeStampWithoutSeconds(date) {
|
||||||
// 将日期转换为标准的UTC时间
|
// 将日期转换为标准的UTC时间
|
||||||
|
@ -426,6 +336,13 @@
|
||||||
// 返回不含秒的时间戳
|
// 返回不含秒的时间戳
|
||||||
return utcDate.getTime();
|
return utcDate.getTime();
|
||||||
},
|
},
|
||||||
|
openpay(item) {
|
||||||
|
// uni.navigateTo({
|
||||||
|
// url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
|
||||||
|
// })
|
||||||
|
// this.goOrder()
|
||||||
|
this.showpay = true
|
||||||
|
},
|
||||||
getOrder() {
|
getOrder() {
|
||||||
let data = {
|
let data = {
|
||||||
ordersId: this.ordersId
|
ordersId: this.ordersId
|
||||||
|
@ -453,114 +370,8 @@
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
closePopupQ(type){//提前结束 关闭弹出框
|
|
||||||
this.type = type
|
|
||||||
this.$refs.popupQ.close(type);
|
|
||||||
},
|
|
||||||
toggleQ(type,item) {//确认拒单 弹出框
|
|
||||||
this.qurenJd=item;
|
|
||||||
|
|
||||||
this.type = type
|
|
||||||
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
|
|
||||||
this.$refs.popupQ.open(type)
|
|
||||||
},
|
|
||||||
TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮 关闭弹出框
|
|
||||||
this.type = typeTxte
|
|
||||||
let data = {
|
|
||||||
ordersId: this.qurenJd.ordersId,
|
|
||||||
isAuto: '0',
|
|
||||||
type: type
|
|
||||||
}
|
|
||||||
this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
|
|
||||||
if (res.code == 0) {
|
|
||||||
uni.showToast({
|
|
||||||
title:'操作完成!'
|
|
||||||
})
|
|
||||||
this.getOrder()
|
|
||||||
this.$refs.popupQ.close(typeTxte);
|
|
||||||
}else{
|
|
||||||
this.getOrder()
|
|
||||||
uni.showToast({
|
|
||||||
icon:'error',
|
|
||||||
title:'操作失败!'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
}).catch(() => {
|
|
||||||
this.getOrder()
|
|
||||||
//联网失败, 结束加载
|
|
||||||
});
|
|
||||||
},
|
|
||||||
closePopup(type){//提前结束 关闭弹出框
|
|
||||||
this.type = type
|
|
||||||
this.$refs.popup.close(type);
|
|
||||||
},
|
|
||||||
textareaInp(e){//提前结束 输入框
|
|
||||||
this.earlyFinishReason=e.detail.value;
|
|
||||||
console.log("earlyFinishReason",this.earlyFinishReason)
|
|
||||||
},
|
|
||||||
tiqian(type){//提前结束 确认按钮
|
|
||||||
var that=this;
|
|
||||||
that.type = type;
|
|
||||||
|
|
||||||
uni.getLocation({
|
|
||||||
type: 'wgs84',
|
|
||||||
success: function (resa) {
|
|
||||||
var longitude=resa.longitude;
|
|
||||||
var latitude=resa.latitude;
|
|
||||||
console.log('当前位置的经度:' + resa.longitude);
|
|
||||||
console.log('当前位置的纬度:' + resa.latitude);
|
|
||||||
let data = {
|
|
||||||
ordersId: that.tiqianData.ordersId,
|
|
||||||
accomplishLongitude:longitude,
|
|
||||||
accomplishLatitude:latitude,
|
|
||||||
earlyFinishReason: that.earlyFinishReason,
|
|
||||||
}
|
|
||||||
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
|
|
||||||
if (res.code == 0) {
|
|
||||||
uni.showToast({
|
|
||||||
title:'操作完成!'
|
|
||||||
})
|
|
||||||
that.getOrder()
|
|
||||||
that.$refs.popup.close(type);
|
|
||||||
}else{
|
|
||||||
that.getOrder()
|
|
||||||
uni.showToast({
|
|
||||||
icon:'error',
|
|
||||||
title:'操作失败!'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
}).catch(() => {
|
|
||||||
//联网失败, 结束加载
|
|
||||||
that.getOrder()
|
|
||||||
});
|
|
||||||
|
|
||||||
},
|
|
||||||
fail: function(e) {
|
|
||||||
that.getOrder()
|
|
||||||
// #ifdef H5
|
|
||||||
uni.showToast({
|
|
||||||
title:'获取地址失败!'
|
|
||||||
})
|
|
||||||
// #endif
|
|
||||||
// #ifdef APP-PLUS
|
|
||||||
that.checkPermission();
|
|
||||||
// #endif
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
},
|
|
||||||
toggle(type,item) {//提前结束 弹出框
|
|
||||||
this.tiqianData=item;
|
|
||||||
this.type = type;
|
|
||||||
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
|
|
||||||
this.$refs.popup.open(type);
|
|
||||||
},
|
|
||||||
|
|
||||||
gengBtn(){
|
|
||||||
this.btnShow=!this.btnShow
|
|
||||||
},
|
|
||||||
goChat() {
|
goChat() {
|
||||||
let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
|
let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
|
||||||
let kefuPhone = this.$queue.getData('kefuPhone');
|
let kefuPhone = this.$queue.getData('kefuPhone');
|
||||||
|
@ -637,45 +448,19 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
goOrder(item) {
|
|
||||||
console.log("item=====>",item)
|
|
||||||
console.log("order=====>",this.order)
|
|
||||||
let that = this
|
|
||||||
let data = {
|
|
||||||
classifyId:item.classifyId,
|
|
||||||
ordersId:that.order.ordersId,
|
|
||||||
ordersMassageList:[
|
|
||||||
{massageId: item.massageTypeId,num: 1},
|
|
||||||
],
|
|
||||||
massageTypeId:item.massageTypeId,
|
|
||||||
userPackageDetailId:item.userPackageDetailId,
|
|
||||||
}
|
|
||||||
that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
|
|
||||||
that.showorder = false
|
|
||||||
if (res.code == 0) {
|
|
||||||
that.ordersId = res.data.ordersId;
|
|
||||||
that.tpayMoney = res.data.payMoney;
|
|
||||||
that.showpay = true;
|
|
||||||
that.paySel = 1;
|
|
||||||
} else {
|
|
||||||
that.$queue.showToast(res.msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
},
|
|
||||||
payJZ() {
|
payJZ() {
|
||||||
let that = this;
|
let that = this;
|
||||||
if (that.openWay == 1) { //零钱支付
|
if (that.openWay == 1) { //零钱支付
|
||||||
|
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '付款提示',
|
title: '付款提示',
|
||||||
content: '确认支付' + that.order.sumMoney + '元吗?',
|
content: '确认支付' + that.order.payMoney + '元吗?',
|
||||||
success: function(re) {
|
success: function(re) {
|
||||||
if (re.confirm) {
|
if (re.confirm) {
|
||||||
that.$queue.showLoading('支付中...')
|
that.$queue.showLoading('支付中...')
|
||||||
// console.log('用户点击确定');
|
// console.log('用户点击确定');
|
||||||
that.$Request.post("/app/artificer/payOrders", {
|
that.$Request.post("/app/artificer/payOrders", {
|
||||||
ordersId: order.ordersId,
|
ordersId: that.ordersId,
|
||||||
}).then(ret => {
|
}).then(ret => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
if (ret.code == 0) {
|
if (ret.code == 0) {
|
||||||
|
@ -934,12 +719,7 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
openpay(item) {
|
|
||||||
// uni.navigateTo({
|
|
||||||
// url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
|
|
||||||
// })
|
|
||||||
this.showpay = true
|
|
||||||
},
|
|
||||||
// 支付订单
|
// 支付订单
|
||||||
pay() {
|
pay() {
|
||||||
let that = this
|
let that = this
|
||||||
|
@ -951,19 +731,22 @@
|
||||||
if (that.openWay == 1) { //零钱支付
|
if (that.openWay == 1) { //零钱支付
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '付款提示',
|
title: '付款提示',
|
||||||
content: '确认支付' + that.payMoney.sumMoney + '元吗?',
|
content: '确认支付' + that.order.payMoney + '元吗?',
|
||||||
success: function(re) {
|
success: function(re) {
|
||||||
if (re.confirm) {
|
if (re.confirm) {
|
||||||
that.$queue.showLoading('支付中...')
|
that.$queue.showLoading('支付中...')
|
||||||
console.log('用户点击确定');
|
console.log('用户点击确定');
|
||||||
that.$Request.post("/app/artificer/payOrders", {
|
that.$Request.post("/app/user/package/order/payOrder", {
|
||||||
ordersId: that.order.ordersId,
|
ordersId: that.ordersId,
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '支付成功'
|
title: '支付成功'
|
||||||
})
|
})
|
||||||
|
uni.redirectTo({
|
||||||
|
url:'/pages/my/indextaociliaoList?type='+104+'&name='+'index'
|
||||||
|
})
|
||||||
that.getOrder()
|
that.getOrder()
|
||||||
} else {
|
} else {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
@ -1266,6 +1049,47 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
.adders-view image{
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
.xuanzhe{
|
||||||
|
background: #e5e7eb;
|
||||||
|
color: #666;
|
||||||
|
margin-left: 5px;
|
||||||
|
border: 1px solid #cdd2db;
|
||||||
|
border-radius: 30rpx;
|
||||||
|
padding: 4rpx 15rpx;
|
||||||
|
font-size: 26rpx;
|
||||||
|
}
|
||||||
|
.header-view-data{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.adders-view span,.header-view-data{
|
||||||
|
font-size: 29rpx;
|
||||||
|
color: #888;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
.adders-view{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.header-view-text{
|
||||||
|
width: 170rpx;
|
||||||
|
font-size: 29rpx;
|
||||||
|
color: #222222;
|
||||||
|
}
|
||||||
|
.header-view{
|
||||||
|
background-color: #fff;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
border-radius: 11px;
|
||||||
|
}
|
||||||
|
.ske-padding{
|
||||||
|
padding: 5rpx 30rpx 36rpx 30rpx;
|
||||||
|
|
||||||
|
}
|
||||||
/deep/.u-drawer{
|
/deep/.u-drawer{
|
||||||
z-index:11 !important;
|
z-index:11 !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
|
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
|
||||||
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
|
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
|
||||||
<view class="flex align-center" style="width: 80%;justify-content: space-between;">
|
<view class="flex align-center" style="width: 80%;justify-content: space-between;">
|
||||||
<view class="d-title">{{order.artificer.artificerName}}1</view>
|
<view class="d-title">{{order.artificer.artificerName}}</view>
|
||||||
<!-- <image
|
<!-- <image
|
||||||
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
|
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
|
||||||
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
|
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
|
<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
|
||||||
<view class="quanyi_listitem">
|
<view class="quanyi_listitem">
|
||||||
<image src="../../static/vip/zuanshi.png"></image>
|
<image src="../../static/vip/zuanshi.png"></image>
|
||||||
<view class="listitem_name">专享{{vipData.rateStr}}折</view>
|
<view class="listitem_name">专享{{vrateStr}}折</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="quanyi_listitem">
|
<view class="quanyi_listitem">
|
||||||
<image src="../../static/vip/wangguan.png"></image>
|
<image src="../../static/vip/wangguan.png"></image>
|
||||||
|
@ -47,7 +47,9 @@
|
||||||
<view class="bgbox" style="" v-else>
|
<view class="bgbox" style="" v-else>
|
||||||
<view class="bgbox-top-show">
|
<view class="bgbox-top-show">
|
||||||
<image src="../../static/vip/membership.png" mode=""></image>
|
<image src="../../static/vip/membership.png" mode=""></image>
|
||||||
<view class="bgbox-top-show-youxiao">到期时间{{vipData.endTime}}</view>
|
<view class="bgbox-top-show-youxiao">
|
||||||
|
到期时间 {{timeVipEnd}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="bgbox-mian">VIP超值权益</view>
|
<view class="bgbox-mian">VIP超值权益</view>
|
||||||
<view class="quanyi_view">
|
<view class="quanyi_view">
|
||||||
|
@ -56,7 +58,7 @@
|
||||||
<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
|
<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
|
||||||
<view class="quanyi_listitem">
|
<view class="quanyi_listitem">
|
||||||
<image src="../../static/vip/zuanshi.png"></image>
|
<image src="../../static/vip/zuanshi.png"></image>
|
||||||
<view class="listitem_name">专享{{vipData.rateStr}}折</view>
|
<view class="listitem_name">专享{{rateStr}}折</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="quanyi_listitem">
|
<view class="quanyi_listitem">
|
||||||
<image src="../../static/vip/wangguan.png"></image>
|
<image src="../../static/vip/wangguan.png"></image>
|
||||||
|
@ -99,7 +101,7 @@
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
endTime: '',
|
timeVipEnd: '',
|
||||||
customStyle: {
|
customStyle: {
|
||||||
width: '250rpx',
|
width: '250rpx',
|
||||||
color: '#402321',
|
color: '#402321',
|
||||||
|
@ -120,7 +122,8 @@
|
||||||
openWay: 2,
|
openWay: 2,
|
||||||
showpay: false,
|
showpay: false,
|
||||||
vipData:[],
|
vipData:[],
|
||||||
vipShow:false
|
vipShow:false,
|
||||||
|
rateStr:''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
|
@ -155,7 +158,6 @@
|
||||||
}]
|
}]
|
||||||
// #endif
|
// #endif
|
||||||
this.getvipEndTime();
|
this.getvipEndTime();
|
||||||
this.getVipList()
|
|
||||||
this.getMemberList()
|
this.getMemberList()
|
||||||
this.getMoney()
|
this.getMoney()
|
||||||
this.getIsVip()
|
this.getIsVip()
|
||||||
|
@ -174,19 +176,30 @@
|
||||||
},
|
},
|
||||||
getvipEndTime() {
|
getvipEndTime() {
|
||||||
this.$Request.get("/app/UserVip/selectUserVip").then(res => {
|
this.$Request.get("/app/UserVip/selectUserVip").then(res => {
|
||||||
if (res.code == 0 && res.data) {
|
if (res.code == 0) {
|
||||||
this.endTime = res.data.endTime
|
var data= res.data.endTime
|
||||||
|
this.timeVipEnd = data.slice(0,16);
|
||||||
|
this.getVipList(res.data.vipNameType)
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//获取VIP列表
|
//获取VIP列表
|
||||||
getVipList() {
|
getVipList(vipNameType) {
|
||||||
this.$Request.get('/app/VipDetails/selectVipDetails').then(res => {
|
var that=this;
|
||||||
|
var vipNameType=vipNameType;
|
||||||
|
that.$Request.get('/app/VipDetails/selectVipDetails').then(res => {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
this.vipList = res.data;
|
that.vipList = res.data;
|
||||||
this.vipData.rateStr=this.vipList[0].rateStr;
|
// that.rateStr=that.vipList[0].rateStr;
|
||||||
this.selNum = this.vipList[0].id
|
for(var i=0;i<res.data.length;i++){
|
||||||
this.price = this.vipList[0].money
|
if(vipNameType==res.data[i].vipNameType){
|
||||||
|
that.rateStr=res.data[i].rateStr
|
||||||
|
that.selNum = res.data[i].id
|
||||||
|
that.price = res.data[i].money
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -201,7 +214,8 @@
|
||||||
getIsVip() {
|
getIsVip() {
|
||||||
this.$Request.get("/app/UserVip/isUserVip").then(res => {
|
this.$Request.get("/app/UserVip/isUserVip").then(res => {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
this.isVip = res.data
|
this.isVip = res.data;
|
||||||
|
|
||||||
this.$queue.setData('isVIP',this.isVip)
|
this.$queue.setData('isVIP',this.isVip)
|
||||||
if (this.isVip) {
|
if (this.isVip) {
|
||||||
this.getvipEndTime();
|
this.getvipEndTime();
|
||||||
|
|
87
pages.json
87
pages.json
|
@ -511,42 +511,105 @@
|
||||||
"titleNView": false
|
"titleNView": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, {
|
},{
|
||||||
|
"path": "order/payModifyTcMy",
|
||||||
|
"style": {
|
||||||
|
"navigationBarTitleText": "我的套餐详情",
|
||||||
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},{
|
||||||
|
"path": "order/payModifyCi",
|
||||||
|
"style": {
|
||||||
|
"navigationBarTitleText": "次卡订单详情",
|
||||||
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},{
|
||||||
|
"path": "order/paydingCi",
|
||||||
|
"style": {
|
||||||
|
"navigationBarTitleText": "次卡订单支付",
|
||||||
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},{
|
||||||
|
"path": "order/payModifyLiao",
|
||||||
|
"style": {
|
||||||
|
"navigationBarTitleText": "疗程订单详情",
|
||||||
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},{
|
||||||
|
"path": "order/paydingLiao",
|
||||||
|
"style": {
|
||||||
|
"navigationBarTitleText": "疗程订单支付",
|
||||||
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},{
|
||||||
"path": "order/paydingDd",
|
"path": "order/paydingDd",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "订单支付",
|
"navigationBarTitleText": "订单支付",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},{
|
},{
|
||||||
"path": "order/payModifyDd",
|
"path": "order/payModifyDd",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "订单页面详情",
|
"navigationBarTitleText": "订单页面详情",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},{
|
},{
|
||||||
"path": "order/paydingTc",
|
"path": "order/paydingTc",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "套餐订单详情",
|
"navigationBarTitleText": "套餐订单详情",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
"path": "order/payModifyTc",
|
"path": "order/payModifyTc",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "套餐订单",
|
"navigationBarTitleText": "套餐订单",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
"path": "order/payModifyDzhifu",
|
"path": "order/payModifyDzhifu",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "订单详情",
|
"navigationBarTitleText": "订单详情",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "help/helpDetail",
|
"path": "help/helpDetail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "帮助详情",
|
"navigationBarTitleText": "帮助详情",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},{
|
},{
|
||||||
"path": "hongbao/youhuijuanList",
|
"path": "hongbao/youhuijuanList",
|
||||||
|
@ -572,14 +635,20 @@
|
||||||
"path": "gird/guanzhu",
|
"path": "gird/guanzhu",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "我的粉丝",
|
"navigationBarTitleText": "我的粉丝",
|
||||||
"enablePullDownRefresh": true
|
"enablePullDownRefresh": true,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "gird/visitor",
|
"path": "gird/visitor",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "最近访客",
|
"navigationBarTitleText": "最近访客",
|
||||||
"enablePullDownRefresh": true
|
"enablePullDownRefresh": true,
|
||||||
|
"app-plus": {
|
||||||
|
"titleNView": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -92,7 +92,7 @@
|
||||||
<view class="detail-foot-mian1">
|
<view class="detail-foot-mian1">
|
||||||
<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index">
|
<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index">
|
||||||
<view class="detail-foot-list-top">
|
<view class="detail-foot-list-top">
|
||||||
<span style="margin-right: 5px;">{{item.title}}111</span>
|
<span style="margin-right: 5px;">{{item.title}}</span>
|
||||||
<!-- <span style="display: none;">详情</span>
|
<!-- <span style="display: none;">详情</span>
|
||||||
<span>服务时长:{{item.duration}}分钟</span> -->
|
<span>服务时长:{{item.duration}}分钟</span> -->
|
||||||
</view>
|
</view>
|
||||||
|
@ -118,29 +118,8 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<checkbox-group @change="checkboxChange" v-if="dataList.name=='index' && dataList.isCanCoupon=='1'">
|
|
||||||
<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
|
<view class="detail-btn" v-if="dataList.name=='index'" @click="openpay(mainData)">
|
||||||
<view class="youhui-view-left">
|
|
||||||
<view class="youhui-view-left-yuan">
|
|
||||||
<span class="youhui-view-left-num">{{itemY.money}}</span>
|
|
||||||
<span class="youhui-view-left-text">元</span>
|
|
||||||
</view>
|
|
||||||
<view class="youhui-view-left-bottom">
|
|
||||||
满{{itemY.minMoney}}元可用
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="youhui-view-right">
|
|
||||||
<view class="youhui-view-right-top">
|
|
||||||
<view class="youhui-view-right-title">{{itemY.couponName}}</view>
|
|
||||||
<view class="youhui-view-right-time">{{itemY.endDate}}</view>
|
|
||||||
</view>
|
|
||||||
<label class="tui-radio">
|
|
||||||
<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
|
|
||||||
</label>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</checkbox-group>
|
|
||||||
<view class="detail-btn" v-if="dataList.name=='index'" @click="openpay">
|
|
||||||
立即购买
|
立即购买
|
||||||
</view>
|
</view>
|
||||||
<!-- 支付方式 -->
|
<!-- 支付方式 -->
|
||||||
|
@ -578,9 +557,16 @@
|
||||||
// #endif
|
// #endif
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
openpay() {//立即预约
|
openpay(item) {//立即预约
|
||||||
this.goOrder()
|
this.$queue.setData('mainData',item)
|
||||||
this.showpay = true
|
this.$queue.setData('detailData',this.detailData)
|
||||||
|
this.$queue.setData('xiangmu',item)
|
||||||
|
this.$queue.setData('youhui','');
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/my/order/payModifyCi?ordersId='+item.id
|
||||||
|
})
|
||||||
|
// this.goOrder()
|
||||||
|
// this.showpay = true
|
||||||
},
|
},
|
||||||
//支付选择
|
//支付选择
|
||||||
selectWay: function(item) {
|
selectWay: function(item) {
|
||||||
|
|
|
@ -1,12 +1,26 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="header">
|
<view class="header">
|
||||||
<view class="header-top" :style="backgroundStyle">
|
<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
|
||||||
<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
|
<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
|
||||||
<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
|
<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="header-bottom">
|
<view class="header-bottom">
|
||||||
<view class="header-bottom-top">
|
<view class="header-bottom-top">
|
||||||
|
<view class="header-bottom-top-list">
|
||||||
|
<view class="header-bottom-foot-view">
|
||||||
|
<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
|
||||||
|
<span>实名认证</span>
|
||||||
|
</view>
|
||||||
|
<view class="header-bottom-foot-view" style="margin: 0px 7px;">
|
||||||
|
<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
|
||||||
|
<span>资质认证</span>
|
||||||
|
</view>
|
||||||
|
<view class="header-bottom-foot-view">
|
||||||
|
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
|
||||||
|
<span>平台担保</span>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
<view class="header-bottom-title">
|
<view class="header-bottom-title">
|
||||||
<view class="header-bottom-title-text">
|
<view class="header-bottom-title-text">
|
||||||
<span>{{getList.title}}</span>
|
<span>{{getList.title}}</span>
|
||||||
|
@ -25,7 +39,6 @@
|
||||||
<view class="header-bottom-money-zhen">
|
<view class="header-bottom-money-zhen">
|
||||||
<span>¥</span>
|
<span>¥</span>
|
||||||
<span>{{getList.price}}</span>
|
<span>{{getList.price}}</span>
|
||||||
<span>/元套</span>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="header-bottom-money-jia">
|
<view class="header-bottom-money-jia">
|
||||||
¥{{getList.oldPrice}}
|
¥{{getList.oldPrice}}
|
||||||
|
@ -141,13 +154,24 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods:{
|
methods:{
|
||||||
|
goNav(e) {
|
||||||
|
uni.navigateTo({
|
||||||
|
url: e
|
||||||
|
})
|
||||||
|
},
|
||||||
goumai(item){//立即购买
|
goumai(item){//立即购买
|
||||||
this.$queue.setData('getJishi','')
|
// this.$queue.setData('getJishi','')
|
||||||
this.$queue.setData('ordersId',this.dataList.massageTypeId);
|
// this.$queue.setData('ordersId',this.dataList.massageTypeId);
|
||||||
this.$queue.setData('userPackageDetailId',this.dataList.id);
|
// this.$queue.setData('userPackageDetailId',this.dataList.id);
|
||||||
this.$queue.setData('daibudan','');
|
// this.$queue.setData('daibudan','');
|
||||||
|
// uni.navigateTo({
|
||||||
|
// url:'/my/order/payModifyTc?ordersId='+this.dataList.massageTypeId
|
||||||
|
// })
|
||||||
|
this.$queue.setData('mainData',item)
|
||||||
|
// this.$queue.setData('detailData',this.detailData)
|
||||||
|
this.$queue.setData('youhui','');
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:'/my/order/payModify?ordersId='+this.dataList.massageTypeId
|
url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId
|
||||||
})
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
|
@ -445,6 +469,12 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
.header-bottom-top-list{
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
.header-bottom-foot{
|
.header-bottom-foot{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
@ -123,29 +123,8 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<checkbox-group @change="checkboxChange" v-if="dataList.name=='index' && dataList.isCanCoupon=='1'">
|
|
||||||
<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
|
<view class="detail-btn" v-if="dataList.name=='index'" @click="openpay(mainData)">
|
||||||
<view class="youhui-view-left">
|
|
||||||
<view class="youhui-view-left-yuan">
|
|
||||||
<span class="youhui-view-left-num">{{itemY.money}}</span>
|
|
||||||
<span class="youhui-view-left-text">元</span>
|
|
||||||
</view>
|
|
||||||
<view class="youhui-view-left-bottom">
|
|
||||||
满{{itemY.minMoney}}元可用
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="youhui-view-right">
|
|
||||||
<view class="youhui-view-right-top">
|
|
||||||
<view class="youhui-view-right-title">{{itemY.couponName}}</view>
|
|
||||||
<view class="youhui-view-right-time">{{itemY.endDate}}</view>
|
|
||||||
</view>
|
|
||||||
<label class="tui-radio">
|
|
||||||
<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
|
|
||||||
</label>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</checkbox-group>
|
|
||||||
<view class="detail-btn" v-if="dataList.name=='index'" @click="openpay">
|
|
||||||
立即购买
|
立即购买
|
||||||
</view>
|
</view>
|
||||||
<!-- 支付方式 -->
|
<!-- 支付方式 -->
|
||||||
|
@ -585,9 +564,16 @@
|
||||||
// #endif
|
// #endif
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
openpay() {//立即预约
|
openpay(item) {//立即预约
|
||||||
this.goOrder()
|
this.$queue.setData('mainData',item)
|
||||||
this.showpay = true
|
this.$queue.setData('detailData',this.detailData)
|
||||||
|
this.$queue.setData('xiangmu',item)
|
||||||
|
this.$queue.setData('youhui','');
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/my/order/payModifyLiao?ordersId='+item.id
|
||||||
|
})
|
||||||
|
// this.goOrder()
|
||||||
|
// this.showpay = true
|
||||||
},
|
},
|
||||||
//支付选择
|
//支付选择
|
||||||
selectWay: function(item) {
|
selectWay: function(item) {
|
||||||
|
|
|
@ -41,9 +41,11 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="my-head-bottom back-width" @click="goNav('/my/vip/index')">
|
<view class="my-head-bottom back-width" @click="goNav('/my/vip/index')">
|
||||||
<image src="../../static/my-kaitonghuiyuan.png" mode="widthFix" v-if="!isVip"></image>
|
<image src="../../static/my-kaitonghuiyuan.png" mode="widthFix" v-if="isVip=='1'"></image>
|
||||||
<image src="../../static/activate3.png" mode="widthFix" v-if="isVip"></image>
|
<image src="../../static/activate2.png" mode="widthFix" v-if="isVip=='0'"></image>
|
||||||
|
<!-- <image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVip"></image>
|
||||||
|
<image src="../../static/activate2.png" mode="widthFix" v-if="isVip"></image> -->
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="padding-lr margin-lr" style="background-color: #35C495;border-radius: 18rpx;margin-top: 30rpx;"
|
<!-- <view class="padding-lr margin-lr" style="background-color: #35C495;border-radius: 18rpx;margin-top: 30rpx;"
|
||||||
v-if="XCXIsSelect != '否' && hyCheck != '否'">
|
v-if="XCXIsSelect != '否' && hyCheck != '否'">
|
||||||
|
@ -114,7 +116,7 @@
|
||||||
follow: 0, //关注数
|
follow: 0, //关注数
|
||||||
visitor: 0, //访客数
|
visitor: 0, //访客数
|
||||||
userId: '',
|
userId: '',
|
||||||
isVip: false,
|
isVip: 0,
|
||||||
invitationCode: '', //邀请码
|
invitationCode: '', //邀请码
|
||||||
money: '0',
|
money: '0',
|
||||||
couponnum: '0',
|
couponnum: '0',
|
||||||
|
@ -165,7 +167,7 @@
|
||||||
this.follow = 0
|
this.follow = 0
|
||||||
this.visitor = 0
|
this.visitor = 0
|
||||||
this.avatar = '../../static/logo.png'
|
this.avatar = '../../static/logo.png'
|
||||||
this.isVip = false
|
this.isVip = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
@ -252,7 +254,7 @@
|
||||||
that.fans = 0
|
that.fans = 0
|
||||||
that.follow = 0
|
that.follow = 0
|
||||||
that.visitor = 0
|
that.visitor = 0
|
||||||
that.isVip = false
|
that.isVip = 0
|
||||||
that.avatar = '../../static/logo.png'
|
that.avatar = '../../static/logo.png'
|
||||||
that.userId = uni.getStorageSync('userId')
|
that.userId = uni.getStorageSync('userId')
|
||||||
|
|
||||||
|
@ -433,12 +435,8 @@
|
||||||
getIsVip() {
|
getIsVip() {
|
||||||
this.$Request.get("/app/UserVip/selectUserVip").then(res => {
|
this.$Request.get("/app/UserVip/selectUserVip").then(res => {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
this.isVip = res.data
|
this.isVip = res.data.isVip
|
||||||
if(this.isVip==undefined){
|
this.$queue.setData('isVIP',this.isVip)
|
||||||
this.$queue.setData('isVIP','0')
|
|
||||||
}else{
|
|
||||||
this.$queue.setData('isVIP','1')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="header">
|
<view class="header">
|
||||||
<view class="header-top" :style="backgroundStyle">
|
<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
|
||||||
<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVip"></image>
|
<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVip"></image>
|
||||||
<image src="../../static/activate2.png" mode="widthFix" v-if="isVip"></image>
|
<image src="../../static/activate2.png" mode="widthFix" v-if="isVip"></image>
|
||||||
</view>
|
</view>
|
||||||
|
@ -21,7 +21,6 @@
|
||||||
<view class="header-bottom-money-zhen">
|
<view class="header-bottom-money-zhen">
|
||||||
<span>¥</span>
|
<span>¥</span>
|
||||||
<span>{{mainData.price}}</span>
|
<span>{{mainData.price}}</span>
|
||||||
<span>元/次</span>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="header-bottom-money-jia">
|
<view class="header-bottom-money-jia">
|
||||||
¥{{mainData.oldPrice}}
|
¥{{mainData.oldPrice}}
|
||||||
|
@ -65,51 +64,33 @@
|
||||||
<view class="detail-foot-list-top">
|
<view class="detail-foot-list-top">
|
||||||
<span style="margin-right: 5px;">{{item.title}}</span>
|
<span style="margin-right: 5px;">{{item.title}}</span>
|
||||||
<span style="display: none;">详情</span>
|
<span style="display: none;">详情</span>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
|
<view class="detail-view">
|
||||||
<view class="header-bottom-money-zhen">
|
<image class="detail-view-img" :src="item.massageImg" mode=""></image>
|
||||||
<span>¥</span>
|
<view class="detail-view-mina">
|
||||||
<span>{{item.price}}</span>
|
<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
|
||||||
<span>元/套</span>
|
<view class="header-bottom-money-zhen">
|
||||||
|
<span>¥</span>
|
||||||
|
<span>{{item.price}}</span>
|
||||||
|
</view>
|
||||||
|
<view class="header-bottom-money-jia" style="margin-left: 20px; ">
|
||||||
|
¥{{item.oldPrice}}
|
||||||
|
</view>
|
||||||
|
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
|
||||||
|
</view>
|
||||||
|
<view class="tese">
|
||||||
|
<span>项目特色: </span>
|
||||||
|
<span>{{item.jianjie}}</span>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="header-bottom-money-jia" style="margin-left: 20px; ">
|
|
||||||
¥{{item.oldPrice}}
|
|
||||||
</view>
|
|
||||||
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
|
|
||||||
</view>
|
|
||||||
<view class="tese">
|
|
||||||
<span>项目特色: </span>
|
|
||||||
<span>{{item.jianjie}}</span>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="detail-foot-title">
|
<view class="detail-foot-title">
|
||||||
服务项目{{index+1}}
|
服务项目{{index+1}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <checkbox-group @change="checkboxChange" v-if="serviData.name=='index' && serviData.isCanCoupon=='1'">
|
|
||||||
<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
|
|
||||||
<view class="youhui-view-left">
|
|
||||||
<view class="youhui-view-left-yuan">
|
|
||||||
<span class="youhui-view-left-num">{{itemY.money}}</span>
|
|
||||||
<span class="youhui-view-left-text">元</span>
|
|
||||||
</view>
|
|
||||||
<view class="youhui-view-left-bottom">
|
|
||||||
满{{itemY.minMoney}}元可用
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="youhui-view-right">
|
|
||||||
<view class="youhui-view-right-top">
|
|
||||||
<view class="youhui-view-right-title">{{itemY.couponName}}</view>
|
|
||||||
<view class="youhui-view-right-time">{{itemY.endDate}}</view>
|
|
||||||
</view>
|
|
||||||
<label class="tui-radio">
|
|
||||||
<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
|
|
||||||
</label>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</checkbox-group> -->
|
|
||||||
<view class="detail-btn" v-if="serviData.name=='index'" @click="openpay(mainData)">
|
<view class="detail-btn" v-if="serviData.name=='index'" @click="openpay(mainData)">
|
||||||
立即购买
|
立即购买
|
||||||
</view>
|
</view>
|
||||||
|
@ -210,6 +191,11 @@
|
||||||
// #endif
|
// #endif
|
||||||
},
|
},
|
||||||
methods:{
|
methods:{
|
||||||
|
goNav(e) {
|
||||||
|
uni.navigateTo({
|
||||||
|
url: e
|
||||||
|
})
|
||||||
|
},
|
||||||
checkboxChange(e){
|
checkboxChange(e){
|
||||||
this.couponId=e.detail.value.join(",")
|
this.couponId=e.detail.value.join(",")
|
||||||
},
|
},
|
||||||
|
@ -660,6 +646,24 @@
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
.detail-view-mina{
|
||||||
|
width: 68%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-around;
|
||||||
|
}
|
||||||
|
.detail-view-img{
|
||||||
|
width: 76px;
|
||||||
|
height: 76px;
|
||||||
|
border-radius: 9px;
|
||||||
|
}
|
||||||
|
.detail-view{
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
/deep/uni-checkbox .uni-checkbox-input{
|
/deep/uni-checkbox .uni-checkbox-input{
|
||||||
width: 26px;
|
width: 26px;
|
||||||
height: 26px;
|
height: 26px;
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 数据列表 -->
|
<!-- 数据列表 -->
|
||||||
<view v-if="goods.length > 0" class="margin-sm bg" v-for="(item,index) in goods" :key='index'
|
<view v-if="goods.length > 0" class="margin-sm bg ding-view" v-for="(item,index) in goods" :key='index'
|
||||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" style="border-radius: 20rpx;padding: 36rpx;">
|
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" style="border-radius: 20rpx;padding: 36rpx;">
|
||||||
<view class="flex justify-between">
|
<view class="flex justify-between">
|
||||||
<view class="flex align-center profile-img">
|
<view class="flex align-center profile-img">
|
||||||
|
@ -37,7 +37,7 @@
|
||||||
<view class="u-m-r-10">
|
<view class="u-m-r-10">
|
||||||
<u-avatar
|
<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'"
|
: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;">
|
mode="square" size="100" style="height: 132rpx;width: 132rpx;flex: 0 0 132rpx;">
|
||||||
</u-avatar>
|
</u-avatar>
|
||||||
</view>
|
</view>
|
||||||
<view class="u-flex-1" style="margin-left: 20rpx;">
|
<view class="u-flex-1" style="margin-left: 20rpx;">
|
||||||
|
@ -60,65 +60,69 @@
|
||||||
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
|
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
|
||||||
<view class="flex text-right" style="flex-direction: column;width: 100%;">
|
<view class="flex text-right" style="flex-direction: column;width: 100%;">
|
||||||
|
|
||||||
<view class="showBtn" :style="{'justify-content':item.status != 6||item.status==1?'flex-end':'space-between'}">
|
<view class="showBtn" :style="{'justify-content':item.status ==6||item.status ==1?'space-between':'flex-end'}">
|
||||||
<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">更多</view>
|
<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">
|
||||||
<view class="showBtn-view">
|
<!-- v-show="item.status ==6||item.status ==1" -->
|
||||||
<u-button v-if="item.status == 10" :custom-style="customStyle1" shape="circle" :plain="true"
|
更多
|
||||||
@click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns">
|
</view>
|
||||||
立即预约
|
<u-button
|
||||||
</u-button>
|
v-if="item.status != 3 &&
|
||||||
<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
item.status != 4 &&
|
||||||
@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
|
item.status != 5&&
|
||||||
待评价
|
item.status != 10&&
|
||||||
</u-button>
|
item.addNum==null&&item.oldOrdersId==null"
|
||||||
<u-button v-if="item.status == 9&&item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
|
:custom-style="customStyle" shape="circle" :plain="true"
|
||||||
@click="toggleQ('center',item)" class="btns">
|
class="btns xianshi"
|
||||||
拒单详情
|
@click="cancelOrder(item)">
|
||||||
</u-button>
|
取消订单
|
||||||
|
</u-button>
|
||||||
|
<u-button
|
||||||
|
v-if="item.btnShow == 'true'&&item.oldOrdersId==null&&(item.status==1||item.status==2||item.status==7||item.status==8)&&!item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||||
|
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi">
|
||||||
|
修改订单
|
||||||
|
</u-button>
|
||||||
|
<u-button v-if="item.status == 10" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||||
|
@click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns xianshi">
|
||||||
|
立即预约
|
||||||
|
</u-button>
|
||||||
|
<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns xianshi" shape="circle" :plain="true"
|
||||||
|
@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
|
||||||
|
待评价
|
||||||
|
</u-button>
|
||||||
|
<u-button v-if="item.status == 3||item.status == 6" :custom-style="customStyle1" shape="circle" class="btns xianshi" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
|
||||||
|
去投诉
|
||||||
|
</u-button>
|
||||||
|
<u-button v-if="item.status == 9&&item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||||
|
@click="toggleQ('center',item)" class="btns xianshi">
|
||||||
|
拒单详情
|
||||||
|
</u-button>
|
||||||
|
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
|
||||||
|
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
|
||||||
|
联系客服
|
||||||
|
</u-button>
|
||||||
|
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
|
||||||
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
|
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
|
||||||
@click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns">
|
@click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns">
|
||||||
去支付
|
去支付
|
||||||
</u-button>
|
</u-button>
|
||||||
|
<u-button v-if="item.oldOrdersId==null && item.status == 6&&item.addNum==null" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
||||||
<u-button v-if="item.btnShow == 'true'&&item.status==2||item.oldOrdersId==null||item.status==6||item.status==7||item.status==8||item.status == 9&&!item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
|
|
||||||
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns">
|
|
||||||
修改订单
|
|
||||||
</u-button>
|
|
||||||
<u-button v-if="item.status == 5" :custom-style="customStyle1" shape="circle" class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
|
|
||||||
去投诉
|
|
||||||
</u-button>
|
|
||||||
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
|
||||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
|
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
|
||||||
升级项目
|
服务升级
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
||||||
@click="toggle('center',item)">
|
@click="toggle('center',item)">
|
||||||
提前结束
|
提前结束
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
|
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
||||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH">
|
@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
|
||||||
联系客服
|
充值
|
||||||
|
</u-button>
|
||||||
|
<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>
|
</u-button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="hideBtn" v-show="btnShow==index" style="justify-content: end;">
|
|
||||||
<u-button
|
|
||||||
v-if="item.status != 3 && item.status != 4 && item.status != 5"
|
|
||||||
:custom-style="customStyle" shape="circle" :plain="true"
|
|
||||||
class="btns"
|
|
||||||
@click="cancelOrder(item)">
|
|
||||||
取消订单
|
|
||||||
</u-button>
|
|
||||||
<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
|
|
||||||
@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
|
|
||||||
充值
|
|
||||||
</u-button>
|
|
||||||
<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>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -190,9 +194,13 @@
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
showDetails: [],
|
||||||
tiqianData:[],
|
tiqianData:[],
|
||||||
qurenJd:[],
|
qurenJd:[],
|
||||||
btnShow:'',
|
btnShow:'',
|
||||||
|
gengBtnShow:false,
|
||||||
|
gengBtnHeid:false,
|
||||||
|
gengNum:0,
|
||||||
type:'center',
|
type:'center',
|
||||||
goods: [], // 数据列表
|
goods: [], // 数据列表
|
||||||
game: [],
|
game: [],
|
||||||
|
@ -315,37 +323,41 @@
|
||||||
methods: {
|
methods: {
|
||||||
goNav(url,item,text) {
|
goNav(url,item,text) {
|
||||||
this.$queue.setData('xiangmu',item);
|
this.$queue.setData('xiangmu',item);
|
||||||
if(item.isSupplement='1'){
|
console.log("oldOrdersId=======",item)
|
||||||
|
// if(item.isSupplement=='1'){
|
||||||
|
// uni.navigateTo({
|
||||||
|
// url:url
|
||||||
|
// })
|
||||||
|
// }else{
|
||||||
|
|
||||||
|
// }
|
||||||
|
if(item.oldOrdersId){//如果有订单有升级 那就去升级订单详情
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/my/order/payShengji?ordersId='+item.ordersId
|
||||||
|
})
|
||||||
|
}else if(item.addNum){
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/my/order/payJaZ?ordersId='+item.ordersId
|
||||||
|
})
|
||||||
|
}else if(item.addNum&&item.oldOrdersId){
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/my/order/payJaZ?ordersId='+item.ordersId
|
||||||
|
})
|
||||||
|
}else if(text=='修改'){
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
|
||||||
|
})
|
||||||
|
}else{
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:url
|
url:url
|
||||||
})
|
})
|
||||||
}else{
|
|
||||||
if(item.oldOrdersId){//如果有订单有升级 那就去升级订单详情
|
|
||||||
uni.navigateTo({
|
|
||||||
url:'/my/order/payShengji?ordersId='+item.ordersId
|
|
||||||
})
|
|
||||||
}else if(item.addNum){
|
|
||||||
uni.navigateTo({
|
|
||||||
url:'/my/order/payJaZ?ordersId='+item.ordersId
|
|
||||||
})
|
|
||||||
}else if(item.addNum&&item.oldOrdersId){
|
|
||||||
uni.navigateTo({
|
|
||||||
url:'/my/order/payJaZ?ordersId='+item.ordersId
|
|
||||||
})
|
|
||||||
}else if(text=='修改'){
|
|
||||||
uni.navigateTo({
|
|
||||||
url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
|
|
||||||
})
|
|
||||||
}else{
|
|
||||||
uni.navigateTo({
|
|
||||||
url:url
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
gengBtn(index){//更多按钮
|
gengBtn(index){//更多按钮
|
||||||
this.btnShow=index
|
// console.log("inex=====",index)
|
||||||
|
this.gengNum=index;
|
||||||
|
this.gengBtnShow=!this.gengBtnShow
|
||||||
},
|
},
|
||||||
closePopupQ(type){//提前结束 关闭弹出框
|
closePopupQ(type){//提前结束 关闭弹出框
|
||||||
this.type = type
|
this.type = type
|
||||||
|
@ -658,6 +670,9 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
.xianshi{
|
||||||
|
margin: 0px 5px 0px 0px !important;
|
||||||
|
}
|
||||||
/deep/.u-size-default{
|
/deep/.u-size-default{
|
||||||
margin-top: 5px !important;
|
margin-top: 5px !important;
|
||||||
}
|
}
|
||||||
|
@ -673,22 +688,29 @@
|
||||||
margin-top: -20rpx;
|
margin-top: -20rpx;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
.ding-view{
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
.showBtn-view{
|
.showBtn-view{
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 0;
|
||||||
|
background-color: #fff;
|
||||||
|
padding: 10px;
|
||||||
|
margin-bottom: 50px;
|
||||||
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
.showBtn{
|
.showBtn{
|
||||||
justify-content: space-between;
|
|
||||||
}
|
}
|
||||||
.showBtn,.hideBtn{
|
.showBtn{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
justify-content: space-between;
|
justify-content: flex-end;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.popup-mian-btn span:nth-child(1){
|
.popup-mian-btn span:nth-child(1){
|
||||||
|
@ -766,6 +788,7 @@
|
||||||
height: 47rpx !important;
|
height: 47rpx !important;
|
||||||
line-height: 47px !important;
|
line-height: 47px !important;
|
||||||
border-radius: 23rpx !important;
|
border-radius: 23rpx !important;
|
||||||
|
margin: 0px !important;
|
||||||
}
|
}
|
||||||
/deep/.btns{
|
/deep/.btns{
|
||||||
background: #fff !important;
|
background: #fff !important;
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
<view class="oder-mian-view oder-mian-jin">
|
<view class="oder-mian-view oder-mian-jin">
|
||||||
今日可约
|
今日可约
|
||||||
</view>
|
</view>
|
||||||
<view class="oder-mian-view oder-mian-time">15:33</view>
|
<view class="oder-mian-view oder-mian-time">{{order.time}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="jian-view-right-weizhi">
|
<view class="jian-view-right-weizhi">
|
||||||
<image class="jian-view-right-img" src="../../static/orderDetail/dingwei.png"></image>
|
<image class="jian-view-right-img" src="../../static/orderDetail/dingwei.png"></image>
|
||||||
|
|
Loading…
Reference in New Issue