diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js index b44bf9b..7b58685 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js @@ -565,9 +565,10 @@ copy(event){ goPay:throttle(function(){ let {order_service_id,order_service_no,order_service_type}=this.data.order; - let order_type=order_service_type==1?4:5; + let order_type=order_service_type==1?5:4; + let inquiry_mode=order_service_type==1?9:8; app.method.navigateTo({ - url: '/patient/pages/payOrder/payOrder?inquiry_no='+ order_service_no +"&order_service_id="+order_service_no+"&order_type="+order_type+"&fromType="+encodeURIComponent('healthyService/pages/healthyOrder/healthyOrder') + url: '/patient/pages/payOrder/payOrder?inquiry_no='+ order_service_no +"&order_service_id="+order_service_no+"&order_type="+order_type+"&fromType="+encodeURIComponent('healthyService/pages/healthyOrder/healthyOrder')+"&inquiry_mode="+inquiry_mode }) }), handelDelProduct(){ diff --git a/healthyService/pages/writeSick/writeSick.js b/healthyService/pages/writeSick/writeSick.js index 06418cb..2f72ee5 100644 --- a/healthyService/pages/writeSick/writeSick.js +++ b/healthyService/pages/writeSick/writeSick.js @@ -548,11 +548,11 @@ Page({ }).catch((error)=>{ - this.setData({ - showdialog:true, - messageTitle:error.message, - cancelBtn:true - }) + // this.setData({ + // showdialog:true, + // messageTitle:error.message, + // cancelBtn:true + // }) }) }, inputChange(e) { diff --git a/patient/pages/payOrder/payOrder.js b/patient/pages/payOrder/payOrder.js index 0085b2e..8c5987f 100644 --- a/patient/pages/payOrder/payOrder.js +++ b/patient/pages/payOrder/payOrder.js @@ -206,11 +206,15 @@ Page({ }, handleThrottle:throttle(function() { + console.log(this.data.isLock) if(!this.data.isLock){ + console.log(11111) + this.goPayPlatform(); + console.log(222222) this.setData({ isLock:true }); - this.goPayPlatform(); + } }), @@ -414,10 +418,15 @@ Page({ wx.redirectTo({ url: '/patient/pages/medinceOrderDetail/medinceOrderDetail?order_product_id='+data.order_id+ "&fromType=" +encodeURIComponent("patient/pages/medinceOrder/medinceOrder"), }) - }else{ + }else if(order_type==3){ wx.redirectTo({ url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id='+data.order_no+ "&fromType=" +encodeURIComponent("sugarCheck/checkOrder/checkOrder"), }) + }else if(order_type==4 || order_type==5){ + + wx.redirectTo({ + url:'/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+data.order_no+ "&fromType=" +encodeURIComponent("healthyService/pages/healthyOrder/healthyOrder"), + }) } }) @@ -441,7 +450,7 @@ Page({ success(res) { let item = res.subscriptionsSetting.itemSettings; //console.log(res.subscriptionsSetting) - if (order_type == 1) { //问诊异常提醒 长期订阅 + if (order_type == 1 || order_type == 4 || order_type == 5) { //问诊异常提醒 长期订阅 let tmplIds_longtime = ['UOMww1S30Oq7rErJrqO8wN6lNEVKRo2fgcXnb0tBwHI', '9v6dZhjg09CttLd3W9nEUV_-eshNc4BYYNy59jglvZE']; //问诊提醒长期订阅 if (!item || !item['UOMww1S30Oq7rErJrqO8wN6lNEVKRo2fgcXnb0tBwHI'] ||(item['UOMww1S30Oq7rErJrqO8wN6lNEVKRo2fgcXnb0tBwHI'] != "accept") && (item['9v6dZhjg09CttLd3W9nEUV_-eshNc4BYYNy59jglvZE'] != "accept") || !item['9v6dZhjg09CttLd3W9nEUV_-eshNc4BYYNy59jglvZE']) { THIS.subscription(tmplIds_longtime,callback) @@ -689,7 +698,7 @@ Page({ }) } - console.log(options.inquiry_mode) + console.log(options.inquiry_mode,options.order_type) }, /** * 生命周期函数--监听页面初次渲染完成 @@ -712,7 +721,9 @@ Page({ * 生命周期函数--监听页面隐藏 */ onHide() { - + this.setData({ + isLock:false + }); }, /** diff --git a/patient/pages/payOrder/payOrder.wxml b/patient/pages/payOrder/payOrder.wxml index bdea768..2e140db 100644 --- a/patient/pages/payOrder/payOrder.wxml +++ b/patient/pages/payOrder/payOrder.wxml @@ -27,6 +27,7 @@ 随访包服务 健康包服务 ¥{{amount_total}} + 邮费