|
@@ -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=''){
|