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-03 21:02:51 +08:00
parent d28d5ed41b
commit 47c981a528
10 changed files with 2242 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
my/address/address.vue
View File

@ -114,6 +114,10 @@
uni.reLaunch({
url:'/my/order/payModifyJsDetail'
})
}else if (this.isfa == 7) {//待补单
uni.reLaunch({
url:'/my/order/payModifyTcMyDaiB'
})
}
},

43
my/order/pay.vue
View File

@ -377,7 +377,18 @@
class="dingshi">联系客服</u-button>
</view>
<view class="showBtn" v-if="order.status ==10">
<u-button @click="TuiPopup(type,2,order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button>
<u-button :custom-style="customStyle2"
v-if="order.packageType=='104'||order.packageType=='105'||order.packageType=='106'"
shape="circle" :plain="true"
@click="taocanDaiBd('/my/order/payModifyTcMyDaiB?ordersId='+order.ordersId,order)"
class="dingshi">
立即预约
</u-button>
<u-button v-else :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
class="dingshi">
@ -649,6 +660,13 @@
// #endif
},
methods: {
taocanDaiBd(url,item){
this.$queue.setData('getJishi','');
this.$queue.setData('mainData',item);
uni.navigateTo({
url:url
})
},
getOrder() {
let data = {
ordersId: this.ordersId
@ -998,25 +1016,29 @@
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
this.$refs.popupQ.open(type)
},
TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮 关闭弹出框
this.type = typeTxte
TuiPopup(typeTxte,type,id){//确认拒单 全额退款.同意按钮 关闭弹出框
var that=this;
that.type = typeTxte
let data = {
ordersId: this.qurenJd.ordersId,
ordersId: that.qurenJd.ordersId?that.qurenJd.ordersId:id.ordersId,
isAuto: '0',
type: type
type: type,
}
this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
that.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
if (res.code == 0) {
uni.showToast({
title:'操作完成！'
})
this.getOrder()
this.$refs.popupQ.close(typeTxte);
that.getOrder()
that.$refs.popupQ.close(typeTxte);
uni.showToast({
title:'操作成功！'
})
}else{
this.getOrder()
that.getOrder()
uni.showToast({
icon:'error',
title:'操作失败！'
title:res.msg
})
}
@ -1412,6 +1434,7 @@
},
goNav(e,item) {
this.$queue.setData('xiangmu',item);
this.$queue.setData('getJishi','');
uni.navigateTo({
url: e
})
@ -1830,7 +1853,7 @@
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
justify-content: center;
}
.hideBtn{
width: 100%;

2114
my/order/payModifyTcMyDaiB.vue Normal file
View File

File diff suppressed because it is too large Load Diff

2
my/order/payding.vue
View File

@ -7,7 +7,7 @@
<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
style="padding: 0 29rpx;">
<view class="head-top">
<view class="pay-title">服务项目1111</view>
<view class="pay-title">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.ordersMassageList[0].massageType.massageImg"

9
my/order/paydingTCX.vue
View File

@ -197,12 +197,13 @@
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
v-if="order.status != 3 &&
order.status != 4 &&
order.status != 5&&
order.status != 10"
order.status != 5
"
>取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1"
v-if="order.status == 1||order.status == 10"
class="dingshi">立即支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
@ -1268,7 +1269,7 @@
},
openpay(item) {
// uni.navigateTo({
// url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
// url:'/my/order/payModifyTcMy?ordersId='+item.ordersId
// })
this.showpay = true
},

30
my/wallet/index.vue
View File

@ -739,24 +739,24 @@
} else {
// #ifdef H5
let data = {
payClassifyId: this.thisSelect.payClassifyId,
payClassifyId: that.thisSelect.payClassifyId,
type: 2,
userId: uni.getStorageSync('userId'),
}
if(this.artificerId){
data.artificerId=this.artificerId
if(that.artificerId){
data.artificerId=that.artificerId
}
if(this.ordersId){
data.ordersId=this.ordersId
if(that.ordersId){
data.ordersId=that.ordersId
}
this.$Request.post('/app/aliPay/payOrderMoney', data).then(
that.$Request.post('/app/aliPay/payOrderMoney', data).then(
res => {
if (res.code == 0) {
uni.showToast({
title: '支付成功!'
});
this.getMoney()
that.getMoney()
// const div = document.createElement('div')
// div.innerHTML = res.data //此处form就是后台返回接收到的数据
// document.body.appendChild(div)
@ -776,20 +776,20 @@
// #ifdef APP-PLUS
// APP支付宝支付
let data = {
payClassifyId: this.thisSelect.payClassifyId,
payClassifyId: that.thisSelect.payClassifyId,
type: 1,
userId: uni.getStorageSync('userId')
}
if(this.artificerId){
data.artificerId=this.artificerId
if(that.artificerId){
data.artificerId=that.artificerId
}
if(this.ordersId){
data.ordersId=this.ordersId
if(that.ordersId){
data.ordersId=that.ordersId
}
this.$Request.post("/app/aliPay/payOrderMoney", data).then(ret => {
that.$Request.post("/app/aliPay/payOrderMoney", data).then(ret => {
console.log(ret)
this.getMoney()
this.isCheckPay(ret.code, 'alipay', ret.data);
that.getMoney()
that.isCheckPay(ret.code, 'alipay', ret.data);
});
// #endif
}

9
pages.json
View File

@ -522,6 +522,15 @@
"titleNView": false
}
}
},{
"path": "order/payModifyTcMyDaiB",
"style": {
"navigationBarTitleText": "待补单订单",
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false
}
}
},{
"path": "hongbao/xinrenhongbao",
"style": {

38
pages/my/serviceOderDrtail.vue
View File

@ -66,14 +66,14 @@
<span style="margin-right: 5px;">{{item.title}}</span>
<span>详情</span>
</view>
<view class="detail-view">
<view class="detail-view" style="position: relative;">
<image class="detail-view-img" :src="item.massageImg" mode=""></image>
<span class="img-span">{{item.status=='1'?'已使用':'未使用'}}</span>
<view class="detail-view-mina">
<view class="header-bottom-money" style="margin: 7px 0px;">
<view class="header-bottom-money-zhen">
<span>￥</span>
<span>{{item.price}}</span>
</view>
<view class="header-bottom-money-jia" style="margin-left: 5px; ">
￥{{item.oldPrice}}
@ -602,13 +602,20 @@
},
detail(item){
uni.navigateTo({
url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+
'&page='+1+
'&limit='+10+
'&name='+this.nameText
})
if(item.status=='1'){
uni.showToast({
title:'该项目已使用！'
})
}else{
uni.navigateTo({
url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+
'&page='+1+
'&limit='+10+
'&name='+this.nameText
})
}
},
getData(){
@ -648,6 +655,19 @@
}
</script>
<style scoped>
.img-span{
padding: 2px 5px;
font-weight: 400;
font-size: 8px;
color: #FFFFFF;
background: linear-gradient(-90deg, #FF6F48, #FF9E69);
border-radius: 7px 0px 7px 0px;
position: absolute;
bottom: 0px;
left: 0;
margin-bottom: 14px;
margin-left: 27px;
}
.detail-view-mina{
width: 74%;
display: flex;

39
pages/order/index.vue
View File

@ -212,7 +212,17 @@
</u-button>
</view>
<view class="showBtn" v-if="item.status ==10">
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
<u-button
:custom-style="customStyle" shape="circle" :plain="true"
class="btns xianshi"
@click="TuiPopup(type,2,item)">
取消订单
</u-button>
<u-button v-if="item.packageType=='104'||item.packageType=='105'||item.packageType=='106'" :custom-style="customStyle1" shape="circle" :plain="true"
@click="taocanDaiBd('/my/order/payModifyTcMy?ordersId='+item.ordersId,item)" class="btns xianshi">
立即预约
</u-button>
<u-button v-else :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns xianshi">
立即预约
</u-button>
@ -428,6 +438,11 @@
}
},
methods: {
taocanDaiBd(url,item,text){
uni.navigateTo({
url:url
})
},
goNav(url,item,text) {
this.$queue.setData('xiangmu',item);
console.log("oldOrdersId=======",item)
@ -448,10 +463,6 @@
uni.navigateTo({
url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
})
}else if(item.packageType=='104'||item.packageType=='105'||item.packageType=='106'){
uni.navigateTo({
url:'/my/order/paydingTCX?ordersId='+item.ordersId
})
}else{
uni.navigateTo({
url:url
@ -526,24 +537,25 @@
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
this.$refs.popupQ.open(type)
},
TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮 关闭弹出框
this.type = typeTxte
TuiPopup(typeTxte,type,id){//确认拒单 全额退款.同意按钮 关闭弹出框
var that=this;
that.type = typeTxte
let data = {
ordersId: this.qurenJd.ordersId,
ordersId: that.qurenJd.ordersId?that.qurenJd.ordersId:id.ordersId,
isAuto: '0',
type: type
}
this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
that.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
if (res.code == 0) {
uni.showToast({
title:'操作完成！'
})
this.getOrderList()
this.$refs.popupQ.close(typeTxte);
that.getOrderList()
that.$refs.popupQ.close(typeTxte);
}else{
uni.showToast({
icon:'error',
title:'操作失败！'
title:res.msg
})
}
@ -783,6 +795,9 @@
</script>
<style lang="scss" scoped>
.content{
padding-bottom: 100px;
}
.xianshi{
margin: 0px 5px 0px 0px !important;
}

5
pages/therapist/therapistDingdan.vue
View File

@ -511,6 +511,11 @@
uni.reLaunch({
url:'/my/order/payModifyTcMy?artificerId='+e.artificerId+'&text='+'my'
})
}else if(this.dataIndex=='待补单'){
this.$queue.setData('getJishi',e);
uni.reLaunch({
url:'/my/order/payModifyTcMyDaiB?artificerId='+e.artificerId+'&text='+'my'
})
}
},
switch1Change: function (e) {//地图和列表切换