diff --git a/api/health.js b/api/health.js
index 4353ab4..4800c35 100644
--- a/api/health.js
+++ b/api/health.js
@@ -12,6 +12,7 @@ function createServiceOrder(data){
+
module.exports={
getItems,
getServiceDetail,
diff --git a/healthyService/pages/visitDetail/visitDetail.js b/healthyService/pages/visitDetail/visitDetail.js
index b86ec01..f09a6c1 100644
--- a/healthyService/pages/visitDetail/visitDetail.js
+++ b/healthyService/pages/visitDetail/visitDetail.js
@@ -12,6 +12,8 @@ Page({
*/
data: {
follow_package_item_id:'',
+ message:'',
+ showWarn:false,
img_host:app.hostConfig().imghost,
doctor_id:'',
currentData:0,
@@ -76,7 +78,9 @@ Page({
})
},
-
+ goHasOrder(){
+
+},
addPatient() {
this.setData({
showAdd: true,
@@ -261,6 +265,10 @@ Page({
url:'/healthyService/pages/writeSick/writeSick?doctor_id='+doctor_id+"&family_id="+currentFamilyId+"&chat_id="+chat_id+"&inquiry_type="+inquiry_type+"&sex="+sex+"&inquiry_mode="+inquiry_mode+"&package_id="+follow_package_item_id
})
}else if(res.status==2){
+ this.setData({
+ showWarn:true,
+ message:res.message
+ })
}else if(res.status==3){
app.method.navigateTo({
diff --git a/healthyService/pages/visitDetail/visitDetail.json b/healthyService/pages/visitDetail/visitDetail.json
index c931201..141ca68 100644
--- a/healthyService/pages/visitDetail/visitDetail.json
+++ b/healthyService/pages/visitDetail/visitDetail.json
@@ -2,7 +2,8 @@
"usingComponents": {
"nav":"../../../components/nav/nav",
"van-popup": "@vant/weapp/popup/index",
- "van-picker": "@vant/weapp/picker/index"
+ "van-picker": "@vant/weapp/picker/index",
+ "van-dialog": "@vant/weapp/dialog/index"
},
"navigationStyle":"custom"
}
\ No newline at end of file
diff --git a/healthyService/pages/visitDetail/visitDetail.wxml b/healthyService/pages/visitDetail/visitDetail.wxml
index af0aa46..ba10a95 100644
--- a/healthyService/pages/visitDetail/visitDetail.wxml
+++ b/healthyService/pages/visitDetail/visitDetail.wxml
@@ -156,4 +156,18 @@
确定
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/healthyService/pages/writeSick/writeSick.js b/healthyService/pages/writeSick/writeSick.js
index ed2e103..0681775 100644
--- a/healthyService/pages/writeSick/writeSick.js
+++ b/healthyService/pages/writeSick/writeSick.js
@@ -522,8 +522,7 @@ Page({
follow_package_item_id:follow_package_item_id
}).then((data) => {
let {
- inquiry_no,
- order_inquiry_id
+ order_no
} = data.data;
let {
chat_id,
@@ -534,8 +533,9 @@ Page({
lockBtn: false
});
if(data.status==1){
+ let order_type=inquiry_mode==8?5:4
app.method.navigateTo({
- url: '/patient/pages/payOrder/payOrder?doctor_id=' + doctor_id + '&inquiry_no=' + inquiry_no + "&chat_id=" + chat_id + "&inquiry_type=" + inquiry_type + "&inquiry_mode=" + inquiry_mode + "&order_inquiry_id=" + order_inquiry_id + "&fromType=chat"
+ url: '/patient/pages/payOrder/payOrder?doctor_id=' + doctor_id + '&inquiry_no=' + order_no + "&chat_id=" + chat_id + "&inquiry_type=" + inquiry_type + "&inquiry_mode=" + inquiry_mode + "&fromType=chat&&order_type="+order_type
})
}else if(data.status==2){
this.setData({
diff --git a/patient/pages/payOrder/payOrder.js b/patient/pages/payOrder/payOrder.js
index cab525d..4555eaa 100644
--- a/patient/pages/payOrder/payOrder.js
+++ b/patient/pages/payOrder/payOrder.js
@@ -230,11 +230,15 @@ Page({
url = '/patient/pages/payPlatform/payPlatform?order_no=' + order_no + "&order_type=2" + "&order_prescription_id=" + order_prescription_id + "&order_product_id=" + order_product_id + "&fromType=" + fromType;
}else if(order_type == 3){//糖组检测
url = '/patient/pages/payPlatform/payPlatform?order_no=' + order_no + "&order_type=3" + "&order_detection_id=" + order_detection_id+ "&fromType=" + fromType;
+ }else if(order_type == 4){//随访包
+ url = '/patient/pages/payPlatform/payPlatform?order_no=' + order_no + "&order_type=4&chat_id=" + chat_id + "&doctor_id" + doctor_id + "&inquiry_type=" + inquiry_type + "&inquiry_mode=" + inquiry_mode + "&fromType=" + fromType;
+ }else if(order_type == 5){//健康包
+ url = '/patient/pages/payPlatform/payPlatform?order_no=' + order_no + "&order_type=5&chat_id=" + chat_id + "&doctor_id" + doctor_id + "&inquiry_type=" + inquiry_type + "&inquiry_mode=" + inquiry_mode + "&fromType=" + fromType;
}else {
if (chat_id) {
url = '/patient/pages/payPlatform/payPlatform?order_no=' + order_no + "&order_type=1&chat_id=" + chat_id + "&doctor_id" + doctor_id + "&inquiry_type=" + inquiry_type + "&inquiry_mode" + inquiry_mode + "&order_inquiry_id=" + order_inquiry_id + "&fromType=" + fromType;
} else {
- url = '/patient/pages/payPlatform/payPlatform?order_no=' + order_no + "&order_type=1&inquiry_type=" + inquiry_type + "&inquiry_mode" + inquiry_mode + "&order_inquiry_id=" + order_inquiry_id + "&fromType=" + fromType;
+ url = '/patient/pages/payPlatform/payPlatform?order_no=' + order_no + "&order_type=1&inquiry_type=" + inquiry_type + "&inquiry_mode=" + inquiry_mode + "&order_inquiry_id=" + order_inquiry_id + "&fromType=" + fromType;
}
}
app.method.navigateTo({
@@ -588,12 +592,14 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ console.log(options)
//fromType list跳问诊订单列表页,处方过来的是链接,跳链接页 ,chat是问诊过来
if (options.fromType) {
this.setData({
fromType: options.fromType
})
};
+
//处方订单
if (options.order_type == 2) {
let order_prescription_id = options.order_prescription_id;
@@ -614,6 +620,24 @@ Page({
order_detection_id
})
+ }else if(options.order_type==4){//随访包订单
+ this.setData({
+ order_type: 4,
+ doctor_id: options.doctor_id,
+ inquiry_type:options.inquiry_type,
+ order_no: options.inquiry_no,
+ chat_id: options.chat_id,
+ inquiry_mode: options.inquiry_mode
+ })
+ }else if(options.order_type==5){//健康包订单
+ this.setData({
+ order_type:5,
+ doctor_id: options.doctor_id,
+ inquiry_type:options.inquiry_type,
+ order_no: options.inquiry_no,
+ chat_id: options.chat_id,
+ inquiry_mode: options.inquiry_mode
+ })
}else {
//问诊相关
this.setData({
@@ -626,7 +650,7 @@ Page({
})
}
-
+ console.log(options.inquiry_mode)
},
/**
* 生命周期函数--监听页面初次渲染完成
diff --git a/patient/pages/payOrder/payOrder.wxml b/patient/pages/payOrder/payOrder.wxml
index 916a941..bdea768 100644
--- a/patient/pages/payOrder/payOrder.wxml
+++ b/patient/pages/payOrder/payOrder.wxml
@@ -24,7 +24,8 @@
问诊购药
药品金额
糖组检测
-
+ 随访包服务
+ 健康包服务
¥{{amount_total}}
diff --git a/patient/pages/payPlatform/payPlatform.js b/patient/pages/payPlatform/payPlatform.js
index ced014e..f07f296 100644
--- a/patient/pages/payPlatform/payPlatform.js
+++ b/patient/pages/payPlatform/payPlatform.js
@@ -269,6 +269,24 @@ Page({
order_detection_id
})
+ }else if(options.order_type==4){//随访包订单
+ this.setData({
+ order_type: 4,
+ doctor_id: options.doctor_id,
+ inquiry_type:options.inquiry_type,
+ order_no: options.order_no,
+ chat_id: options.chat_id,
+ inquiry_mode: options.inquiry_mode
+ })
+ }else if(options.order_type==5){//健康包订单
+ this.setData({
+ order_type:5,
+ doctor_id: options.doctor_id,
+ inquiry_type:options.inquiry_type,
+ order_no: options.order_no,
+ chat_id: options.chat_id,
+ inquiry_mode: options.inquiry_mode
+ })
}else {
//问诊相关
this.setData({