From ab7153877005caecbb3370c876fba49874f6fbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Mon, 20 Feb 2023 16:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/Healthknowledge/index.js | 8 + api/homepage/index.js | 4 +- pages.json | 29 ++-- .../Bodysatelliteintegration.vue | 90 ----------- pages/CommodityDetails/CommodityDetails.vue | 1 + pages/Healthitem/Healthitem.vue | 50 ++++++ pages/Healthknowledge/Healthknowledge.vue | 147 ++++++++++++++++++ pages/ProjectDetails/ProjectDetails.vue | 9 +- pages/appointmenttime/appointmenttime.scss | 3 +- pages/appointmenttime/appointmenttime.vue | 5 +- pages/homepage/homepage.vue | 88 +++++++++-- pages/nursestation/nursestation.scss | 18 ++- pages/nursestation/nursestation.vue | 75 +++++---- pages/site/site.vue | 36 +++-- pages/utabs/u-tabs.vue | 4 +- 15 files changed, 389 insertions(+), 178 deletions(-) create mode 100644 api/Healthknowledge/index.js delete mode 100644 pages/Bodysatelliteintegration/Bodysatelliteintegration.vue create mode 100644 pages/Healthitem/Healthitem.vue create mode 100644 pages/Healthknowledge/Healthknowledge.vue diff --git a/api/Healthknowledge/index.js b/api/Healthknowledge/index.js new file mode 100644 index 0000000..54ebd8b --- /dev/null +++ b/api/Healthknowledge/index.js @@ -0,0 +1,8 @@ +import request from "../request.js" + +export function getHeathHousingList(pageNum, pageSize) { + return request({ + url: `/nurseApplet/nearbyNursingStation/getHeathHousingList?pageNum=${pageNum}&pageSize=${pageSize}&informationCategoryType=HEALTH_NOUS`, + method: 'get', + }) +} diff --git a/api/homepage/index.js b/api/homepage/index.js index 0e091f9..d692231 100644 --- a/api/homepage/index.js +++ b/api/homepage/index.js @@ -1,8 +1,8 @@ import request from "../request.js" -export function informationCategoryList() { +export function getPoserInfoListByType() { return request({ - url: `/nurseApplet/nearbyNursingStation/informationCategoryList?moduleType=HOME_PAGE_MODULE&&jumpType=HOME_PAGE&&informationCategoryType=HEALTH_NOUS`, + url: `/nurseApplet/nearbyNursingStation/getPoserInfoListByType?moduleType=HOME_PAGE_MODULE`, method: 'GET' }) } diff --git a/pages.json b/pages.json index 3d1c2d3..5de6e36 100644 --- a/pages.json +++ b/pages.json @@ -52,13 +52,6 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" //背景颜色 } - }, { - "path": "pages/Bodysatelliteintegration/Bodysatelliteintegration", - "style": { - "navigationBarTitleText": "体卫融合", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } }, { "path": "pages/modify/modify", @@ -142,7 +135,6 @@ "path": "pages/login/login", "style": { "navigationBarTitleText": "登录", - // "navigationStyle": "custom" "enablePullDownRefresh": false } }, @@ -215,9 +207,10 @@ "path": "pages/homepage/homepage", "style": { "navigationBarTitleText": "泉医到家", - "enablePullDownRefresh": false, + "navigationStyle": "custom", "navigationBarBackgroundColor": "#ffffff", - "navigationStyle": "custom" + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true } }, { @@ -250,7 +243,6 @@ "path": "pages/ProductList/ProductList", //商品列表 "style": { "navigationBarTitleText": "医路优品", - "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true @@ -318,6 +310,21 @@ // "enablePullDownRefresh": true //设置参数为true } + }, { + "path": "pages/Healthknowledge/Healthknowledge", + "style": { + "navigationBarTitleText": "健康常识", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + + }, { + "path": "pages/Healthitem/Healthitem", + "style": { + "navigationBarTitleText": "健康常识", + "enablePullDownRefresh": false + } + } ], "globalStyle": { diff --git a/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue b/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue deleted file mode 100644 index b388325..0000000 --- a/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index ce6db32..44a11cc 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -410,6 +410,7 @@ // 查询商品详细信息 goodsDetailsinfo(goodsInfoId) { let that = this + this.info = [] goodsDetails(goodsInfoId).then(res => { uni.removeStorageSync('Refresh'); if (res.data.goodsRemark) { diff --git a/pages/Healthitem/Healthitem.vue b/pages/Healthitem/Healthitem.vue new file mode 100644 index 0000000..1a4da59 --- /dev/null +++ b/pages/Healthitem/Healthitem.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/pages/Healthknowledge/Healthknowledge.vue b/pages/Healthknowledge/Healthknowledge.vue new file mode 100644 index 0000000..76530be --- /dev/null +++ b/pages/Healthknowledge/Healthknowledge.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue index 8bc3892..d0bb66d 100644 --- a/pages/ProjectDetails/ProjectDetails.vue +++ b/pages/ProjectDetails/ProjectDetails.vue @@ -145,6 +145,7 @@ }, // 信息 getlist(stationId, stationItemId, stationItemPriceId) { + this.lbinfo = [] getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => { if (res.data.nurseItemContent) { res.data.nurseItemContent = res.data.nurseItemContent.replace(/\= 1) { res.data.poserInfoList.forEach(e => { - e.posterPictureUrl = baseurl + e.posterPictureUrl - var obj = { - image: e.posterPictureUrl - } - this.lbinfo.push(obj) + e.image = baseurl + e.posterPictureUrl }) + this.lbinfo = res.data.poserInfoList } else { + this.lbinfo = [] var obj = { image: this.baseurl + res.data.itemPictureUrl } diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss index 074fa58..f49ed06 100644 --- a/pages/appointmenttime/appointmenttime.scss +++ b/pages/appointmenttime/appointmenttime.scss @@ -133,16 +133,17 @@ display: flex; justify-content:space-around; height: 50rpx; - font-size: 30rpx; color: #000000; line-height: 27rpx; margin-bottom: 30rpx; text-align: center; .Soonerorlater{ width: 200rpx; + font-size: 36rpx; height: 50rpx; } .Soonerorlaterclass{ + font-size: 36rpx; color: #F44B2F; width: 200rpx; height: 50rpx; diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index e5dc174..bee2fe3 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -15,9 +15,9 @@ 上门时间： - 请您选择希望护理员到达的时间区间 + 请您选择希望护理员到达的时间 - + @@ -259,6 +259,7 @@ this.orderlist.afternoonOpenStartTime = this.orderlist.afternoonOpenStartTime.slice(0, 5) this.orderlist.morningOpenEndTime = this.orderlist.morningOpenEndTime.slice(0, 5) this.orderlist.morningOpenStartTime = this.orderlist.morningOpenStartTime.slice(0, 5) + this.orderlist.patientId = this.patientId submitAppointment(this.orderlist).then(res => { if (res.code == 500) { that.$refs.uToast.show({ diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 6ee1033..13c663f 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -29,14 +29,15 @@ 健康常识 - + 查看更多 - + {{item.informationTitle}} @@ -46,13 +47,17 @@ + @@ -200,6 +253,9 @@ left: 0; width: 50%; font-size: 30rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } } diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss index 60be641..b62a5af 100644 --- a/pages/nursestation/nursestation.scss +++ b/pages/nursestation/nursestation.scss @@ -53,8 +53,8 @@ margin-top: -80rpx; z-index: 999; ::v-deep .u-tabs{ - background-color: #F4F5F7 !important; padding-bottom: 10rpx; + border-radius: 20rpx; } .tive { width: 94%; @@ -147,12 +147,13 @@ } .tab-box { display: flex; + font-weight: 600; .tab-item { flex-shrink: 0; padding: 3%; position: relative; transition: all 0.2s linear; - font-size: 31rpx; + font-size: 36rpx; &::after { transition: all 0.2s linear; transform: translateX(-50%) scaleX(0); @@ -161,10 +162,10 @@ position: absolute; left: 50%; bottom: 10rpx; - border-bottom: 6rpx solid #D43953; border-radius: 4rpx; } &.active { + color: #2979ff; &::after { content: ''; width: 50%; @@ -172,7 +173,6 @@ left: 50%; transform: translateX(-50%) scaleX(1); bottom: 10rpx; - border-bottom: 6rpx solid red; } } } @@ -268,13 +268,15 @@ // white-space: nowrap; position: relative; .distance{ - position: absolute; - right:30rpx; - top:50%; - transform: translateY(-50%); + // position: absolute; + // right:30rpx; + // top:50%; + float: right; + display: inline-block; } .text{ padding-left: 40rpx; + display: inline-block; } image{ position: absolute; diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index a87b671..4424a01 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -40,7 +40,13 @@ - 暂无 + + + 暂无 + + + {{distance}}KM + @@ -48,19 +54,22 @@ {{list.dutyPhone}} - - 暂无 + + + + 暂无 + - - - + + + @@ -70,7 +79,7 @@ --> - 预约 + 预约 ￥{{item.nurseItemPrice==null?'0':item.nurseItemPrice}} @@ -114,6 +123,7 @@ + @@ -130,7 +140,7 @@ export default { data() { return { - baseurl:'', + baseurl: '', lbinfo: [], //轮播list usershow: false, //完善信息开关 choicetab: false, //切换 @@ -150,9 +160,20 @@ name: '全部', id: '' }], //分类标题 + tabIndex: 0, + tabLists: [{ + name: '服务项目', + id: 0, + }, + { + name: '产品', + id: 1, + } + ], classifycurrent: 0, //分类下标 distance: null, //距离 nurseClassifyInfoId: '', //分类id + scrollTop: 0, } }, onShow() { @@ -165,17 +186,21 @@ this.distance = options.distance }, methods: { + testTabClick(item) { + this.tabIndex = item.id + if (item.id == 0) { + this.choicetab = false + } else { + this.choicetab = true + } + }, //点击分类标题 change(index) { this.classifycurrent = index; this.nurseClassifyInfoId = this.tabList[index].id this.serveinfo() - if (this.tabList[index].name == '产品') { - this.choicetab = true - } else { - this.choicetab = false - } }, + //预约 goappointments(item) { let that = this try { @@ -246,20 +271,15 @@ e.name = e.classifyName this.tabList.push(e) }) - var obj = { - name: '产品' - } - this.tabList.push(obj) this.list = res.data if (res.data.poserInfoList.length >= 1) { res.data.poserInfoList.forEach(e => { - e.posterPictureUrl = baseurl + e.posterPictureUrl - var obj = { - image: e.posterPictureUrl - } - this.lbinfo.push(obj) + e.image = baseurl + e.posterPictureUrl + }) + this.lbinfo = res.data.poserInfoList } else { + this.lbinfo = [] var obj = { image: res.data.stationPictureUrl } @@ -345,7 +365,7 @@ if (!this.choicetab) { if (this.servelist.length >= this.servetotal) {} else { this.pageNum++ - itemList(this.nurseStationId, this.pageSize, this.pageNum).then(res => { + itemList(this.nurseStationId, this.pageSize, this.pageNum, this.nurseClassifyInfoId).then(res => { res.rows.forEach(e => { e.itemPictureUrl = baseurl + e.itemPictureUrl this.servelist.push(e) @@ -403,6 +423,9 @@ path: url, } }, + onPageScroll(e) { + this.scrollTop = e.scrollTop; + }, } diff --git a/pages/site/site.vue b/pages/site/site.vue index a484c6e..534254b 100644 --- a/pages/site/site.vue +++ b/pages/site/site.vue @@ -62,6 +62,7 @@ +