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

订单 提前结束 加非空检验

This commit is contained in:
Mr.jiang 2024-07-04 22:45:05 +08:00
parent 5cb8291e0b
commit eee5e792dc
15 changed files with 602 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
my/hongbao/youhuijuan.vue
View File

@ -1,5 +1,5 @@
<template>
<view>
<view class="content-view">
<view class="flex align-center justify-between you-nav">
<view v-for="(item,index) in tab" :key="index" class="text-center box"
:class="tabIndex == index?'tanColor':''" @click="bindTab(item.state)">
@ -181,6 +181,26 @@
</script>
<style scoped>
.content-view{
height: 100vh;
width: 100%;
overflow: hidden;
}
.you-nav{
background: #FFFFFF;
padding: 14px 25px 0px 25px;
position: fixed;
top: 0;
width: 100%;
z-index: 66;
}
/deep/.refresh-body{
box-sizing: border-box;
height: 830px!important;
padding-top: 0px !important;
margin-top: 42px;
}
/deep/.page-box{
width: 100%;
}

3
my/hongbao/youhuijuanList.vue
View File

@ -151,12 +151,13 @@
page:this.page,
limit:this.size,
status:this.tabIndex,
minMoney:this.$queue.getData('minMoney')
minMoney:this.priceDd
}
this.$Request.getT('/app/coupon/selectUserCouponList',data).then(res => {
if (res.code == 0) {
if (this.page == 1) this.hongbao = []; //如果是第一页需手动制空列表
this.hongbao = [...this.hongbao, ...res.data.list]; //追加新数据
console.log("hongbao",this.hongbao)
// uni.stopPullDownRefresh()
// if (this.page == 1) {
// this.hongbao = [];

6
my/order/feedback.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="content">
<view class="header-view">
-提交好评或建议，帮助盛安做得更好——
~ 当你累了 想起盛安到家 ~
</view>
<view class="box">
<view class="feedback-title">
@ -124,7 +124,9 @@
title: '评价成功'
});
setTimeout(function() {
uni.navigateBack();
uni.switchTab({
url:'/pages/order/index'
})
}, 1000);
} else {
uni.hideLoading();

21
my/order/pay.vue
View File

@ -290,6 +290,7 @@
</view>
<view class="showBtn" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
<view class="gengduo" @click.stop="gengBtn">更多</view>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
<u-button
shape="circle" :plain="true"
@click="toggle('center',order)"
@ -310,6 +311,7 @@
class="btns">
加钟
</u-button>
</view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
@ -364,7 +366,7 @@
class="dingshi">联系客服</u-button>
</view>
<view class="showBtn" v-if="order.status ==9">
<u-button class="dingshi" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
<u-button class="dingshi" @click="TuiPopup(type,2,order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button>
@ -1059,6 +1061,8 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
console.log("earlyFinishReason",that.earlyFinishReason)
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -1077,13 +1081,13 @@
uni.showToast({
title:'操作完成！'
})
that.getOrder()
// that.getOrder()
that.$refs.popup.close(type);
}else{
that.getOrder()
// that.getOrder()
uni.showToast({
icon:'error',
title:'操作失败！'
title:'操作失败11！'
})
}
@ -1094,7 +1098,7 @@
},
fail: function(e) {
that.getOrder()
// that.getOrder()
// #ifdef H5
uni.showToast({
title:'获取地址失败！'
@ -1106,6 +1110,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;

8
my/order/payCLDetail.vue
View File

@ -1039,6 +1039,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -1086,6 +1087,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;

9
my/order/payJaZ.vue
View File

@ -1054,7 +1054,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -1101,6 +1101,13 @@
// #endif
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框

9
my/order/payShengji.vue
View File

@ -1054,7 +1054,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -1102,6 +1102,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;

9
my/order/payding.vue
View File

@ -706,7 +706,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -754,6 +754,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;

71
my/order/paydingDd.vue
View File

@ -620,6 +620,9 @@
})
this.getOrder()
this.$refs.popupQ.close(typeTxte);
uni.switchTab({
url:'/pages/order/index'
})
}else{
this.getOrder()
uni.showToast({
@ -644,7 +647,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -665,6 +668,9 @@
})
that.getOrder()
that.$refs.popup.close(type);
uni.switchTab({
url:'/pages/order/index'
})
}else{
that.getOrder()
uni.showToast({
@ -692,6 +698,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;
@ -780,8 +793,7 @@
});
},
goOrder(item) {
console.log("item=====>",item)
console.log("order=====>",this.order)
let that = this
let data = {
classifyId:item.classifyId,
@ -826,6 +838,9 @@
icon: 'none'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
} else {
uni.showToast({
@ -863,6 +878,9 @@
icon: 'none'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
// this.$queue.showToast('支付成功');
// uni.switchTab({
@ -893,6 +911,9 @@
that.showpay = false
if (rea.code == 0) {
that.callPay(rea.data);
uni.switchTab({
url:'/pages/order/index'
})
} else {
uni.showToast({
title: rea.msg,
@ -913,6 +934,9 @@
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url
uni.switchTab({
url:'/pages/order/index'
})
} else {
uni.showToast({
title: rea.msg,
@ -934,6 +958,9 @@
that.showpay = false
if (rea.code == 0) {
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
uni.switchTab({
url:'/pages/order/index'
})
}
});
// #endif
@ -950,6 +977,9 @@
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div)
document.forms[0].submit()
uni.switchTab({
url:'/pages/order/index'
})
});
// #endif
@ -962,6 +992,9 @@
rea => {
that.showpay = false
that.setPayment('alipay', rea.data);
uni.switchTab({
url:'/pages/order/index'
})
});
// #endif
}
@ -1057,7 +1090,9 @@
uni.showToast({
name: "删除成功"
})
uni.navigateBack()
uni.switchTab({
url:'/pages/order/index'
})
} else {
that.$queue.showToast(res.msg);
}
@ -1108,6 +1143,9 @@
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
} else {
uni.showToast({
title: res.msg,
@ -1147,6 +1185,9 @@
icon: 'none'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
// this.$queue.showToast('支付成功');
// uni.switchTab({
@ -1177,6 +1218,9 @@
that.showpay = false
if (rea.code == 0) {
that.callPay(rea.data);
uni.switchTab({
url:'/pages/order/index'
})
} else {
uni.showToast({
title: rea.msg,
@ -1203,6 +1247,9 @@
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url
uni.switchTab({
url:'/pages/order/index'
})
} else {
uni.showToast({
title: rea.msg,
@ -1224,6 +1271,9 @@
that.showpay = false
if (rea.code == 0) {
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
uni.switchTab({
url:'/pages/order/index'
})
}
});
// #endif
@ -1240,6 +1290,9 @@
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div)
document.forms[0].submit()
uni.switchTab({
url:'/pages/order/index'
})
});
// #endif
@ -1251,6 +1304,9 @@
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
that.setPayment('alipay', rea.data);
uni.switchTab({
url:'/pages/order/index'
})
});
// #endif
}
@ -1351,6 +1407,9 @@
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
uni.switchTab({
url:'/pages/order/index'
})
that.getOrder()
} else {
that.$queue.showToast(res.msg);
@ -1377,7 +1436,9 @@
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
uni.navigateBack()
uni.switchTab({
url:'/pages/order/index'
})
} else {
that.$queue.showToast(res.msg);
}

9
my/order/paydingTCX.vue
View File

@ -623,7 +623,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -671,6 +671,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;

9
my/order/paydingXiuGai.vue
View File

@ -692,7 +692,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -740,6 +740,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;

11
pages/order/index.vue
View File

@ -99,7 +99,7 @@
</view>
<view class="showBtn" v-if="item.status ==3">
<u-button :custom-style="customStyle1" class="btns xianshi" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+item.artificerId,item)">
@click="goNav('/my/order/feedback?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
待评价
</u-button>
<u-button :custom-style="customStyle1" shape="circle" class="btns xianshi" :plain="true"
@ -587,7 +587,7 @@
tiqian(type){//提前结束 确认按钮
var that=this;
that.type = type;
if(that.earlyFinishReason){
uni.getLocation({
type: 'wgs84',
success: function (resa) {
@ -635,6 +635,13 @@
}
});
}else{
uni.showToast({
icon:'error',
title:'请输入提前结束原因！'
})
}
},
toggle(type,item) {//提前结束 弹出框
this.tiqianData=item;

2
pages/therapist/orderDetail.vue
View File

@ -49,7 +49,7 @@
<view class="oder-mian">
<view class="oder-mian-left">
<span>ID:{{order.artificerId}}</span>
<span>ID:{{order.invitationCode}}</span>
<span>·</span>
<span>{{order.collectCount}}人 关注</span>
</view>

4
pages/therapist/therapist.vue
View File

@ -1344,7 +1344,7 @@ import permision from "@/components/permission.js";
color: #13141A;
}
.keyuyue{
width: 160rpx;
// width: 160rpx;
height: 20px;
display: flex;
flex-direction: row;
@ -1352,7 +1352,7 @@ import permision from "@/components/permission.js";
background: linear-gradient(90deg, #fee9ca, #fde4c6);
border: 1px #decbae solid;
border-radius: 30rpx 30rpx 30rpx 2rpx;
padding: 3rpx 15rpx;
padding: 3rpx 18rpx;
color:#8d500f;
font-size: 22rpx;
margin-left: 15rpx;

16
pages/therapist/therapistDingdan.vue
View File

@ -10,9 +10,9 @@
<u-search class="flex-sub" placeholder="请输入技师名字" :focus="false" shape="square" v-model="artificerName"
:show-action="true" :animation="true" bg-color="#f5f5f5" color="#1A1A1A" @search="onSearch()"
action-text="搜索" @custom="onSearch()"></u-search>
<view class="flex align-center justify-between">
<!-- <view class="flex align-center justify-between">
<selectSwitchDitu @change="switch1Change" />
</view>
</view> -->
</view>
</view>
<view class="liebiao" v-show="current === 0">
@ -83,11 +83,11 @@
</view>
<view>
<view class="terap-button" v-if="item.status == 1" @click.stop="goOrder(item)">
立即预约
确认
</view>
<view class="text-center text-sm" @click.stop="showTips()" v-else
style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;">
立即预约
确认
</view>
</view>
</view>
@ -195,11 +195,11 @@
<view class="text-center make-now" v-if="getOrderByCurrentMarkerIndex().status == 1"
style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
@click.stop="goOrder(getOrderByCurrentMarkerIndex())">
立即预约
确认
</view>
<view class="text-center make-now1" @click.stop="showTips()" v-else
style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;">
立即预约
确认
</view>
@ -1381,7 +1381,7 @@
color: #13141A;
}
.keyuyue{
width: 160rpx;
// width: 160rpx;
height: 20px;
display: flex;
flex-direction: row;
@ -1389,7 +1389,7 @@
background: linear-gradient(90deg, #fee9ca, #fde4c6);
border: 1px #decbae solid;
border-radius: 30rpx 30rpx 30rpx 2rpx;
padding: 3rpx 15rpx;
padding: 3rpx 18rpx;
color:#8d500f;
font-size: 22rpx;
margin-left: 15rpx;