diff --git a/api/medicine/index.js b/api/medicine/index.js new file mode 100644 index 0000000..56ea00c --- /dev/null +++ b/api/medicine/index.js @@ -0,0 +1,17 @@ +import request from "../request.js" + +//健康咨询 +export function selectDepartment() { + return request({ + url: `/nurseApp/healthConsultation/selectDepartment`, + method: 'GET' + }) +} + +//人员 +export function selectHospitalPerson(departmentId) { + return request({ + url: `/nurseApp/healthConsultation/selectHospitalPerson?departmentId=${departmentId}`, + method: 'GET' + }) +} \ No newline at end of file diff --git a/pages.json b/pages.json index c5106fe..a3cd1b9 100644 --- a/pages.json +++ b/pages.json @@ -17,21 +17,30 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } - }, { - "path": "pages/orderDetails/orderDetails", + },{ + "path": "pages/medicine/medicine", "style": { - "navigationBarTitleText": "订单详情", + "navigationBarTitleText": "健康咨询", + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", - "enablePullDownRefresh": false + "disableScroll": true } - }, { + },{ "path": "pages/integral/integral", "style": { "navigationBarTitleText": "积分", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - }, { + },{ + "path" : "pages/Informationconfirmation/Informationconfirmation", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarTitleText": "预约时间" + } + },{ "path": "pages/information/information", "style": { "navigationBarTitleText": "完善个人信息", @@ -146,6 +155,14 @@ "enablePullDownRefresh": true //设置参数为true } }, + { + "path": "pages/orderDetails/orderDetails", + "style": { + "navigationBarTitleText": "订单详情", + "navigationBarBackgroundColor": "#ffffff", + "enablePullDownRefresh": false + } + }, { "path": "pages/payorderDetails/payorderDetails", "style": { @@ -177,7 +194,6 @@ "navigationBarBackgroundColor": "#ffffff", //背景颜色 "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true - } }, { @@ -237,7 +253,6 @@ "navigationBarTextStyle": "white" } }, - { "path": "pages/disease/disease", "style": { @@ -282,14 +297,6 @@ "enablePullDownRefresh": true //设置参数为true } }, - { - "path": "pages/medicine/medicine", - "style": { - "navigationBarTitleText": "健康咨询", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { "path": "pages/diseasemanagement/diseasemanagement", "style": { @@ -355,13 +362,12 @@ } ,{ "path" : "pages/Healthrecords/Healthrecords", - "style" : + "style" : { "navigationBarTitleText": "健康档案", "navigationBarBackgroundColor": "#ffffff", "enablePullDownRefresh": false } - } ], "globalStyle": { diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index fe8794e..2befc57 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -672,7 +672,7 @@ this.updata.img = this.goodDetailsLists[0].attributePitureUrl this.updata.goodsAttributeName = this.goodDetailsLists[0].attributeDetailsName this.updata.goodsPrice = this.goodDetailsLists[0].goodsPrice - this.totalPrice = (this.goodDetailsLists.goodsPrice * this.updata.goodsCount) + this.totalPrice = (this.goodDetailsLists[0].goodsPrice * this.updata.goodsCount) .toFixed(2) this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2) this.updata.attributeDetailsId = this.goodDetailsLists[0].attributeDetailsId @@ -700,7 +700,6 @@ this.updata.goodsAttributeName = list.attributeDetailsName this.updata.goodsPrice = list.goodsPrice this.totalPrice = (list.goodsPrice * this.updata.goodsCount).toFixed(2) - console.log(list) this.goodsDetailslist.couponList.forEach(e => { if (this.totalPrice >= e.couponConsumePrice) { this.couponListtrue.push(e) diff --git a/pages/Informationconfirmation/Informationconfirmation.vue b/pages/Informationconfirmation/Informationconfirmation.vue new file mode 100644 index 0000000..6953b1e --- /dev/null +++ b/pages/Informationconfirmation/Informationconfirmation.vue @@ -0,0 +1,311 @@ + + + diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue index bd2a0a2..83dad46 100644 --- a/pages/ProjectDetails/ProjectDetails.vue +++ b/pages/ProjectDetails/ProjectDetails.vue @@ -1,25 +1,20 @@ diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss index 01ab04a..07e2a5f 100644 --- a/pages/nursestation/nursestation.scss +++ b/pages/nursestation/nursestation.scss @@ -1,5 +1,5 @@ .app{ - padding: 0; + padding:0 0 0 0; -webkit-overflow-scrolling: touch; } .swiper-box { @@ -116,15 +116,6 @@ // top:35%; // left:35%; // } - .advanceAppointDuration{ - position: absolute; - top:10%; - right:10rpx; - width: 20%; - text-align: right; - font-size: 32rpx; - color: #666; - } .appointment { font-size: 30rpx; width: 120rpx; @@ -162,7 +153,6 @@ top:53%; left:35%; width: 65%; - color: #666; } .huanyao { position: absolute; diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index a89fa75..5877cab 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -1,25 +1,20 @@