From 9cd90782a2f1c99430053d04334353263c50aa6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 23 Feb 2023 10:45:26 +0800 Subject: [PATCH 1/2] =?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/ProjectDetails/index.js | 2 +- api/appointmenttime/appointmenttime.js | 10 + api/baseurl.js | 2 +- api/homepage/index.js | 9 + api/nursestation/nursestation.js | 4 +- api/site/site.js | 16 +- manifest.json | 2 +- pages.json | 163 ++++--- pages/Doctordetails/Doctordetails.vue | 104 ----- pages/Healthitem/Healthitem.vue | 50 ++ pages/Healthknowledge/Healthknowledge.vue | 174 +++++++ pages/Personal/Personal.vue | 6 - pages/ProjectDetails/ProjectDetails.scss | 126 +++-- pages/ProjectDetails/ProjectDetails.vue | 210 +++++++-- pages/appointmenttime/appointmenttime.scss | 136 ++++-- pages/appointmenttime/appointmenttime.vue | 365 ++++++++------- pages/classification/classification.vue | 437 ++++++++++++++++++ pages/customerservice/customerservice.vue | 67 +++ pages/detail/detail.scss | 115 ----- pages/detail/detail.vue | 168 ------- pages/diseasemanagement/diseasemanagement.vue | 7 +- pages/homepage/homepage.vue | 423 ++++++++++++++--- pages/materialbenefits/materialbenefits.vue | 83 ++++ pages/medicine/medicine.vue | 39 +- pages/nursestation/nursestation.scss | 246 +++++----- pages/nursestation/nursestation.vue | 360 ++++++++++++--- pages/shopping/shopping.vue | 13 - pages/site/site.scss | 191 ++++++-- pages/site/site.vue | 338 +++++++++----- pages/startup/startup.vue | 3 +- pages/utabs/u-tabs.vue | 385 +++++++++++++++ static/1024.png | Bin 124358 -> 0 bytes static/chaxun.png | Bin 3273 -> 0 bytes static/daohang.png | Bin 368 -> 0 bytes static/fenlei.png | Bin 0 -> 2460 bytes static/fuli.png | Bin 0 -> 32529 bytes static/gd.png | Bin 0 -> 2385 bytes static/hlz.png | Bin 0 -> 5659 bytes static/home.png | Bin 3372 -> 0 bytes static/huijiantou.png | Bin 0 -> 316 bytes static/jjhl.png | Bin 3460 -> 0 bytes static/jkzx.png | Bin 0 -> 5735 bytes static/kefu.png | Bin 0 -> 34408 bytes static/kefuzx.jpg | Bin 0 -> 83846 bytes static/lifeserve.png | Bin 75826 -> 0 bytes static/locatinsmall.png | Bin 2728 -> 990 bytes static/logo.png | Bin 23943 -> 3357 bytes static/order.png | Bin 1443 -> 0 bytes static/pb.png | Bin 2258 -> 0 bytes static/phone.png | Bin 0 -> 901 bytes static/shoping.png | Bin 0 -> 1752 bytes static/shopingw.png | Bin 0 -> 834 bytes static/shopping.png | Bin 2651 -> 0 bytes static/sp.png | Bin 2889 -> 0 bytes static/yiliaohuli.png | Bin 80175 -> 0 bytes static/ylfw.png | Bin 3003 -> 0 bytes static/yuyue.png | Bin 2378 -> 0 bytes static/yyss.png | Bin 3212 -> 0 bytes static/zbgl.png | Bin 0 -> 5834 bytes static/zhuanjia.png | Bin 3715 -> 0 bytes static/znsb.png | Bin 2447 -> 0 bytes static/zs.png | Bin 1442 -> 0 bytes 63 files changed, 3029 insertions(+), 1233 deletions(-) create mode 100644 api/Healthknowledge/index.js create mode 100644 api/homepage/index.js delete mode 100644 pages/Doctordetails/Doctordetails.vue create mode 100644 pages/Healthitem/Healthitem.vue create mode 100644 pages/Healthknowledge/Healthknowledge.vue create mode 100644 pages/classification/classification.vue create mode 100644 pages/customerservice/customerservice.vue delete mode 100644 pages/detail/detail.scss delete mode 100644 pages/detail/detail.vue create mode 100644 pages/materialbenefits/materialbenefits.vue create mode 100644 pages/utabs/u-tabs.vue delete mode 100644 static/1024.png delete mode 100644 static/chaxun.png delete mode 100644 static/daohang.png create mode 100644 static/fenlei.png create mode 100644 static/fuli.png create mode 100644 static/gd.png create mode 100644 static/hlz.png delete mode 100644 static/home.png create mode 100644 static/huijiantou.png delete mode 100644 static/jjhl.png create mode 100644 static/jkzx.png create mode 100644 static/kefu.png create mode 100644 static/kefuzx.jpg delete mode 100644 static/lifeserve.png delete mode 100644 static/order.png delete mode 100644 static/pb.png create mode 100644 static/phone.png create mode 100644 static/shoping.png create mode 100644 static/shopingw.png delete mode 100644 static/shopping.png delete mode 100644 static/sp.png delete mode 100644 static/yiliaohuli.png delete mode 100644 static/ylfw.png delete mode 100644 static/yuyue.png delete mode 100644 static/yyss.png create mode 100644 static/zbgl.png delete mode 100644 static/zhuanjia.png delete mode 100644 static/znsb.png delete mode 100644 static/zs.png 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/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/appointmenttime/appointmenttime.js b/api/appointmenttime/appointmenttime.js index d4c6887..005b422 100644 --- a/api/appointmenttime/appointmenttime.js +++ b/api/appointmenttime/appointmenttime.js @@ -22,4 +22,14 @@ export function submitAppointment(data) { data }) } +// 小程序预约服务支付接口 + +export function appletAppointmentOrderPay(data) { + return request({ + url: `/nurseApp/weChatPayment/appletAppointmentOrderPay`, + method: 'post', + data + }) +} + diff --git a/api/baseurl.js b/api/baseurl.js index dcfa9cc..9ab310f 100644 --- a/api/baseurl.js +++ b/api/baseurl.js @@ -1,4 +1,4 @@ // var baseurl = "http://192.168.16.30:8080"; -var baseurl = "http://192.168.16.49:8081"; +var baseurl = "http://192.168.16.30:8088"; // var baseurl = "http://192.168.16.76:8080"; export default baseurl diff --git a/api/homepage/index.js b/api/homepage/index.js new file mode 100644 index 0000000..d692231 --- /dev/null +++ b/api/homepage/index.js @@ -0,0 +1,9 @@ +import request from "../request.js" + +export function getPoserInfoListByType() { + return request({ + url: `/nurseApplet/nearbyNursingStation/getPoserInfoListByType?moduleType=HOME_PAGE_MODULE`, + 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 98c3130..53f0fb3 100644 --- a/api/site/site.js +++ b/api/site/site.js @@ -1,14 +1,12 @@ import request from "../request.js" - - - -export function nearbyList(pageSize,pageNum,longitude, latitude) { +export function nearbyList(pageSize, pageNum, longitude, latitude,ClassifyInfoId,itemClassId,searchName) { return request({ - url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}`, + url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}&nurseClassifyInfoId=${ClassifyInfoId}&nurseItemClassifyInfoId=${itemClassId}&searchName=${searchName}`, method: 'GET' }) } + //被护理人信息 经纬度 export function getPatientInfo(id) { return request({ @@ -16,3 +14,11 @@ export function getPatientInfo(id) { method: 'GET' }) } + +//护理站和护理项目分类 +export function getNurseClassifyList() { + return request({ + url: `/nurseApplet/nearbyNursingStation/getNurseClassifyList?moduleType=NURSE_AGENCY_INTRODUCE_MODULE`, + method: 'GET' + }) +} diff --git a/manifest.json b/manifest.json index 95a5d6e..eabaa46 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "泉医到家APP", + "name" : "泉医到家", "appid" : "__UNI__D6F049F", "description" : "", "versionName" : "1.0.0", diff --git a/pages.json b/pages.json index 3e59949..d0ca5bb 100644 --- a/pages.json +++ b/pages.json @@ -9,15 +9,7 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } - }, { - "path": "pages/information/information", - "style": { - "navigationBarTitleText": "完善个人信息", - "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "enablePullDownRefresh": false - } - }, - { + },{ "path": "pages/forgotPassword/forgotPassword", "style": { "navigationBarTitleText": "忘记密码", @@ -30,6 +22,27 @@ "navigationBarTitleText": "注册账号", "navigationBarBackgroundColor": "#ffffff" } + }, { + "path": "pages/ProjectDetails/ProjectDetails", + "style": { + "navigationBarTitleText": "护理项目详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, { + "path": "pages/modifyAddress/modifyAddress", + "style": { + "navigationBarTitleText": "修改地址", + "navigationBarBackgroundColor": "#ffffff", //背景颜色 + "enablePullDownRefresh": true //设置参数为true + } + }, { + "path": "pages/information/information", + "style": { + "navigationBarTitleText": "完善个人信息", + "navigationBarBackgroundColor": "#ffffff", //背景颜色 + "enablePullDownRefresh": false + } }, { "path": "pages/lookrate/lookrate", @@ -38,23 +51,13 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - }, { "path": "pages/ServiceDetails/ServiceDetails", "style": { "navigationBarTitleText": "服务详情", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { - "path": "pages/ProjectDetails/ProjectDetails", - "style": { - "navigationBarTitleText": "护理项目详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { "path": "pages/goodsorderRate/goodsorderRate", "style": { @@ -62,13 +65,6 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" //背景颜色 } - }, { - "path": "pages/Bodysatelliteintegration/Bodysatelliteintegration", - "style": { - "navigationBarTitleText": "体卫融合", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } }, { "path": "pages/modify/modify", @@ -116,7 +112,6 @@ "enablePullDownRefresh": true //设置参数为true } }, - { "path": "pages/user/user", "style": { @@ -149,13 +144,13 @@ "navigationBarBackgroundColor": "#ffffff" } }, - { "path": "pages/login/login", "style": { "navigationBarTitleText": "登录", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 } }, { @@ -166,11 +161,10 @@ "navigationBarBackgroundColor": "#ffffff" //背景颜色 } }, - { "path": "pages/Nursingstationserviceorder/Nursingstationserviceorder", "style": { - "navigationBarTitleText": "护理站服务订单", + "navigationBarTitleText": "护理机构服务订单", "navigationBarBackgroundColor": "#ffffff", //背景颜色 "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true @@ -209,7 +203,6 @@ "enablePullDownRefresh": false } }, - { "path": "pages/order/order", "style": { @@ -224,17 +217,16 @@ "navigationBarTitleText": "预约详情", "enablePullDownRefresh": false } - }, { "path": "pages/homepage/homepage", "style": { "navigationBarTitleText": "泉医到家", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#ffffff", + "enablePullDownRefresh": false } }, - { "path": "pages/confirmOrder/confirmOrder", "style": { @@ -265,7 +257,6 @@ "path": "pages/ProductList/ProductList", //商品列表 "style": { "navigationBarTitleText": "医路优品", - "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true @@ -282,70 +273,88 @@ { "path": "pages/nursestation/nursestation", "style": { - "navigationBarTitleText": "护理站详情", + "navigationBarTitleText": "护理机构详情", "navigationBarBackgroundColor": "#ffffff", "onReachBottomDistance": 100, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } - }, { "path": "pages/site/site", "style": { - "navigationBarTitleText": "附近护理站", + "navigationBarTitleText": "护理机构", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff", //背景颜色 - "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "onReachBottomDistance": 100, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } }, - { - "path": "pages/detail/detail", - "style": { - "navigationBarTitleText": "护理站简介", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { "path": "pages/medicine/medicine", "style": { - "navigationBarTitleText": "就医", + "navigationBarTitleText": "健康咨询", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } }, { - "path": "pages/modifyAddress/modifyAddress", - "style": { - "navigationBarTitleText": "修改地址", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - - }, - { - "path": "pages/Doctordetails/Doctordetails", - "style": { - "navigationBarTitleText": "医生信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/Geriatricdisease/Geriatricdisease", - "style": { - "navigationBarTitleText": "老年病中心", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - - }, { "path": "pages/diseasemanagement/diseasemanagement", "style": { "navigationBarTitleText": "专病管理", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } + }, + { + "path": "pages/utabs/u-tabs", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, + { + "path": "pages/classification/classification", + "style": { + "navigationBarTitleText": "分类", + "enablePullDownRefresh": false, + "disableScroll": true + // "navigationBarBackgroundColor": "#ffffff", + // "onReachBottomDistance": 50 //距离底部多远时触发 单位为px + // "enablePullDownRefresh": true //设置参数为true + } + + }, { + "path": "pages/Healthknowledge/Healthknowledge", + "style": { + "navigationBarTitleText": "健康常识", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + + }, { + "path": "pages/Healthitem/Healthitem", + "style": { + "navigationBarTitleText": "健康常识", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, + { + "path": "pages/customerservice/customerservice", + "style": { + "navigationBarTitleText": "在线客服", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/materialbenefits/materialbenefits", + "style": { + "navigationBarTitleText": "新人福利", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + } ], "globalStyle": { @@ -366,6 +375,12 @@ "selectedIconPath": "static/homepagews.png", "text": "首页" }, + { + "pagePath": "pages/shopping/shopping", + "iconPath": "static/shoping.png", + "selectedIconPath": "static/shopingw.png", + "text": "商城" + }, { "pagePath": "pages/Personal/Personal", "iconPath": "static/userw.png", diff --git a/pages/Doctordetails/Doctordetails.vue b/pages/Doctordetails/Doctordetails.vue deleted file mode 100644 index 4c8c15f..0000000 --- a/pages/Doctordetails/Doctordetails.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - 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..69ad69b --- /dev/null +++ b/pages/Healthknowledge/Healthknowledge.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue index 1b6fdd5..afa1903 100644 --- a/pages/Personal/Personal.vue +++ b/pages/Personal/Personal.vue @@ -13,12 +13,6 @@ 我的订单 - - - - 我的家庭 - - diff --git a/pages/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss index 69a3231..ea51639 100644 --- a/pages/ProjectDetails/ProjectDetails.scss +++ b/pages/ProjectDetails/ProjectDetails.scss @@ -1,9 +1,25 @@ .app { height: 100%; - padding: 2% 2% 150rpx 2%; + padding: 0 0 0 0; padding-top: 10rpx; font-size: 34rpx; position: relative; + .swiper-box { + width: 100%; + height: 500rpx; + } + .swiper-item { + height: 500rpx; + text-align: center; + image{ + width: 100%; + height: 500rpx !important; + } + } + video{ + height: 100%; + width: 100%; + } .mask { .information { width: 70%; @@ -49,101 +65,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 ff772b7..b52d54a 100644 --- a/pages/ProjectDetails/ProjectDetails.vue +++ b/pages/ProjectDetails/ProjectDetails.vue @@ -1,28 +1,55 @@