diff --git a/pages/index/index.js b/pages/index/index.js
index 96183e6..a365f80 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -17,13 +17,15 @@ Page({
icon: "全程陪诊",
title: "全程陪诊",
price:"200",
- describe:"服务内容：排队 预约 挂号 缴费 取药 记录医嘱"
+ describe:"服务内容：排队 预约 挂号 缴费 取药 记录医嘱",
+ ordertype:"1"
},
{
icon: "诊前约号",
title: "诊前约号",
price:"20",
- describe:"服务内容：协助办理完成挂号"
+ describe:"服务内容：协助办理完成挂号",
+ ordertype:"2"
},
// {
// icon: "代办买药",
@@ -35,13 +37,15 @@ Page({
icon: "代办问诊",
title: "代办问诊",
price:"100",
- describe:"服务内容：使用病人或者家属取检查报告化验单向医生问明情况"
+ describe:"服务内容：使用病人或者家属取检查报告化验单向医生问明情况",
+ ordertype:"4"
},
{
icon: "取送结果",
title: "取送结果",
price:"50",
- describe:"服务内容：包括给病人或者家属取检查报告化验单等"
+ describe:"服务内容：包括给病人或者家属取检查报告化验单等",
+ ordertype:"3"
},
// {
// icon: "出入院办理",
@@ -104,7 +108,7 @@ Page({
go_peihu(){
wx.navigateTo({
- url: '/pages/peihu/peihu',
+ url: '/pages/peihu/peihu?' + "hospitalId=" + "",
})
},
//获取医院列表
@@ -140,10 +144,11 @@ Page({
* 医院列表
*/
listItemTap(options){
- console.log(options),
+ console.log(options.currentTarget.dataset.id),
wx.navigateTo({
- url: '/pages/peihu/peihu',
+ url: '/pages/peihu/peihu?' + "hospitalId=" + options.currentTarget.dataset.id,
})
+
},
/**
diff --git a/pages/peihu/peihu.js b/pages/peihu/peihu.js
index 456c958..768963f 100644
--- a/pages/peihu/peihu.js
+++ b/pages/peihu/peihu.js
@@ -3,32 +3,38 @@ var app = getApp();
Page({
data: {
option1: [{
- text: '全部医院',
+ text: '切换医院',
value: 0
},
{
- text: '西京医院',
+ text: '西安市高新医院',
value: 1
},
{
- text: '陕西省人民医院',
+ text: '第四军医大学西京医院',
value: 2
},
{
- text: '陕西省人民医院1',
- value: 5
+ text: '陕西省人民医院',
+ value: 3
},
],
value1: 0,
version_number: '1.0',
height: '',
url: app.globalData.url,
+ hospitalId:''
},
- onChange(e) {
- this.setData({
- timeData: e.detail,
- });
+
+ shuChange: function (e) {
+ console.log(e.detail);
+
+ this.setData({
+ hospitalId: e.detail
+ })
+ this.getBannerAndCat();
},
+
//生命周期回调——监听小程序启动或切前台。
onShow: function () {
this.getBannerAndCat();
@@ -41,7 +47,7 @@ Page({
header: app.getRequestHeader(),
method: 'GET',
data: {
-
+ hospitalId:this.data.hospitalId
},
success: (res) => {
var resp = res.data;
@@ -67,12 +73,16 @@ Page({
back(e){
wx.navigateBack()
},
- onLoad() {
+ onLoad: function (e) {
var statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
this.setData({
statusBarHeight: statusBarHeight,
height: 46 + statusBarHeight,
});
+ console.log('e.hospitalId' + e.hospitalId);
+ this.setData({
+ hospitalId: e.hospitalId
+ })
},
changeDateTime1(e) {
this.setData({
diff --git a/pages/peihu/peihu.wxml b/pages/peihu/peihu.wxml
index 6366db8..558af66 100644
--- a/pages/peihu/peihu.wxml
+++ b/pages/peihu/peihu.wxml
@@ -1,49 +1,47 @@
-
-
+
-
- {{"服务列表"}}
+
+ {{"服务列表"}}
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
- {{item.nickName}}
- （{{"陪护员"}}）
- {{"男"}}
- {{"女"}}
- {{item.experience}}经验
-
-
- {{item.introduce}}
-
-
-
+
+
+
+
+
+
+
+ {{item.nickName}}
+ （{{"陪护员"}}）
+ {{"男"}}
+ {{"女"}}
+ {{item.experience}}经验
+
+ {{item.introduce}}
+
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/pages/peizhen/peizhendetail.js b/pages/peizhen/peizhendetail.js
index 6ace8e4..38e954b 100644
--- a/pages/peizhen/peizhendetail.js
+++ b/pages/peizhen/peizhendetail.js
@@ -13,16 +13,16 @@ Page({
value: 10
},
{
- text: '西京医院',
- value: 11
+ text: '第四军医大学西京医院',
+ value: 2
},
{
text: '陕西省人民医院',
- value: 12
+ value: 3
},
{
- text: '红会医院',
- value: 13
+ text: '西安市高新医院',
+ value: 1
},
],
objectIndex: 0, //默认显示位置
@@ -134,14 +134,14 @@ Page({
var that = this;
wx.request({
- url: app.globalData.url + '/system/order/insertOrderPz',
+ url: app.globalData.url + '/system/order/insertOrderPzz',
data: {
bId: "1", //陪护人员id
cId: wx.getStorageSync('uid'), //患者id
yuguMoney: "1", //金额
yuliu9: "2", //订单大类1-陪护 2-陪诊
- yuliu10: "1", //订单类型1-全程陪诊，2-诊前约号3-送取报告4-待办问诊
- hospitalId: this.data.item.hospitalId,
+ yuliu10: this.data.item.ordertype, //订单类型1-全程陪诊，2-诊前约号3-送取报告4-待办问诊
+ hospitalId: this.data.objectArray[this.data.objectIndex].value,
startTime: this.data.seckill_start,
yuliu11: "18691577328", //患者电话
yuliu12: "无", //特殊要求
@@ -163,6 +163,8 @@ Page({
wx.navigateTo({
url: '/shopping/pages/paysuccess/paysuccess?' + "order_id=" + that.data.order_id,
});
+
+
// console.log('timeStamp==' + res.data.data.timeStamp)
// console.log('nonceStr==' + res.data.data.nonceStr)
// console.log('package==' + res.data.data.package)
diff --git a/pages/peizhen/peizhendetail.wxml b/pages/peizhen/peizhendetail.wxml
index ac8a09d..2bb1145 100644
--- a/pages/peizhen/peizhendetail.wxml
+++ b/pages/peizhen/peizhendetail.wxml
@@ -14,7 +14,7 @@
{{"男"}}
{{"女"}}
- {{item.price}}元
+ {{item.price}}元/次
{{item.describe}}