yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单 忙时时间

This commit is contained in:
Mr.jiang 2024-06-29 16:44:08 +08:00
parent f821efbe3d
commit 533fbf75aa
9 changed files with 2314 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
my/order/pay.vue
View File

@ -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'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
})
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 {

2192
my/order/payJaZ.vue Normal file
View File

File diff suppressed because it is too large Load Diff

10
my/order/payModify.vue
View File

@ -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, "获取忙时时间")

9
my/order/payModifyDd.vue
View File

@ -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, "获取忙时时间")

9
my/order/payModifyTc.vue
View File

@ -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, "获取忙时时间")

135
my/order/payShengji.vue
View File

@ -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
View File

@ -767,6 +767,16 @@
}
}
},
{
"path": "order/payJaZ",
"style": {
"navigationBarTitleText": "加钟订单详情",
"navigationStyle": "custom",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "order/payShengji",
"style": {

10
pages/index/order/orderDet.vue
View File

@ -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;
this.getMsTime(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, "获取忙时时间")

11
pages/order/index.vue
View File

@ -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 = []; //如果是第一页需手动制空列表