Commit 9356464c02a02f72e0b33d736d7fd33606cfeedd
1 parent
29d0052aae
Exists in
master
消息
Showing 19 changed files with 55 additions and 29 deletions
- woman/app.json
- woman/pages/home/home.js
- woman/pages/home/home.wxml
- woman/pages/message/message.json
- woman/pages/message/message.wxml
- woman/pages/message/message.wxss
- woman/pages/mine/mine.js
- woman/pages/mine/mine.wxml
- woman/pages/mine/mine.wxss
- woman/source/imageSource/bg/message.png
- woman/source/imageSource/icon/home.png
- woman/source/imageSource/icon/homeHL.png
- woman/source/imageSource/icon/hospital.png
- woman/source/imageSource/icon/info.png
- woman/source/imageSource/icon/message.png
- woman/source/imageSource/icon/mine.png
- woman/source/imageSource/icon/mineHL.png
- woman/source/imageSource/icon/pull.png
- woman/utils/network_util.js
woman/app.json
View file @
9356464
| ... | ... | @@ -33,14 +33,14 @@ |
| 33 | 33 | "borderStyle": "white", |
| 34 | 34 | "list": [ |
| 35 | 35 | { |
| 36 | - "selectedIconPath": "/source/imageSource/doctorIcon.png", | |
| 37 | - "iconPath": "/source/imageSource/doctorIcon.png", | |
| 36 | + "selectedIconPath": "/source/imageSource/icon/homeHL.png", | |
| 37 | + "iconPath": "/source/imageSource/icon/home.png", | |
| 38 | 38 | "pagePath": "pages/home/home", |
| 39 | 39 | "text": "首页" |
| 40 | 40 | }, |
| 41 | 41 | { |
| 42 | - "selectedIconPath": "/source/imageSource/doctorIcon.png", | |
| 43 | - "iconPath": "/source/imageSource/doctorIcon.png", | |
| 42 | + "selectedIconPath": "/source/imageSource/icon/mineHL.png", | |
| 43 | + "iconPath": "/source/imageSource/icon/mine.png", | |
| 44 | 44 | "pagePath": "pages/mine/mine", |
| 45 | 45 | "text": "我的" |
| 46 | 46 | } |
woman/pages/home/home.js
View file @
9356464
| ... | ... | @@ -123,7 +123,7 @@ |
| 123 | 123 | this.documentPage() |
| 124 | 124 | } else { |
| 125 | 125 | networkUtil.showLoading() |
| 126 | - this.getUserInfo() | |
| 126 | + // this.getUserInfo() | |
| 127 | 127 | this.homePage() |
| 128 | 128 | |
| 129 | 129 | // 监听事件 |
| 130 | 130 | |
| 131 | 131 | |
| ... | ... | @@ -176,12 +176,12 @@ |
| 176 | 176 | /*---------交互--------*/ |
| 177 | 177 | // 下拉刷新回调接口 |
| 178 | 178 | onPullDownRefresh: function() { |
| 179 | - if (app.globalData.token == null || app.globalData.token == '' || this.data.isDocument == 3 || this.data.isDocument == 4) { | |
| 179 | + /* if (app.globalData.token == null || app.globalData.token == '' || this.data.isDocument == 3 || this.data.isDocument == 4) { | |
| 180 | 180 | wx.stopPullDownRefresh() |
| 181 | 181 | return |
| 182 | - } | |
| 182 | + } */ | |
| 183 | 183 | // 网络请求,重新请求一遍数据 |
| 184 | - this.requestData() | |
| 184 | + // this.requestData() | |
| 185 | 185 | }, |
| 186 | 186 | requestData() { |
| 187 | 187 | this.getUserInfo() |
| ... | ... | @@ -443,7 +443,7 @@ |
| 443 | 443 | if (res.data.hospitalId) app.globalData.hospitalId = res.data.hospitalId |
| 444 | 444 | self.hasQuestion() |
| 445 | 445 | self.setData({ |
| 446 | - articleList: res.data.list, | |
| 446 | + // articleList: res.data.list, | |
| 447 | 447 | hospitalId: res.data.hospitalId |
| 448 | 448 | }) |
| 449 | 449 | self.getDoctorList() |
| ... | ... | @@ -464,7 +464,7 @@ |
| 464 | 464 | }, |
| 465 | 465 | getDoctorList(keyword) { |
| 466 | 466 | var self = this |
| 467 | - networkUtil.showLoading() | |
| 467 | + // networkUtil.showLoading() | |
| 468 | 468 | // 医生列表 |
| 469 | 469 | networkUtil._get(api.TeamdoctorList, { |
| 470 | 470 | page: 0, |
| ... | ... | @@ -572,7 +572,7 @@ |
| 572 | 572 | }) |
| 573 | 573 | |
| 574 | 574 | }, function(res) { |
| 575 | - | |
| 575 | + | |
| 576 | 576 | }) |
| 577 | 577 | }, |
| 578 | 578 | getHighRiskArticles(days, riskVIP) { |
| ... | ... | @@ -602,7 +602,7 @@ |
| 602 | 602 | patientId: app.globalData.userInfo.patientId |
| 603 | 603 | }, function(res) { |
| 604 | 604 | |
| 605 | - self.requestData() | |
| 605 | + //self.requestData() | |
| 606 | 606 | }, function(res) { |
| 607 | 607 | |
| 608 | 608 | wx.stopPullDownRefresh() |
| ... | ... | @@ -802,7 +802,7 @@ |
| 802 | 802 | // 切换tabbar |
| 803 | 803 | tabBar_clickLeft() { |
| 804 | 804 | // 下载介绍图 |
| 805 | - networkUtil.checkIsNeedDownload() | |
| 805 | + // networkUtil.checkIsNeedDownload() | |
| 806 | 806 | this.setData({ |
| 807 | 807 | isDocument: 2, |
| 808 | 808 | tabBar: { |
| ... | ... | @@ -814,7 +814,7 @@ |
| 814 | 814 | }, |
| 815 | 815 | tabBar_clickMiddle(){ |
| 816 | 816 | // 下载介绍图 |
| 817 | - networkUtil.checkIsNeedDownload() | |
| 817 | + // networkUtil.checkIsNeedDownload() | |
| 818 | 818 | this.setData({ |
| 819 | 819 | isDocument: 3, |
| 820 | 820 | tabBar: { |
| ... | ... | @@ -829,7 +829,7 @@ |
| 829 | 829 | if(!this.data.docList){ |
| 830 | 830 | this.getDoctorList() |
| 831 | 831 | } |
| 832 | - networkUtil.checkIsNeedDownload() | |
| 832 | + // networkUtil.checkIsNeedDownload() | |
| 833 | 833 | this.setData({ |
| 834 | 834 | isDocument: 4, |
| 835 | 835 | tabBar: { |
| ... | ... | @@ -884,7 +884,7 @@ |
| 884 | 884 | }, |
| 885 | 885 | showAdvertisingPage(list) { |
| 886 | 886 | var self = this |
| 887 | - this.setData({ list: list, showAdvertising: true }) | |
| 887 | + // this.setData({ list: list, showAdvertising: true }) | |
| 888 | 888 | wx.setNavigationBarTitle({ |
| 889 | 889 | title: '', |
| 890 | 890 | }) |
woman/pages/home/home.wxml
View file @
9356464
woman/pages/message/message.json
View file @
9356464
woman/pages/message/message.wxml
View file @
9356464
woman/pages/message/message.wxss
View file @
9356464
| 1 | 1 | /* pages/message/message.wxss */ |
| 2 | +.bg{ | |
| 3 | + width: 528rpx; | |
| 4 | + height: 490rpx; | |
| 5 | + margin: 50rpx auto; | |
| 6 | +} | |
| 7 | +.text{ | |
| 8 | + | |
| 9 | + height: 42rpx; | |
| 10 | + font-size: 30rpx; | |
| 11 | + font-family: PingFang SC-Regular, PingFang SC; | |
| 12 | + font-weight: 400; | |
| 13 | + line-height: 35rpx; | |
| 14 | + background: linear-gradient(135deg, #FFB4B4 0%, #FF8EA9 100%); | |
| 15 | + -webkit-background-clip: text; | |
| 16 | + -webkit-text-fill-color: transparent; | |
| 17 | +} |
woman/pages/mine/mine.js
View file @
9356464
woman/pages/mine/mine.wxml
View file @
9356464
| ... | ... | @@ -16,9 +16,9 @@ |
| 16 | 16 | <view class="mine_btn">个人资料</view> |
| 17 | 17 | </view> |
| 18 | 18 | <!-- 菜单栏 --> |
| 19 | - <view class="i-row i-between i-align-center margin-lr42 margin-t40 "> | |
| 19 | + <view class="i-row i-between i-align-center margin-lr42 margin-t40 " bindtap="goMessage"> | |
| 20 | 20 | <view class="i-row i-align-center"> |
| 21 | - <view class="mine_icon"> </view> | |
| 21 | + <image class="mine_icon" src="../../source/imageSource/icon/message.png"></image> | |
| 22 | 22 | <view class="font-4F4F4F-34 margin-l20">消息推送</view> |
| 23 | 23 | </view> |
| 24 | 24 | <image class="icon-next" src="../../source/imageSource/icon/arrow_right.png"> </image> |
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | |
| 28 | 28 | <view class="i-row i-between i-align-center margin-lr42 margin-t40 " bindtap="goHospitalDetail"> |
| 29 | 29 | <view class="i-row i-align-center"> |
| 30 | - <view class="mine_icon"> </view> | |
| 30 | + <image class="mine_icon" src="../../source/imageSource/icon/hospital.png"></image> | |
| 31 | 31 | <view class="font-4F4F4F-34 margin-l20">医院介绍</view> |
| 32 | 32 | </view> |
| 33 | 33 | <image class="icon-next" src="../../source/imageSource/icon/arrow_right.png"> </image> |
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | |
| 37 | 37 | <view class="i-row i-between i-align-center margin-lr42 margin-t40" bindtap="goInfo"> |
| 38 | 38 | <view class="i-row i-align-center"> |
| 39 | - <view class="mine_icon"> </view> | |
| 39 | + <image class="mine_icon" src="../../source/imageSource/icon/info.png"></image> | |
| 40 | 40 | <view class="font-4F4F4F-34 margin-l20">档案查看</view> |
| 41 | 41 | </view> |
| 42 | 42 | <image class="icon-next" src="../../source/imageSource/icon/arrow_right.png"> </image> |
woman/pages/mine/mine.wxss
View file @
9356464
woman/source/imageSource/bg/message.png
View file @
9356464
63.2 KB
woman/source/imageSource/icon/home.png
View file @
9356464
843 Bytes
woman/source/imageSource/icon/homeHL.png
View file @
9356464
1.85 KB
woman/source/imageSource/icon/hospital.png
View file @
9356464
1.34 KB
woman/source/imageSource/icon/info.png
View file @
9356464
1.53 KB
woman/source/imageSource/icon/message.png
View file @
9356464
1.03 KB
woman/source/imageSource/icon/mine.png
View file @
9356464
790 Bytes
woman/source/imageSource/icon/mineHL.png
View file @
9356464
1.53 KB
woman/source/imageSource/icon/pull.png
View file @
9356464
578 Bytes
woman/utils/network_util.js
View file @
9356464
| ... | ... | @@ -216,11 +216,11 @@ |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | function showLoading(text) { |
| 219 | - wx.showToast({ | |
| 219 | + /* wx.showToast({ | |
| 220 | 220 | title: text == null ? '加载中...' : text, |
| 221 | 221 | icon: 'loading', |
| 222 | 222 | duration: 60000 |
| 223 | - }) | |
| 223 | + }) */ | |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | function showErrorToast(text) { |