diff --git a/pages/index/index.wxml b/pages/index/index.wxml index a9bcbd9..7902615 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -107,7 +107,7 @@ - + 合并HIV diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 16c285a..08f949f 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -132,8 +132,7 @@ position: absolute; right:0; top:0; - width: 76rpx; - height:22rpx; + width: 90rpx; } .cellbox .cell:first-child { margin-left: 0rpx; diff --git a/patient/pages/hivConsult/hivConsult.js b/patient/pages/hivConsult/hivConsult.js index 8ac7b2e..2fa0753 100644 --- a/patient/pages/hivConsult/hivConsult.js +++ b/patient/pages/hivConsult/hivConsult.js @@ -1,9 +1,7 @@ // pages/expertConsult/expertConsult.js const app = getApp() -import {doctorList,getProvince,getCity,getCountry} from "../../../api/consultExpert" -import {sickType,AllKepuList} from "../../../api/common" -let provinceArr=[{area_id:'', area_name: "全国"}]; -let cityArr=[]; +import {doctorList} from "../../../api/consultExpert" +import {AllKepuList} from "../../../api/common" import {throttle} from "../../../utils/util" Page({ @@ -37,6 +35,7 @@ Page({ { text: '服务数从多到少', value: 5}, ], overlay:true, + showBg:false, selectkind:false, selectkarea:false, position:"全国", @@ -86,27 +85,6 @@ Page({ }) this.onfresh(); }, - onScroll(event) { - let {doctorList}=this.data; - wx.createSelectorQuery().select('#scroller') - .boundingClientRect((res) => { - let H=0; - if(event.detail.scrollTop>78){ - if(doctorList.length<=3){ - H=53; - }else{ - H=1; - } - - }else{ - H=53 - } - this.setData({ - scrollHeight:H - }); - - }).exec(); - }, transforpage(arr) { const pages = []; let L= Math.ceil(arr.length / 2); @@ -218,13 +196,7 @@ Page({ /** * 生命周期函数--监听页面加载 */ - getSickType(){ - sickType().then((res)=>{ - this.setData({ - sickList:this.transforpage(res) - }) - }) - }, + handleRefresher(){ this.setData({ @@ -253,12 +225,15 @@ Page({ if(res.data.length==0){ this.setData({ lock:true, + showBg:true, isTriggered:false }); this.getArticleList(); return false; }else{ + this.setData({ + showBg:true, isTriggered:false, doctorList:doctorList.concat(res.data) }) @@ -267,51 +242,18 @@ Page({ }) }, - provinceList(){ - getProvince().then((res)=>{ - provinceArr= provinceArr.concat(res); - let province=[{area_id:'', area_name: "全国"}];// - for (let i = 0; i < res.length; i++) { - province.push(res[i]); - }; - this.setData({ - 'columns[0].values':province - }) - //this.cityList(province[0].area_id); - - }) - }, - cityList(area_id){ - getCity({ - area_id:area_id - }).then((res)=>{ - - cityArr=res; - let city=[]; - for (let i = 0; i < res.length; i++) { - city.push(res[i]); - }; - this.setData({ - 'columns[1].values':city, - - }) - //this.countryList(res[0].area_id); - }) - }, - countryList(area_id){ - getCountry({ - area_id:area_id - }).then((res)=>{ - let area=[]; - for (let i = 0; i < res.length; i++) { - area.push(res[i]); - }; - this.setData({ - 'columns[2].values':area, - isLoding:false - }) - }) - }, + onScroll(event) { + + wx.createSelectorQuery().select('#scroller') + .boundingClientRect((res) => { + console.log(event.detail.scrollTop) + if(event.detail.scrollTop>1600){ + this.lower(); + } + + + }).exec(); + }, onfresh(){ this.setData({ page:1, @@ -350,9 +292,9 @@ Page({ inquiry_mode:1 }) } - this.getSickType(); + this.getDoctorList(); - this.provinceList(); + }, diff --git a/patient/pages/hivConsult/hivConsult.wxml b/patient/pages/hivConsult/hivConsult.wxml index 208d839..1c8cae1 100644 --- a/patient/pages/hivConsult/hivConsult.wxml +++ b/patient/pages/hivConsult/hivConsult.wxml @@ -2,39 +2,12 @@ - - - - - - - - - - - - - + + + + @@ -70,31 +43,31 @@ - - - 关于HIV你知道多少? - - - - {{item.article_title}} - - - {{item.article_science_source.source_name}} - - - - - - - - - - + + + + + 关于HIV你知道多少? + + + + {{item.article_title}} + + + {{item.article_science_source.source_name}} + + + + + + + + + + - -