Commit 9f469404b6f826fe52de8d02c3c897df581c6319

Authored by wangfan
1 parent 2cf27647

ui fix

@@ -25,11 +25,13 @@ Component({ @@ -25,11 +25,13 @@ Component({
25 this.setData({ 25 this.setData({
26 network:true, 26 network:true,
27 }) 27 })
  28 + this.triggerEvent('network',res);
28 }).catch(res=>{ 29 }).catch(res=>{
29 this.setData({ 30 this.setData({
30 network:false, 31 network:false,
31 msg:res.msg 32 msg:res.msg
32 }) 33 })
  34 + this.triggerEvent('network',res);
33 }) 35 })
34 }, 36 },
35 detached(){ 37 detached(){
@@ -44,12 +46,13 @@ Component({ @@ -44,12 +46,13 @@ Component({
44 wx.getNetworkType({ 46 wx.getNetworkType({
45 success: function (res) { 47 success: function (res) {
46 var title = '' 48 var title = ''
47 - if (res.networkType == '2g' || res.networkType == '3g' || res.networkType == 'unknown') {  
48 - fail({type:res.networkType,msg:'当前网络不给力,请稍后重试'}); 49 + //if (res.networkType == '2g' || res.networkType == '3g' || res.networkType == 'unknown') {
  50 + if (res.networkType == 'unknown') {
  51 + fail({hasWork:false,type:res.networkType,msg:'当前网络不给力,请稍后重试'});
49 } else if (res.networkType == 'none') { 52 } else if (res.networkType == 'none') {
50 - fail({type:res.networkType,msg:'当前暂未连接任何网络,请稍候重试'}); 53 + fail({hasWork:false,type:res.networkType,msg:'当前暂未连接任何网络,请稍候重试'});
51 } else { 54 } else {
52 - success({type:res.networkType}); 55 + success({hasWork:true,type:res.networkType});
53 } 56 }
54 } 57 }
55 }); 58 });
@@ -73,6 +76,8 @@ Component({ @@ -73,6 +76,8 @@ Component({
73 wx.reLaunch({ 76 wx.reLaunch({
74 url: '/'+p.route+'?'+param.join('&') 77 url: '/'+p.route+'?'+param.join('&')
75 }) 78 })
  79 + }).catch((res)=>{
  80 + console.log('this.network.catch',res)
76 }) 81 })
77 }, 82 },
78 show(msg=''){ 83 show(msg=''){
@@ -7,7 +7,9 @@ Page({ @@ -7,7 +7,9 @@ Page({
7 /** 7 /**
8 * 页面的初始数据 8 * 页面的初始数据
9 */ 9 */
10 - data: {}, 10 + data: {
  11 + loadHidden:false,
  12 + },
11 13
12 /** 14 /**
13 * 生命周期函数--监听页面加载 15 * 生命周期函数--监听页面加载
@@ -26,7 +28,6 @@ Page({ @@ -26,7 +28,6 @@ Page({
26 }) 28 })
27 this.selectComponent("#network").debug(opt, 'scene'); 29 this.selectComponent("#network").debug(opt, 'scene');
28 } 30 }
29 -  
30 opt.openid = await this.getOpenid(); 31 opt.openid = await this.getOpenid();
31 if (!opt.openid) { 32 if (!opt.openid) {
32 console.log('App.Orders.CheckOrder no openid'); 33 console.log('App.Orders.CheckOrder no openid');
@@ -185,5 +186,14 @@ Page({ @@ -185,5 +186,14 @@ Page({
185 // return true 186 // return true
186 // } 187 // }
187 return false 188 return false
188 - } 189 + },
  190 + networkEvent(e){
  191 + console.log('networkEvent',e.detail);
  192 + if(!e.detail.hasWork){
  193 + this.setData({
  194 + loadHidden:true,
  195 + })
  196 + }
  197 +
  198 + },
189 }) 199 })
1 <view class="page"> 1 <view class="page">
2 - <loading>数据加载中</loading> 2 + <loading hidden="{{loadHidden}}">数据加载中</loading>
3 </view> 3 </view>
4 -<network id="network"></network>  
  4 +<network id="network" bindnetwork="networkEvent"></network>