Commit 9f469404b6f826fe52de8d02c3c897df581c6319

Authored by wangfan
1 parent 2cf27647

ui fix

... ... @@ -25,11 +25,13 @@ Component({
this.setData({
network:true,
})
this.triggerEvent('network',res);
}).catch(res=>{
this.setData({
network:false,
msg:res.msg
})
this.triggerEvent('network',res);
})
},
detached(){
... ... @@ -44,12 +46,13 @@ Component({
wx.getNetworkType({
success: function (res) {
var title = ''
if (res.networkType == '2g' || res.networkType == '3g' || res.networkType == 'unknown') {
fail({type:res.networkType,msg:'当前网络不给力,请稍后重试'});
//if (res.networkType == '2g' || res.networkType == '3g' || res.networkType == 'unknown') {
if (res.networkType == 'unknown') {
fail({hasWork:false,type:res.networkType,msg:'当前网络不给力,请稍后重试'});
} else if (res.networkType == 'none') {
fail({type:res.networkType,msg:'当前暂未连接任何网络,请稍候重试'});
fail({hasWork:false,type:res.networkType,msg:'当前暂未连接任何网络,请稍候重试'});
} else {
success({type:res.networkType});
success({hasWork:true,type:res.networkType});
}
}
});
... ... @@ -73,6 +76,8 @@ Component({
wx.reLaunch({
url: '/'+p.route+'?'+param.join('&')
})
}).catch((res)=>{
console.log('this.network.catch',res)
})
},
show(msg=''){
... ...
... ... @@ -7,7 +7,9 @@ Page({
/**
* 页面的初始数据
*/
data: {},
data: {
loadHidden:false,
},
/**
* 生命周期函数--监听页面加载
... ... @@ -26,7 +28,6 @@ Page({
})
this.selectComponent("#network").debug(opt, 'scene');
}
opt.openid = await this.getOpenid();
if (!opt.openid) {
console.log('App.Orders.CheckOrder no openid');
... ... @@ -185,5 +186,14 @@ Page({
// return true
// }
return false
}
},
networkEvent(e){
console.log('networkEvent',e.detail);
if(!e.detail.hasWork){
this.setData({
loadHidden:true,
})
}
},
})
\ No newline at end of file
... ...
<view class="page">
<loading>数据加载中</loading>
<loading hidden="{{loadHidden}}">数据加载中</loading>
</view>
<network id="network"></network>
\ No newline at end of file
<network id="network" bindnetwork="networkEvent"></network>
\ No newline at end of file
... ...