From 349e0d1698137c7dff68c33703e16d1f3881ce78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 16 Feb 2023 10:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=A6=96=E9=A1=B5=EF=BC=8C=E6=96=B0?=
=?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=8C?=
=?UTF-8?q?=E6=96=B0=E6=8A=A4=E7=90=86=E7=AB=99=E8=AF=A6=E6=83=85=E9=A1=B5?=
=?UTF-8?q?=E5=92=8C=E6=96=B0=E6=8A=A4=E7=90=86=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/ProjectDetails/index.js | 2 +-
api/homepage/index.js | 9 +
api/nursestation/nursestation.js | 4 +-
api/site/site.js | 17 +-
pages.json | 16 +-
pages/ProjectDetails/ProjectDetails.scss | 110 ++++------
pages/ProjectDetails/ProjectDetails.vue | 39 ++--
pages/diseasemanagement/diseasemanagement.vue | 4 +-
pages/homepage/homepage.vue | 55 +++--
pages/nursestation/nursestation.scss | 142 ++++++++-----
pages/nursestation/nursestation.vue | 140 ++++++++-----
pages/site/site.scss | 188 +++++++++++++----
pages/site/site.vue | 197 ++++++++++--------
static/gd.png | Bin 0 -> 2385 bytes
static/locatinsmall.png | Bin 2728 -> 990 bytes
static/phone.png | Bin 0 -> 901 bytes
static/zixun.png | Bin 77869 -> 0 bytes
17 files changed, 560 insertions(+), 363 deletions(-)
create mode 100644 api/homepage/index.js
create mode 100644 static/gd.png
create mode 100644 static/phone.png
delete mode 100644 static/zixun.png
diff --git a/api/ProjectDetails/index.js b/api/ProjectDetails/index.js
index bf08060..2d54396 100644
--- a/api/ProjectDetails/index.js
+++ b/api/ProjectDetails/index.js
@@ -2,7 +2,7 @@ import request from "../request.js"
export function getAppStationItemInfo(stationId, stationItemId, stationItemPriceId) {
return request({
- url: `/nurseApp/login/getAppStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`,
+ url: `/nurseApplet/login/getStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`,
method: 'GET'
})
}
diff --git a/api/homepage/index.js b/api/homepage/index.js
new file mode 100644
index 0000000..0e091f9
--- /dev/null
+++ b/api/homepage/index.js
@@ -0,0 +1,9 @@
+import request from "../request.js"
+
+export function informationCategoryList() {
+ return request({
+ url: `/nurseApplet/nearbyNursingStation/informationCategoryList?moduleType=HOME_PAGE_MODULE&&jumpType=HOME_PAGE&&informationCategoryType=HEALTH_NOUS`,
+ method: 'GET'
+ })
+}
+
diff --git a/api/nursestation/nursestation.js b/api/nursestation/nursestation.js
index b8a3368..6e59c0d 100644
--- a/api/nursestation/nursestation.js
+++ b/api/nursestation/nursestation.js
@@ -9,9 +9,9 @@ export function introductionList(id) {
}
-export function itemList(id,pageSize,pageNum) {
+export function itemList(id,pageSize,pageNum,nurseClassifyInfoId) {
return request({
- url: `/nurseApplet/nearbyNursingStation/itemList?pageSize=${pageSize}&pageNum=${pageNum}&nurseStationId=${id}`,
+ url: `/nurseApplet/nearbyNursingStation/itemList?pageSize=${pageSize}&pageNum=${pageNum}&nurseStationId=${id}&nurseClassifyInfoId=${nurseClassifyInfoId}`,
method: 'GET'
})
}
diff --git a/api/site/site.js b/api/site/site.js
index b09dba8..e794ad9 100644
--- a/api/site/site.js
+++ b/api/site/site.js
@@ -1,11 +1,8 @@
import request from "../request.js"
-
-
-
-export function nearbyList(pageSize,pageNum,longitude, latitude) {
+export function nearbyList(pageSize, pageNum, longitude, latitude,nurseClassId,itemClassId) {
return request({
- url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}`,
+ url: `/nurseApplet/nearbyNursingStation/getNearbyNursingStationInfoList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}&nurseClassId=${nurseClassId}&itemClassId=${itemClassId}`,
method: 'GET'
})
}
@@ -16,4 +13,12 @@ export function getPatientInfo(id) {
url: `/nurseApplet/login/getPatientInfo?patientId=${id}`,
method: 'GET'
})
-}
\ No newline at end of file
+}
+
+//护理站和护理项目分类
+export function getNurseClassifyList() {
+ return request({
+ url: `/nurseApplet/nearbyNursingStation/getNurseClassifyList?moduleType=NURSE_AGENCY_MODULE`,
+ method: 'GET'
+ })
+}
diff --git a/pages.json b/pages.json
index 35b8e74..b8caec1 100644
--- a/pages.json
+++ b/pages.json
@@ -9,6 +9,13 @@
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
+ }, {
+ "path": "pages/ProjectDetails/ProjectDetails",
+ "style": {
+ "navigationBarTitleText": "护理项目详情",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ }
}, {
"path": "pages/modifyAddress/modifyAddress",
"style": {
@@ -38,13 +45,6 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //背景颜色
}
- }, {
- "path": "pages/ProjectDetails/ProjectDetails",
- "style": {
- "navigationBarTitleText": "护理项目详情",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
- }
}, {
"path": "pages/goodsorderRate/goodsorderRate",
"style": {
@@ -276,7 +276,7 @@
{
"path": "pages/site/site",
"style": {
- "navigationBarTitleText": "附近护理站",
+ "navigationBarTitleText": "护理站",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff", //背景颜色
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
diff --git a/pages/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss
index 69a3231..efdb765 100644
--- a/pages/ProjectDetails/ProjectDetails.scss
+++ b/pages/ProjectDetails/ProjectDetails.scss
@@ -1,6 +1,6 @@
.app {
height: 100%;
- padding: 2% 2% 150rpx 2%;
+ padding: 0 0 0 0;
padding-top: 10rpx;
font-size: 34rpx;
position: relative;
@@ -49,101 +49,69 @@
}
}
}
- .appointment {
- width: 120rpx;
- height: 70rpx;
- background: #4C7BC9;
- border-radius: 26rpx;
- color: #ffffff;
- text-align: center;
- line-height: 70rpx;
- position: absolute;
- bottom:20rpx;
- right:5%;
+ .bottomcontent{
+ position: fixed;
+ width: 100%;
+ height: 100rpx;
+ bottom: 0;
+ background-color: #FFFFFF;
+ .appoinprice{
+ padding-left: 20rpx;
+ font-size: 48rpx;
+ color: #F44B2F;
+ line-height: 70rpx;
+ }
+ .appointment {
+ width: 200rpx;
+ height: 70rpx;
+ background: #F44B2F;
+ border-radius: 30rpx;
+ color: #ffffff;
+ text-align: center;
+ line-height: 70rpx;
+ position: absolute;
+ bottom:20rpx;
+ right:5%;
+ }
}
+
.detailtitle {
position: relative;
- width: 94%;
+ width: 100%;
height: 100%;
margin: 0 auto;
background: #FFFFFF;
- border-radius: 20rpx;
margin-top: 3%;
font-size: 31rpx;
padding: 3%;
- padding-bottom: 50rpx;
+ padding-bottom: 150rpx;
.textInfo {
word-break:break-all;
font-size: 29rpx;
text-indent: 2rem;
line-height: 42rpx;
color: #666666;
- padding-top: 30rpx;
/deep/ .richPic {
width: 100% !important;
height: 100% !important;
}
}
.Introduction {
- font-size: 31rpx;
- color: #333333;
- line-height: 12rpx;
- margin-left: -3%;
- padding: 3%;
+ padding: 3% 3% 3% 0;
+ font-size: 32rpx;
}
}
.item {
- width: 95%;
- height: 100%;
+ margin: 0 auto;
+ width: 100%;
+ height: 200rpx;
background: #FFFFFF;
- box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
- border-radius: 20rpx;
- margin: 20rpx auto 0;
- padding: 3% 3% 40rpx 3%;
- line-height: 60rpx;
- position: relative;
-
- image {
- width: 170rpx;
- height: 170rpx;
- margin-left: 3%;
- }
-
- .servicetime {
- color: #999999;
- line-height: 37rpx;
- font-size: 30rpx;
- position: absolute;
- top: 35%;
- left: 35%;
- }
-
- .price {
- color: red;
- font-size: 32rpx;
- position: absolute;
- top: 65%;
- left: 35%;
- }
-
- .product {
- color: #000000;
- width: 60%;
- position: absolute;
- top: 14%;
- left: 32%;
- font-size: 28rpx;
- }
-
- .huanyao {
- color: #000000;
- position: absolute;
- top: 10%;
- left: 35%;
- width: 60%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ .text{
+ padding: 40rpx 20% 0 40rpx;
+ width: 100%;
+ height: 81rpx;
+ font-size: 38rpx;
+ font-weight: 500;
}
}
diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue
index f133ad3..e86f5f5 100644
--- a/pages/ProjectDetails/ProjectDetails.vue
+++ b/pages/ProjectDetails/ProjectDetails.vue
@@ -1,30 +1,36 @@
+
-
- {{list.nurseItemName}}
+ {{list.nurseItemName}}
- 暂无
+ 暂无
+
+
+
- 服务时长:{{list.serveDurationUnit?list.serveDurationUnit:'0'}}
- ￥{{list.nurseItemPrice==null?'0':list.nurseItemPrice}}
- 耗材包详情:
+
服务详情:
-
+
- 预约
+
+
+ ￥{{list.totalPrice}}
+
+ 立即预约
+
@@ -53,11 +59,11 @@
export default {
data() {
return {
+ lbinfo: [], //轮播
baseurl: '',
- list: {},
orderNo: '',
usershow: false, //完善信息开关
- list: [], //护理站list
+ list: {}, //护理站list
timer: null,
stationId: null,
stationItemId: null,
@@ -87,7 +93,7 @@
if (res.data.loginFlag) {
that.usershow = false
uni.navigateTo({
- url: `/pages/appointmenttime/appointmenttime?stationId=${this.list.stationId}&stationItemId=${this.list.stationItemId}&stationItemPriceId=${this.list.stationItemPriceId}`,
+ url: `/pages/appointmenttime/appointmenttime?stationId=${this.stationId}&stationItemId=${this.stationItemId}&stationItemPriceId=${this.stationItemPriceId}`,
})
} else {
that.usershow = true
@@ -143,6 +149,15 @@
res.data.nurseItemContent = res.data.nurseItemContent.replace(/\![]()
![]()
{
+ e.posterPictureUrl = baseurl + e.posterPictureUrl
+ var obj = {
+ image: e.posterPictureUrl
+ }
+ this.lbinfo.push(obj)
+ })
+ }
res.data.itemPictureUrl = baseurl + res.data.itemPictureUrl
this.list = res.data
})
diff --git a/pages/diseasemanagement/diseasemanagement.vue b/pages/diseasemanagement/diseasemanagement.vue
index f11b3de..ab1157d 100644
--- a/pages/diseasemanagement/diseasemanagement.vue
+++ b/pages/diseasemanagement/diseasemanagement.vue
@@ -49,7 +49,7 @@
.concent {
width: 701rpx;
- height: 850rpx;
+ height: 900rpx;
background: #4C7BC9;
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
@@ -80,7 +80,7 @@
.detailed {
width: 657rpx;
- padding: 0 42rpx;
+ padding: 0 20rpx;
line-height: 56rpx;
}
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 3a5a323..51bdfd5 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -42,32 +42,12 @@
-
+
- 医疗资讯医疗资讯医疗 资讯医疗资讯
+ {{item.informationTitle}}
-
- 信赖保障
-
-
-
-
-
- 医疗资讯医疗资讯医疗 资讯医疗资讯
-
-
- 信赖保障
-
-
-
-
-
- 医疗资讯医疗资讯医疗资讯医疗资讯
-
-
- 信赖保障
-
-
+
+
@@ -76,18 +56,34 @@