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-30 09:49:59 +08:00
parent 66eb03315f
commit e00f688ee8
9 changed files with 2613 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
my/hongbao/youhuijuanList.vue
View File

@ -72,7 +72,7 @@
},
couponId:'',
content:'',
priceDd:''
priceDd:'',
}
},
onLoad(e) {
@ -85,14 +85,18 @@
methods: {
queding(){
this.$queue.setData('youhui',this.couponId);
if(this.content){//返回推荐套餐订单
if(this.content=='套餐'){//返回推荐套餐订单
uni.navigateTo({
url:'/my/order/payModifyTc'
})
}else{
}else if(this.content=='支付'){
uni.navigateTo({//返回项目订单
url:'/my/order/payModify'
})
}else if(this.content=='修改'){
uni.navigateTo({//返回项目订单
url:'/my/order/payModifyDzhifu'
})
}
},

12
my/order/pay.vue
View File

@ -205,8 +205,11 @@
</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;">{{order.sumMoney}}</text></view>
<view class="" style="color: #333;">￥
<text style="font-size: 35rpx;font-weight: bold;">
{{order.oldMassageMoney==null?order.payMoney:(order.payMoney+order.oldMassageMoney)}}
</text>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
@ -279,7 +282,8 @@
<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 != '否'">取消订单
v-if="order.status != 3 && order.status != 4 && order.status != 5">
取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1"
@ -305,7 +309,7 @@
</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)"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="dingshi">
修改订单
</u-button>

5
my/order/payModify.vue
View File

@ -331,6 +331,7 @@
this.youhuiF(this.couponId)
}
this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
console.log("this.orderXm",this.orderXm)
this.ordersId = this.$queue.getData('ordersId');
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
@ -425,7 +426,7 @@
},
youhuijuan(){
uni.navigateTo({
url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price
url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'支付'
})
},
openpay() {//验证
@ -1323,7 +1324,7 @@
}
})
},
}
}
}
</script>

860
my/order/payModifyDzhifu.vue
View File

File diff suppressed because it is too large Load Diff

2012
my/order/paydingXiuGai.vue Normal file
View File

File diff suppressed because it is too large Load Diff

11
my/wallet/index.vue
View File

@ -339,7 +339,8 @@
nameTxt:'',
couponId:'',
artificerId:'',
artificerIdMy:false
artificerIdMy:false,
ordersId:''
}
},
onLoad(d) {
@ -364,7 +365,8 @@
this.txMsg = this.$queue.getData('txMsg');
this.avatar = uni.getStorageSync('avatar')
this.renzheng = uni.getStorageSync("renzheng")
this.nameTxt=d.text
this.nameTxt=d.text;
this.ordersId=d.ordersId
this.getMoneyList();
// #ifndef MP-WEIXIN
this.openLists = [{
@ -596,7 +598,8 @@
let data = {
payClassifyId: this.thisSelect.payClassifyId,
type: 1,
userId: uni.getStorageSync('userId')
userId: uni.getStorageSync('userId'),
ordersId:this.ordersId
}
this.$Request.post("/app/wxPay/payMoney", data).then(ret => {
console.log(ret)
@ -691,9 +694,11 @@
payClassifyId: this.thisSelect.payClassifyId,
type: 2,
userId: uni.getStorageSync('userId'),
ordersId:this.ordersId
}
if(this.artificerId){
data.artificerId=this.artificerId
}
this.$Request.post('/app/aliPay/payOrderMoney', data).then(

10
pages.json
View File

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

47
pages/order/index.vue
View File

@ -80,7 +80,7 @@
去支付
</u-button>
<u-button v-if="item.btnShow == 'true'&&item.status==2||item.status==6||item.status==7||item.status==8||item.status == 9&&!item.refusalContent" :custom-style="customStyle1" 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>
@ -103,14 +103,14 @@
</view>
<view class="hideBtn" v-show="btnShow==index" style="justify-content: end;">
<u-button
v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
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)">
@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"
@ -315,27 +315,34 @@
methods: {
goNav(url,item,text) {
this.$queue.setData('xiangmu',item);
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{
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({
url:url
})
}
}
},
gengBtn(index){//更多按钮
this.btnShow=index

5
pages/therapist/therapistDingdan.vue
View File

@ -504,6 +504,11 @@
uni.reLaunch({
url:'/my/order/payModifyDd?artificerId='+e.artificerId+'&text='+'my'
})
}else if(this.dataIndex=='修改'){
this.$queue.setData('getJishi',e);
uni.reLaunch({
url:'/my/order/payModifyDzhifu?artificerId='+e.artificerId+'&text='+'my'
})
}
},
switch1Change: function (e) {//地图和列表切换