From 3515505ffbcbd119fb5203e82cd536c5bedea726 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 1 Nov 2024 18:02:19 +0800 Subject: [PATCH] =?UTF-8?q?11.1=20=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/common.js | 11 +++ app.json | 4 +- components/navbar/navbar.js | 6 +- components/navbar/navbar.json | 2 +- components/navbar/navbar.wxml | 5 + components/navbar/navbar.wxss | 13 ++- pages/index/index.js | 17 ++++ pages/index/index.json | 3 + pages/index/index.wxml | 107 +++++++++++++++----- pages/index/index.wxss | 108 ++++++++++++++++---- pages/my/my.wxml | 2 +- patient/pages/hivConsult/hivConsult.js | 21 +++- patient/pages/hivConsult/hivConsult.json | 2 +- patient/pages/hivConsult/hivConsult.wxml | 62 ++++++------ patient/pages/hivConsult/hivConsult.wxss | 84 +++++++++++++++- patient/pages/kepuList.js | 66 +++++++++++++ patient/pages/kepuList.json | 3 + patient/pages/kepuList.wxml | 2 + patient/pages/kepuList.wxss | 1 + patient/pages/kepuList/kepuList.js | 120 +++++++++++++++++++++++ patient/pages/kepuList/kepuList.json | 8 ++ patient/pages/kepuList/kepuList.wxml | 18 ++++ patient/pages/kepuList/kepuList.wxss | 52 ++++++++++ 23 files changed, 628 insertions(+), 89 deletions(-) create mode 100644 patient/pages/kepuList.js create mode 100644 patient/pages/kepuList.json create mode 100644 patient/pages/kepuList.wxml create mode 100644 patient/pages/kepuList.wxss create mode 100644 patient/pages/kepuList/kepuList.js create mode 100644 patient/pages/kepuList/kepuList.json create mode 100644 patient/pages/kepuList/kepuList.wxml create mode 100644 patient/pages/kepuList/kepuList.wxss diff --git a/api/common.js b/api/common.js index 01b6169..81a6720 100644 --- a/api/common.js +++ b/api/common.js @@ -40,6 +40,14 @@ function popup(data){ function agreement(id){ return request('/basic/agreement/'+id,'GET',{},true) } +function kepuList(data){ + return request('/patient/article/science','GET',data,true) + +} +function AllKepuList(data){ + return request('/patient/article/science/list','GET',data,true) + +} module.exports={ serviceChatMsg, @@ -51,8 +59,11 @@ module.exports={ nation, job, chatMsg, + hotSickList, hotSearch, popup, + kepuList, + AllKepuList, agreement } diff --git a/app.json b/app.json index a582dd3..b4c5d3c 100644 --- a/app.json +++ b/app.json @@ -58,7 +58,9 @@ "pages/sickManage/sickManage", "pages/sickRecord/sickRecord", "pages/sickDetail/sickDetail", - "pages/videoList/videoList" + "pages/videoList/videoList", + "pages/kepuList", + "pages/kepuList/kepuList" ], "independent": false }, diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js index 8772db3..97a3d79 100644 --- a/components/navbar/navbar.js +++ b/components/navbar/navbar.js @@ -25,9 +25,9 @@ Component({ this.triggerEvent('handleFocus',true) }, goInquirtForm(){ - // wx.navigateTo({ - // url: '/healthyService/pages/visitList/visitList', - // }) + wx.navigateTo({ + url: '/patient/pages/kepuList/kepuList', + }) } }, diff --git a/components/navbar/navbar.json b/components/navbar/navbar.json index 79be446..d9c985d 100644 --- a/components/navbar/navbar.json +++ b/components/navbar/navbar.json @@ -1,5 +1,5 @@ { "usingComponents": { - + "van-icon": "@vant/weapp/icon/index" } } \ No newline at end of file diff --git a/components/navbar/navbar.wxml b/components/navbar/navbar.wxml index baeac9d..1ee29d0 100644 --- a/components/navbar/navbar.wxml +++ b/components/navbar/navbar.wxml @@ -2,6 +2,11 @@ 肝胆相照互联网医院 + + + 国家卫健委认证医疗机构・深耕肝病领域10余年 + + diff --git a/components/navbar/navbar.wxss b/components/navbar/navbar.wxss index c70f9df..ecc818d 100644 --- a/components/navbar/navbar.wxss +++ b/components/navbar/navbar.wxss @@ -20,12 +20,13 @@ border-radius: 40rpx; box-shadow: 0px 4px 10px 0px rgba(153, 153, 153, 0.5); align-items: center; - margin-top: 55rpx; + margin-top:20rpx; } .barcontain .text { font-size: 40rpx; color: #fff; + margin-left: 8rpx; } .barcon .ss { @@ -40,4 +41,14 @@ font-size: 32rpx; height: 80rpx; +} +.titlebox{ + font-weight: 400; + margin-top: 15rpx; + display: flex; + align-items: center; +} +.titlebox .text{ + font-size: 20rpx; + color: #fff; } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 21ca93c..1f35fa2 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -12,6 +12,7 @@ Page({ showCode:false, isOld:false, codeMsg:'', + active:0, showEntryTip:false, showEntryTip_second:false, beforeClose(action){ @@ -35,6 +36,12 @@ Page({ popupData:null }, + onChange(event){ + console.log(event.detail.name) + this.setData({ + active:event.detail.name + }) + }, confirm:throttle(function(event){ if(event.detail){ this.handelDelDoctor(); @@ -290,6 +297,16 @@ Page({ // }) }), + goHealth:throttle(function(){ + app.method.navigateTo({ + url: '/healthyService/pages/healthyIntro/healthyIntro' + }) +}), +goVisit:throttle(function(){ + app.method.navigateTo({ + url: '/healthyService/pages/visitList/visitList' + }) +}), watchBack(){ let total=app.globalData.totalUnread; setBarData(total) diff --git a/pages/index/index.json b/pages/index/index.json index 6edc58e..368c6f0 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -3,6 +3,9 @@ "nav-bar": "/components/navbar/navbar", "van-overlay": "@vant/weapp/overlay/index", "van-dialog": "@vant/weapp/dialog/index", + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "van-icon": "@vant/weapp/icon/index", "dialog":"/components/dialog/dialog" }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 0338883..27e45f3 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -61,65 +61,84 @@ 找专家 - - + + - 专业医生，服务保障 + 30多位主任医师 + 专业医生，服务保障 - + + - HIV - - + 问诊购药 + + - 恐艾咨询，健康指导 - + 30多种常用处方药品 + + + 正品无忧，品质护航 - + + - + --> - - - + + + + 特惠问诊 - - - 肝胆商城 + + + + + 合并HIV + + + + + 健康包 + + + + + 随访包 - + 糖组检测 - + + + - + - + - + + - 推荐医生 + + + + + + 更多 + - + + @@ -181,6 +208,34 @@ + + + + + + + + + + + {{item.user_name}} + {{item.hospital_level_name}} + 可处方 + + {{item.doctor_title}}{{item.department_custom_name}} + {{item.hospital_name}} + 擅长：{{item.be_good_at}} + + {{item.days}}天内服务过您 + 复诊咨询 + + + + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 2b5dfd6..c572bba 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -19,11 +19,22 @@ } .wenzhencell { - flex: 1; - padding: 20rpx 20rpx 40rpx; - background: #E0FFFE; + position: relative; + width:312rpx; + height:182rpx; + /* flex: 1; + padding: 20rpx 20rpx 40rpx; */ + border-radius: 10rpx; } +.wenzhencell .bg{ + top:0; + left:0; + width:100%; + margin-left: 0; + bottom:0; + position: absolute; +} .wenzhencell image { width: 80rpx; @@ -55,13 +66,20 @@ font-size: 40rpx; } .wenzhencell .row .name_title{ - width:160rpx + width:160rpx; + margin-top: 20rpx; + position: relative; + margin-left: 16rpx; + z-index:1; } .wenzhencell .desc { + position: relative; + z-index:1; + margin-left: 16rpx; margin-top: 16rpx; - color: #666; - font-size: 28rpx; + font-size: 22rpx; + color: #878787; } .buybox { @@ -99,32 +117,62 @@ } .cellbox .cell { - padding: 28rpx 0; - display: flex; - width: 216rpx; + position: relative; + display: inline-flex; + width:130rpx; + height:124rpx; flex-direction: column; + justify-content: center; align-items: center; background-color: #fff; margin-left: 20rpx; border-radius: 10rpx; } - +.cellbox .tese{ + position: absolute; + right:0; + top:0; + width: 76rpx; + height:22rpx; +} .cellbox .cell:first-child { margin-left: 0rpx; } - +.cellbox .cellimg{ + margin-top: 14rpx; + width:58rpx; + height:58rpx; +} .cellbox image { width: 98rpx; height: 98rpx; } .cellbox .name { - font-size: 28rpx; - font-weight: 600; - margin-top: 18rpx; + font-size: 20rpx; + + margin-top: 5rpx; color: #333; } - +.consultbox .service{ + border:none; + font-size: 24rpx; + color: #3CC7C0; + padding: 0; + margin-top: 0; +} +.consultbox .zixun{ + width: 160rpx; +height: 60rpx; +display: flex; +justify-content: center; +align-items: center; +background: #3CC7C0; +border-radius: 30rpx; +font-weight: 400; +font-size: 28rpx; +color: #FFFFFF; +} .ad { width: 100%; @@ -136,21 +184,37 @@ border-radius: 10rpx; } .swiper{ - height:168rpx; + height:112rpx; + overflow: hidden; + border-radius: 10rpx; } .swiper-item .swiperimg{ width:100%; + border-radius: 10rpx; - height:110rpx; + height:112rpx; } .mydoctor { width: 100%; } - +.titlebox .van-tab--active{ + font-size: 30rpx; +} +.titlebox .van-tabs__line{ + bottom:16rpx; +} +.titlebox .more{ + margin-right: 20rpx; + display: flex; + font-size: 28rpx; + color: #666666; + align-items: center; +} .titlebox { margin-top: 10rpx; display: flex; - padding: 20rpx 0; + background-color: #fff; + /* padding: 20rpx 0; */ width: 100%; align-items: center; justify-content: space-between; @@ -305,6 +369,10 @@ justify-content: center; align-items: center; } +.recommend{ + overflow: hidden; + border-radius: 30rpx; +} .service { height: 40rpx; border-radius: 20rpx; @@ -320,7 +388,7 @@ .viewbox { width: 100%; overflow: hidden; - border-radius: 10rpx; + margin-top: -20rpx; margin-bottom: 10rpx; } diff --git a/pages/my/my.wxml b/pages/my/my.wxml index 0b4197a..c0756bd 100644 --- a/pages/my/my.wxml +++ b/pages/my/my.wxml @@ -102,7 +102,7 @@ - 资质协议和患者知情同意书 + 资质协议 diff --git a/patient/pages/hivConsult/hivConsult.js b/patient/pages/hivConsult/hivConsult.js index 269c51e..8ac7b2e 100644 --- a/patient/pages/hivConsult/hivConsult.js +++ b/patient/pages/hivConsult/hivConsult.js @@ -1,7 +1,7 @@ // pages/expertConsult/expertConsult.js const app = getApp() import {doctorList,getProvince,getCity,getCountry} from "../../../api/consultExpert" -import {sickType} from "../../../api/common" +import {sickType,AllKepuList} from "../../../api/common" let provinceArr=[{area_id:'', area_name: "全国"}]; let cityArr=[]; import {throttle} from "../../../utils/util" @@ -19,6 +19,7 @@ Page({ province_id:'', city_id:'', keyword:'', + articeList:[], lock:false, is_online:0, sort_order:1, @@ -62,6 +63,23 @@ Page({ delta: 1, }) }, + getArticleList(){ + + AllKepuList({ + basic_class_id:1 + }).then((res)=>{ + console.log(res); + this.setData({ + articeList:res + }); + + }) + }, + goArticle:throttle(function(event){ + app.method.navigateTo({ + url:"/patient/pages/linkPage/linkPage?url="+encodeURIComponent(event.currentTarget.dataset.url) + }) + }), toggleOnline(){ this.setData({ is_online:this.data.is_online==0?1:0 @@ -237,6 +255,7 @@ Page({ lock:true, isTriggered:false }); + this.getArticleList(); return false; }else{ this.setData({ diff --git a/patient/pages/hivConsult/hivConsult.json b/patient/pages/hivConsult/hivConsult.json index 32d5dba..3e93a82 100644 --- a/patient/pages/hivConsult/hivConsult.json +++ b/patient/pages/hivConsult/hivConsult.json @@ -3,7 +3,7 @@ "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", "van-dropdown-item": "@vant/weapp/dropdown-item/index", "van-picker": "@vant/weapp/picker/index", - + "van-image": "@vant/weapp/image/index", "van-popup": "@vant/weapp/popup/index", "van-sticky": "@vant/weapp/sticky/index", "nav":"../../../components/nav/nav" diff --git a/patient/pages/hivConsult/hivConsult.wxml b/patient/pages/hivConsult/hivConsult.wxml index a9a7cfb..0fd6bd0 100644 --- a/patient/pages/hivConsult/hivConsult.wxml +++ b/patient/pages/hivConsult/hivConsult.wxml @@ -3,8 +3,9 @@ - - + + - + - + + @@ -68,34 +70,30 @@ - - 暂无数据！ - + + + + + + +patient/pages/kepuList.wxml \ No newline at end of file diff --git a/patient/pages/kepuList.wxss b/patient/pages/kepuList.wxss new file mode 100644 index 0000000..1a4dfd4 --- /dev/null +++ b/patient/pages/kepuList.wxss @@ -0,0 +1 @@ +/* patient/pages/kepuList.wxss */ \ No newline at end of file diff --git a/patient/pages/kepuList/kepuList.js b/patient/pages/kepuList/kepuList.js new file mode 100644 index 0000000..ad3c19f --- /dev/null +++ b/patient/pages/kepuList/kepuList.js @@ -0,0 +1,120 @@ +// patient/pages/kepuList/kepuList.js +import {kepuList} from "../../../api/common" +import {throttle} from "../../../utils/util" +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + isTriggered:false, + page:1, + keyword:'', + lock:false, + list:[] + }, + handleRefresher(){ + this.setData({ + lock:false, + page:1, + list:[] + }); + this.getList() + }, + getList(){ + let {page,keyword}=this.data; + kepuList({ + keyword:keyword, + page:page, + per_page:10 + }).then((res)=>{ + console.log(res) + let {list}=this.data; + if(res.data.length==0){ + this.setData({ + lock:true, + isTriggered:false + }); + return false; + }else{ + this.setData({ + isTriggered:false, + list:list.concat(res.data) + }) + } + console.log(this.data.list) + + }) + }, + goArticle:throttle(function(event){ + app.method.navigateTo({ + url:"/patient/pages/linkPage/linkPage?url="+encodeURIComponent(event.currentTarget.dataset.url) + }) + }), + lower(e) { + let {lock}=this.data; + let addPage=this.data.page+1; + if(!lock){ + this.setData({ + page:addPage + }); + this.getList(); + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getList() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/patient/pages/kepuList/kepuList.json b/patient/pages/kepuList/kepuList.json new file mode 100644 index 0000000..3174442 --- /dev/null +++ b/patient/pages/kepuList/kepuList.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "nav":"../../../components/nav/nav", + "van-image": "@vant/weapp/image/index" + }, + "navigationStyle":"custom", + "disableScroll":true +} \ No newline at end of file diff --git a/patient/pages/kepuList/kepuList.wxml b/patient/pages/kepuList/kepuList.wxml new file mode 100644 index 0000000..c722b5a --- /dev/null +++ b/patient/pages/kepuList/kepuList.wxml @@ -0,0 +1,18 @@ + + + + + + + {{item.article_title}} + + + {{item.article_science_source.source_name}} + + + + + + + + \ No newline at end of file diff --git a/patient/pages/kepuList/kepuList.wxss b/patient/pages/kepuList/kepuList.wxss new file mode 100644 index 0000000..cbab6ce --- /dev/null +++ b/patient/pages/kepuList/kepuList.wxss @@ -0,0 +1,52 @@ +/* patient/pages/kepuList/kepuList.wxss */ +.scrollwraper{ + margin-top: 172rpx; + height:calc(100vh - 172rpx); +} +.cell{ + overflow: hidden; + border-bottom: 1rpx solid #E7E7E7; + display: flex; + margin:0 30rpx; + align-items: center; + justify-content: space-between; + padding:30rpx 0; + background-color: #fff; +} +.article_img{ + border-radius: 10rpx; + width: 254rpx; + object-fit: cover; + height: 154rpx; +} +.title{ + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; +font-weight: 400; +line-height: 43rpx; +font-size: 30rpx; +color: #333333; +} +.origin{ + display: flex; + align-items:center ; +} +.left{ + flex:1; + margin-right: 28rpx; + display: flex; + height: 154rpx; + flex-direction: column; + justify-content: space-between; +} +.originname{ + margin-left: 10rpx; + font-size: 24rpx; + color: #666666; +} +.logo{ + height:38rpx; +} \ No newline at end of file