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 f5eea06..dc5d149 100644 --- a/pages.json +++ b/pages.json @@ -9,6 +9,14 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + },{ + "path": "pages/medicine/medicine", + "style": { + "navigationBarTitleText": "健康咨询", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff", + "disableScroll": true + } },{ "path": "pages/integral/integral", "style": { @@ -21,9 +29,9 @@ "style" : { "navigationBarTitleText": "", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarTitleText": "预约时间" } - },{ "path": "pages/information/information", "style": { @@ -178,7 +186,6 @@ "navigationBarBackgroundColor": "#ffffff", //背景颜色 "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true - } }, { @@ -238,7 +245,6 @@ "navigationBarTextStyle": "white" } }, - { "path": "pages/disease/disease", "style": { @@ -283,14 +289,6 @@ "enablePullDownRefresh": true //设置参数为true } }, - { - "path": "pages/medicine/medicine", - "style": { - "navigationBarTitleText": "健康咨询", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { "path": "pages/diseasemanagement/diseasemanagement", "style": { @@ -362,7 +360,6 @@ "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/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss index ea51639..c81df3b 100644 --- a/pages/ProjectDetails/ProjectDetails.scss +++ b/pages/ProjectDetails/ProjectDetails.scss @@ -1,7 +1,6 @@ .app { height: 100%; padding: 0 0 0 0; - padding-top: 10rpx; font-size: 34rpx; position: relative; .swiper-box { 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 @@