diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue
index 63d3948..44cfd26 100644
--- a/my/hongbao/youhuijuanList.vue
+++ b/my/hongbao/youhuijuanList.vue
@@ -9,7 +9,7 @@
-->
确定
-
+
{{item.money}}
@@ -71,11 +71,13 @@
contentnomore: '没有更多数据了'
},
couponId:'',
- content:''
+ content:'',
+ priceDd:''
}
},
onLoad(e) {
if(e){
+ this.priceDd=e.price
this.content=e.text
}
this.getMyList();
diff --git a/my/order/pay.vue b/my/order/pay.vue
index ff21ea3..5927523 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -266,7 +266,7 @@
立即预约
@@ -1145,7 +1145,7 @@
});
},
goNav(e,item) {
- this.$queue.setData('daibudan',item);
+ this.$queue.setData('xiangmu',item);
uni.navigateTo({
url: e
})
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 7f921c2..9c24d9b 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -421,7 +421,7 @@
},
youhuijuan(){
uni.navigateTo({
- url:'/my/hongbao/youhuijuanList'
+ url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price
})
},
openpay() {//验证
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index a8c4f19..04511db 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -22,16 +22,17 @@
{{orderXm.ordersMassageList[0].massageType.duration}}分钟
- x{{orderXm.massageNum}}
+
￥
{{orderXm.price}}
+
-
+
@@ -92,7 +93,7 @@
-
+
理疗师
{{jishiName.technicianTypeName}}
@@ -325,7 +326,7 @@
}
this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
this.number=this.orderXm.massageNum
- console.log("this.orderXm====>",this.orderXm)
+ console.log('this.orderXm',this.orderXm.technicianType)
this.youhui()
// this.getOrder()
// couponMoney
@@ -482,13 +483,15 @@
});
},
- liliaoshi(){
+ liliaoshi(item){
+ var that=this
+ // console.log("item",item)
uni.setStorage({
key: 'taocanDd',
- data: '支付',
+ data: '订单支付',
success: function () {
uni.navigateTo({
- url: '/pages/therapist/therapistDingdan'
+ url: '/pages/therapist/therapistDingdan?technicianType='+that.orderXm.technicianType
})
}
});
@@ -657,7 +660,7 @@
serveTime:that.startTime,
userName:that.name,
userId: uni.getStorageSync('userId'),
- remarks:that.textareaData,
+ remark:that.textareaData,
classifyId:that.orderXm.classifyId,
couponId: that.couponId==''?that.huixian.join(','):that.couponId,
longitude:that.longitude,
diff --git a/my/order/payding.vue b/my/order/payding.vue
index c0485fe..12f54a0 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -36,14 +36,14 @@
{{order.ordersMassageList[0].massageType.duration}}分钟
- x{{order.massageNum}}
￥
- {{order.massagePrice}}
+ {{order.massagePrice}}
+ x{{order.massageNum}}
diff --git a/my/order/paydingDd.vue b/my/order/paydingDd.vue
index c0485fe..b691bcf 100644
--- a/my/order/paydingDd.vue
+++ b/my/order/paydingDd.vue
@@ -36,7 +36,6 @@
{{order.ordersMassageList[0].massageType.duration}}分钟
- x{{order.massageNum}}
@@ -44,6 +43,10 @@
￥
{{order.massagePrice}}
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bf9cd62..04d2ab5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,9 +4,7 @@
盛安到家
- --{{latitude}}--
- --{{longitude}}--
- --{{cuowu}}--
+
实名认证
diff --git a/pages/order/index.vue b/pages/order/index.vue
index c46c45e..6800c56 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -76,7 +76,7 @@
拒单详情
+ @click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns">
去支付
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 3883fec..1072934 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -339,16 +339,16 @@
socketConnect: null,
pointMap: {}, //点map
pointThread: null,
- massageTypeId: null,
currentMarkerIndex: -1,
showPopup: false,
- dataIndex:''
+ dataIndex:'',
+ technicianType:''
}
},
onLoad(e) {
let that = this
- that.massageTypeId = e.massageTypeId
+ that.technicianType=e.technicianType
// that.getLocation();//低精度，快就完事了
// that.getLocation(true);//高精度，慢慢查询
uni.getStorage({
@@ -499,6 +499,11 @@
uni.reLaunch({
url:'/my/wallet/index?artificerId='+e.artificerId+'&text='+'my'
})
+ }else if(this.dataIndex=='订单支付'){
+ this.$queue.setData('getJishi',e);
+ uni.reLaunch({
+ url:'/my/order/payModifyDd?artificerId='+e.artificerId+'&text='+'my'
+ })
}
},
switch1Change: function (e) {//地图和列表切换
@@ -795,7 +800,8 @@
by: index, //价格
latitude: this.latitude,
longitude: this.longitude,
- city: this.city
+ city: this.city,
+ technicianType:this.technicianType
}
// console.log(data)
this.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
@@ -1486,7 +1492,7 @@
/* padding: 10px; */
display: flex;
flex-direction: column;
- justify-content: space-between;
+ // justify-content: space-between;
align-items: baseline;
}
.list-view{