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 @@
+
+
+
+
+ 姓名:
+ 111
+
+
+ 电话:
+ 111
+
+
+ 地址:
+ 111
+
+
+ 时间:
+ 请选择
+
+
+
+ 今天
+
+ 02-10
+
+
+ 今天
+
+ 02-10
+
+
+ 今天
+
+ 02-10
+
+
+ 今天
+
+ 02-10
+
+
+
+
+ 今天
+
+ 02-10
+
+
+ 今天
+
+ 02-10
+
+
+ 今天
+
+ 02-10
+
+
+ 今天
+
+ 02-10
+
+
+
+
+
+ 298¥
+ 确认
+
+
+
+
+
+ 请选择支付方式
+
+
+
+
+
+
+ 微信支付
+
+
+ 确认支付¥298
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{list.nurseItemName}}
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
index aef8d7e..71c8b27 100644
--- a/pages/classification/classification.vue
+++ b/pages/classification/classification.vue
@@ -127,11 +127,9 @@
methods: {
// 触摸touch事件
start(e) { //@touchstart 触摸开始
- console.log(e)
this.startData.pageY = e.changedTouches[0].pageY; //手指按下时的Y坐标
},
end(e) { //@touchend触摸结束
- console.log(this.startData.pageY - this.touch.pageY)
if ((this.startData.pageY - this.touch.pageY) > 200) { //在事件结束时,判断滑动的距离是否达到出发需要执行事件的要求
if (this.goodsList.length >= this.total) {} else {
this.pageNum++;
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 55f5dd8..dec483d 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -9,26 +9,24 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -108,7 +106,7 @@
},
methods: {
swiperChange(e) {
- this.currentIndex = event.detail.current
+ this.currentIndex = e.detail.current
let {
current,
source
@@ -179,9 +177,6 @@
}
})
},
- swiperChange(event) {
- this.currentIndex = event.detail.current
- },
//专病管理
godiseasemanagement() {
uni.navigateTo({
diff --git a/pages/information/information.vue b/pages/information/information.vue
index b1cafa1..57bdf42 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -36,7 +36,8 @@
详细地址:
-
+
所在位置:
diff --git a/pages/medicine/medicine.scss b/pages/medicine/medicine.scss
new file mode 100644
index 0000000..553de60
--- /dev/null
+++ b/pages/medicine/medicine.scss
@@ -0,0 +1,169 @@
+.app{
+ padding: 0%;
+ margin-top: 381rpx;
+ .swiper {
+ position: fixed;
+ top: 0;
+ width: 100%;
+ height: 380rpx;
+ z-index: 999;
+
+ .swiper-box {
+ width: 100%;
+ height: 380rpx;
+ }
+
+ .swiper-item {
+ height: 380rpx;
+ text-align: center;
+
+ image {
+ width: 100%;
+ height: 380rpx !important;
+ z-index: 999;
+ }
+ }
+
+ video {
+ height: 100%;
+ width: 100%;
+ }
+ }
+
+ .hospital {
+ width: 97%;
+ margin: 0 auto;
+ height: 100%;
+ background-color: #fff;
+
+ .appointmenthospital {
+ height: 90rpx;
+ font-size: 35rpx;
+ line-height: 90rpx;
+ border-bottom: 1rpx solid #D8D4D4;
+ width: 94%;
+ margin: 0 auto;
+ font-weight: 600;
+ }
+
+ .tabbar {
+ display: flex;
+ height: calc(100vh - 470rpx);
+ width: 100%;
+
+
+ .lefttabbar {
+ width: 30%;
+ // display: inline-block;
+ height: 100%;
+ padding-top: 20rpx;
+
+ .lefttabbarlist {
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
+ height: 100%;
+
+ .actives {
+ width: 80%;
+ color: red;
+ font-size: 34rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin: 0 auto;
+ line-height: 80rpx;
+ border-bottom: 1rpx solid #D8D4D4;
+ text-align: center;
+ font-size: 30rpx;
+ // border-radius: 25rpx 0 0 25rpx;
+ }
+
+ .active {
+ text-align: center;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ font-size: 30rpx;
+ white-space: nowrap;
+ border-bottom: 1rpx solid #D8D4D4;
+ width: 80%;
+ margin: 0 auto;
+ line-height: 80rpx;
+ }
+ }
+ }
+
+ .righttabbar {
+ width: 70%;
+ height: 100%;
+
+ .productlist {
+ padding-bottom: 40rpx;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
+ width: 100%;
+ height: 100%;
+ margin: 0 auto;
+ border-radius: 25rpx;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-evenly;
+ background-color: #ffffff;
+
+ .content {
+ position: relative;
+ width: 100%;
+ height: 450rpx;
+ border-bottom: 1rpx solid #D8D4D4;
+
+ .hospitalimage {
+ position: absolute;
+ width: 109rpx;
+ height: 111rpx;
+ top: 50rpx;
+ left: 30rpx;
+ }
+
+ .hospitalteacher {
+ font-size: 36rpx;
+ position: absolute;
+ top: 60rpx;
+ left: 160rpx;
+ }
+
+ .physician {
+ font-size: 24rpx;
+ color: #666666;
+ position: absolute;
+ top: 120rpx;
+ left: 160rpx;
+
+ }
+
+ .words {
+ position: absolute;
+ left: 41rpx;
+ width: 85%;
+ top: 190rpx;
+ text-indent: 2em;
+ font-size: 30rpx;
+ line-height: 55rpx;
+ }
+
+ .appointment {
+ position: absolute;
+ bottom: 25rpx;
+ right: 30rpx;
+ width: 125rpx;
+ height: 52rpx;
+ background: #F44B2F;
+ border-radius: 26rpx;
+ color: #fff;
+ line-height: 52rpx;
+ text-align: center;
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue
index f9e6a0b..b395253 100644
--- a/pages/medicine/medicine.vue
+++ b/pages/medicine/medicine.vue
@@ -3,25 +3,150 @@
-
-
-
- 在“互联网+医疗健康”高速发展的当下,以远程诊疗、大数据、人工智能为代表的新技术应用,越来越多的应用在医疗健康服务当中,依托三甲专家团队赋能基层医疗,打造“医、药、检、险”的全闭环商业模式,实现物联网化医生联合体布局,提供数字化远程医疗解决方案,提升基层医疗水平,提高医疗效率,降低看病成本。
- 平台将全力打造“智慧诊所”,为基层全科医生医提供物联网可穿戴式医疗设备,基层医生负责操作收集,医生集团的三甲专家远程出具诊断报告。有效将三甲医院医生、基层医生与患者连接,从而更加方便快捷高效,随时随地满足患者的长期医疗需求。可以为基层医生解决技术缺陷、设备不足等难题;遇到病情紧急严重的还可以打开绿色就医通道进行转诊服务。
-
+
+
+ 在“互联网+医疗健康”高速发展的当下,以远程诊疗、大数据、人工智能为代表的新技术应用,越来越多的应用在医疗健康服务当中,依托三甲专家团队赋能基层医疗,打造“医、药、检、险”的全闭环商业模式,实现物联网化医生联合体布局,提供数字化远程医疗解决方案,提升基层医疗水平,提高医疗效率,降低看病成本。
+ 平台将全力打造“智慧诊所”,为基层全科医生医提供物联网可穿戴式医疗设备,基层医生负责操作收集,医生集团的三甲专家远程出具诊断报告。有效将三甲医院医生、基层医生与患者连接,从而更加方便快捷高效,随时随地满足患者的长期医疗需求。可以为基层医生解决技术缺陷、设备不足等难题;遇到病情紧急严重的还可以打开绿色就医通道进行转诊服务。
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+