Commit 17c3a5d174cf656068280dd119bf22c1778211b8
1 parent
1bdb751f2f
Exists in
master
and in
2 other branches
bug修改
Showing 7 changed files with 15 additions and 16 deletions
- littleApp_child/app.json
- littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js
- littleApp_child/pages/home/home.js
- littleApp_child/pages/home/home.wxss
- littleApp_child/pages/hospitalList/hospitalList.js
- littleApp_child/pages/hospital_detail/hospital_detail.wxml
- littleApp_child/pages/login/login.js
littleApp_child/app.json
View file @
17c3a5d
1 | 1 | { |
2 | 2 | "pages": [ |
3 | - | |
4 | 3 | |
4 | + | |
5 | 5 | "pages/home/home", |
6 | 6 | "pages/Setting/Setting", |
7 | 7 | "pages/PersonalInfo/PersonalInfo", |
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 | "pages/SearchPage/SearchPage", |
14 | 14 | "pages/login/login", |
15 | 15 | "pages/inspectionReport/inspectionReport", |
16 | - | |
16 | + "pages/CompleteTouristInfo/CompleteTouristInfo", | |
17 | 17 | "pages/doctor_detail/doctor_detail", |
18 | 18 | "pages/doctorList/doctorList", |
19 | 19 | "pages/hospital_detail/hospital_detail", |
... | ... | @@ -23,7 +23,7 @@ |
23 | 23 | "pages/system_notifacations/system_notifacations", |
24 | 24 | "pages/vipService/vipService", |
25 | 25 | "pages/childcare_knowledge/childcare_knowledge", |
26 | - "pages/CompleteTouristInfo/CompleteTouristInfo", | |
26 | + | |
27 | 27 | "pages/Register/Register" |
28 | 28 | |
29 | 29 | ], |
littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js
View file @
17c3a5d
... | ... | @@ -43,10 +43,10 @@ |
43 | 43 | this.setData({ showErr: true }) |
44 | 44 | return |
45 | 45 | } |
46 | - // if (!e.detail.value.name || e.detail.value.name == ''){ | |
47 | - // this.setData({ showErr:true}) | |
48 | - // return | |
49 | - // } | |
46 | + if (!e.detail.value.name || e.detail.value.name == ''){ | |
47 | + this.setData({ showErr:true}) | |
48 | + return | |
49 | + } | |
50 | 50 | this.setData({ showErr: false }) |
51 | 51 | networkUtil.showLoading() |
52 | 52 | getApp().globalData.token = token |
... | ... | @@ -68,7 +68,6 @@ |
68 | 68 | }, |
69 | 69 | loginSuccess() { |
70 | 70 | // 游客用户 |
71 | - data.patientIds = userId | |
72 | 71 | getApp().globalData.tourist = true |
73 | 72 | wx.setStorageSync('tourist', true) |
74 | 73 | wx.setStorageSync('userToken',token) |
littleApp_child/pages/home/home.js
View file @
17c3a5d
... | ... | @@ -417,8 +417,6 @@ |
417 | 417 | } |
418 | 418 | wx.setStorageSync('userToken', data.token) |
419 | 419 | wx.setStorageSync('userId', data.patientIds) |
420 | - wx.setStorageSync('hxName', data.hxName) | |
421 | - wx.setStorageSync('hxPassWord', data.hxPassWord) | |
422 | 420 | getApp().globalData.token = data.token |
423 | 421 | getApp().globalData.userId = data.patientIds |
424 | 422 | getApp().globalData.currentId = data.patientIds[0] |
littleApp_child/pages/home/home.wxss
View file @
17c3a5d
littleApp_child/pages/hospitalList/hospitalList.js
View file @
17c3a5d
... | ... | @@ -33,7 +33,11 @@ |
33 | 33 | /*---------生命周期--------*/ |
34 | 34 | onLoad: function (options) { |
35 | 35 | networkUtil.showLoading() |
36 | - this.getUserLocation() | |
36 | + var self = this | |
37 | + setTimeout(function(){ | |
38 | + self.getUserLocation() | |
39 | + },1000) | |
40 | + // this.getUserLocation() | |
37 | 41 | // this.requestData() |
38 | 42 | }, |
39 | 43 |
littleApp_child/pages/hospital_detail/hospital_detail.wxml
View file @
17c3a5d
... | ... | @@ -8,8 +8,8 @@ |
8 | 8 | <image class="icon_more" src="../../source/gengduo.png" bindtap='showOtherHospital'></image> |
9 | 9 | </view> |
10 | 10 | <view> |
11 | - <view class="hospital_introduce1" wx:if="{{!showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction}}</view> | |
12 | - <view class="hospital_introduce_All" wx:if="{{showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction}}</view> | |
11 | + <view class="hospital_introduce1" wx:if="{{!showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction ? hospital.introduction : '暂无介绍信息'}}</view> | |
12 | + <view class="hospital_introduce_All" wx:if="{{showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction ? hospital.introduction : '暂无介绍信息'}}</view> | |
13 | 13 | <!-- <view class="hospital_introduce1" style='position:absolute;bottom:0;right:0;background:#fff'>展开</view> --> |
14 | 14 | </view> |
15 | 15 |
littleApp_child/pages/login/login.js
View file @
17c3a5d
... | ... | @@ -103,8 +103,6 @@ |
103 | 103 | loginSuccess(data) { |
104 | 104 | console.log(data) |
105 | 105 | wx.setStorageSync('userToken', data.token) |
106 | - wx.setStorageSync('hxName', data.hxName) | |
107 | - wx.setStorageSync('hxPassWord', data.hxPassWord) | |
108 | 106 | getApp().globalData.token = data.token |
109 | 107 | // wx.navigateTo({ |
110 | 108 | // url: '../HasDocumentedVerifySuccess/HasDocumentedVerifySuccess?name=' + name |