From 548fe4a47b329b8a6d007b35f1825706dd074c6b Mon Sep 17 00:00:00 2001 From: renjianbo0118 <18133922183> Date: Sun, 14 May 2023 00:33:17 +0800 Subject: [PATCH] AA --- pages/index/index.js | 47 ++++++++++++++++++++----- pages/index/index.wxml | 2 +- pages/peizhen/peizhen.js | 60 ++++++++++++++++++++------------ pages/peizhen/peizhen.wxml | 58 ++++-------------------------- pages/peizhen/peizhendetail.js | 29 ++++++++++----- pages/peizhen/peizhendetail.wxml | 6 ++-- 6 files changed, 107 insertions(+), 95 deletions(-) diff --git a/pages/index/index.js b/pages/index/index.js index 12885ea..c2d0fa4 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -13,20 +13,40 @@ Page({ itemView: [ { icon: "诊前约号", - title: "诊前约号" + title: "全程陪诊", + price:"200", + describe:"服务内容：排队 预约 挂号 缴费 取药 记录医嘱" }, { - icon: "代办买药", - title: "代办买药" + icon: "诊前约号", + title: "诊前约号", + price:"20", + describe:"服务内容：协助办理完成挂号" + }, + // { + // icon: "代办买药", + // title: "代办买药", + // price:"30", + // describe:"服务内容：协助代理买药" + // }, + { + icon: "取送结果", + title: "代办问诊", + price:"50", + describe:"服务内容：使用病人或者家属取检查报告化验单向医生问明情况" }, { icon: "取送结果", - title: "取送结果" + title: "取送结果", + price:"50", + describe:"服务内容：包括给病人或者家属取检查报告化验单等" }, - { - icon: "出入院办理", - title: "出入院办理" - } + // { + // icon: "出入院办理", + // title: "出入院办理", + // price:"100", + // describe:"协助办理出入院手续" + // } ], hospitalData: [ { @@ -69,7 +89,16 @@ Page({ * 诊前约号、代办买药、取送结果、出入院办理、就医陪诊、园内护理 */ itemClick (options) { - console.log(options.currentTarget.dataset.id) + // console.log(options.currentTarget.dataset.id) + + let item = JSON.stringify(options.currentTarget.dataset.item); + // console.log("传递的item" + item); + console.log("传递的item" + item); + wx.navigateTo({ + // url: "/pages/peizhen/peizhendetail?servername=" + options.currentTarget.dataset.id, + url: "/pages/peizhen/peizhendetail?item=" + item, + + }); }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d8cf32d..6a73e25 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -14,7 +14,7 @@ - + diff --git a/pages/peizhen/peizhen.js b/pages/peizhen/peizhen.js index 706e55c..fe37ceb 100644 --- a/pages/peizhen/peizhen.js +++ b/pages/peizhen/peizhen.js @@ -23,28 +23,44 @@ Page({ version_number: '1.0', height: '', url: app.globalData.url, - ceshi: [{ - "hospitalId": null, - "userName": "admin", - "userId": 1, - "age": 24, - "address": "清华科技园一单元", - "city": "陕西省 咸阳市", - "experience": "18年", - "introduce": "刘德华 (Andy Lau)，1961年9月27日出生于中国香港新界大埔镇泰亨村[325]，毕业于第十期无线艺员训练班，中国香港男演员、歌手、制片人、作词人、中国残疾人福利基金会副理事长。", - "isMarry": "1", - "nickName": "蒲仁飞", - "sex": "汉", - "userType": "B", - "avatar": "http://118.25.179.82:8080/rlztest/2023-04-07/ebe08486-b96e-4a9e-bd17-11b868aeee00.jpg", - "phonenumber": "18792702166", - "name": "蒲仁飞", - "facePic": "http://118.25.179.82:8080/rlztest/2023-04-07/ebe08486-b96e-4a9e-bd17-11b868aeee00.jpg", - "frontIdentity": "http://118.25.179.82:8080/rlztest/2023-04-07/ddc4a4ac-4a8d-41c2-8177-9e53c9a2843e.jpg", - "backIdentity": "http://118.25.179.82:8080/rlztest/2023-04-07/7a6960e2-05fd-4899-a534-21fbc5032c4d.jpg", - "state": "1", - "identityNo": "612324169855241822" - }] + itemView: [ + { + icon: "诊前约号", + title: "全程陪诊", + price:"200", + describe:"服务内容：排队 预约 挂号 缴费 取药 记录医嘱" + }, + { + icon: "诊前约号", + title: "诊前约号", + price:"20", + describe:"服务内容：协助办理完成挂号" + }, + // { + // icon: "代办买药", + // title: "代办买药", + // price:"30", + // describe:"服务内容：协助代理买药" + // }, + { + icon: "取送结果", + title: "代办问诊", + price:"50", + describe:"服务内容：使用病人或者家属取检查报告化验单向医生问明情况" + }, + { + icon: "取送结果", + title: "取送结果", + price:"50", + describe:"服务内容：包括给病人或者家属取检查报告化验单等" + }, + // { + // icon: "出入院办理", + // title: "出入院办理", + // price:"100", + // describe:"协助办理出入院手续" + // } + ], }, onChange(e) { this.setData({ diff --git a/pages/peizhen/peizhen.wxml b/pages/peizhen/peizhen.wxml index f0604bf..f7935ff 100644 --- a/pages/peizhen/peizhen.wxml +++ b/pages/peizhen/peizhen.wxml @@ -20,9 +20,9 @@ - + - + @@ -30,14 +30,14 @@ - {{"全程陪诊"}} - （{{"陪护员"}}） + {{item.title}} + {{"男"}} {{"女"}} - {{200}}元 + {{item.price}}元 - {{"排队 预约 挂号 缴费 取药 记录医嘱等"}} + {{item.describe}} @@ -45,52 +45,6 @@ - - - - - - - - - {{"诊前预约"}} - （{{"陪护员"}}） - {{"男"}} - {{"女"}} - {{20}}元 - - - {{"协助办理完成挂号"}} - - - - - - - - - - - - - - - - - {{"送取结果"}} - （{{"陪护员"}}） - {{"男"}} - {{"女"}} - {{50}}元 - - - {{"包括给病人或者家属取检查报告化验单等"}} - - - - - - diff --git a/pages/peizhen/peizhendetail.js b/pages/peizhen/peizhendetail.js index d4cc836..6065ee3 100644 --- a/pages/peizhen/peizhendetail.js +++ b/pages/peizhen/peizhendetail.js @@ -45,7 +45,7 @@ Page({ clock: '', address: '', danjia: 0.01,//单位为元 - beizhu: '', + beizhu: '' }, @@ -127,14 +127,17 @@ Page({ wx.request({ url: app.globalData.url + '/system/order/insertOrderPz', data: { - startTime: this.data.seckill_start, - bId: this.data.item.userId, - yuguMoney: this.data.paymoney, - price: this.data.danjia,// - priceType: "1",//1是按天 + bId: "",//陪护人员id + cId: wx.getStorageSync('uid'),//患者id + yuguMoney: "1",//金额 + yuliu9: "2",//订单大类1-陪护 2-陪诊 + yuliu10: "1",//订单类型1-全程陪诊，2-诊前约号3-送取报告4-待办问诊 hospitalId: this.data.item.hospitalId, - cId: wx.getStorageSync('uid'), - remark: this.data.beizhu, + startTime: this.data.seckill_start, + yuliu11:"18691577328",//患者电话 + yuliu12:"无",//特殊要求 + yuliu13:"东泰城市之光",//送达地址 + yuliu14:"610526198701180018"//患者身份证号 }, method: 'POST', header: { @@ -221,11 +224,21 @@ Page({ statusBarHeight: statusBarHeight, height: 46 + statusBarHeight, }); + // var that = this; + // this.setData({ + // servername: e.servername + // }) + // console.log('servername==' + this.data.servername) + + var that = this; let item = JSON.parse(e.item); that.setData({ item: item }); + console.log("进入订单详情的title==" + that.data.item.title) + + }, /** * 拨打电话 diff --git a/pages/peizhen/peizhendetail.wxml b/pages/peizhen/peizhendetail.wxml index 9509720..9ff6d11 100644 --- a/pages/peizhen/peizhendetail.wxml +++ b/pages/peizhen/peizhendetail.wxml @@ -10,14 +10,14 @@ - {{"全程陪诊"}} + {{item.title}} {{"男"}} {{"女"}} - {{"200"}}元 + {{item.price}}元 - {{"排队 预约 挂号 缴费 取药 记录医嘱等"}} + {{item.describe}}