diff --git a/pages/home/enterprise/enterprise.js b/pages/home/enterprise/enterprise.js index 6b5b62f..d2e85bc 100644 --- a/pages/home/enterprise/enterprise.js +++ b/pages/home/enterprise/enterprise.js @@ -92,6 +92,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + wx.showLoading({ title: '加载中', mask: true }) getBaseInfo().then(res => { this.setData({ userInfo: res.data, @@ -103,6 +104,10 @@ Page({ userType: res.data.userType, realName: res.data.realName || res.data.userName, }) + wx.hideLoading() + }).catch(err => { + wx.hideLoading() + util.showToast(err) }) this.cascaderView = this.cascaderView || this.selectComponent('#wux-cascader') this.pickerView = this.pickerView || this.selectComponent('#picker-view') diff --git a/pages/home/enterprise/enterprise.wxml b/pages/home/enterprise/enterprise.wxml index 364585a..e50582d 100644 --- a/pages/home/enterprise/enterprise.wxml +++ b/pages/home/enterprise/enterprise.wxml @@ -30,24 +30,24 @@ 公司地址 {{companyAddress}} - + 工厂名 {{userInfo.packageFactoryName || '点击修改打包厂名'}} - + 打包厂占地面积 {{userInfo.packageFactoryArea || '点击修改打包厂占地面积'}} - + 工厂人数 {{userInfo.numberOfEmployee || '点击修改工厂人数'}} - + 打包机数 {{userInfo.numberOfPackageMachine || '点击修改工厂打包机数'}} - + 营业执照 {{userInfo.businessLicenseUrl==null?'未上传':'查看'}} diff --git a/pages/home/index/index.js b/pages/home/index/index.js index 09e386e..9d9a4ad 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -172,7 +172,7 @@ Component({ if (app.globalData.userInfo.isAuth != 1) { wx.navigateTo({ url: '/pages/home/idcard/index' }) } else { - wx.navigateTo({ url: '/pages/home/certificate/index' }) + wx.navigateTo({ url: '/pages/home/info/index' }) } }, toAuthor: function () { diff --git a/pages/home/personal/personal.js b/pages/home/personal/personal.js index 6b5b62f..d2e85bc 100644 --- a/pages/home/personal/personal.js +++ b/pages/home/personal/personal.js @@ -92,6 +92,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + wx.showLoading({ title: '加载中', mask: true }) getBaseInfo().then(res => { this.setData({ userInfo: res.data, @@ -103,6 +104,10 @@ Page({ userType: res.data.userType, realName: res.data.realName || res.data.userName, }) + wx.hideLoading() + }).catch(err => { + wx.hideLoading() + util.showToast(err) }) this.cascaderView = this.cascaderView || this.selectComponent('#wux-cascader') this.pickerView = this.pickerView || this.selectComponent('#picker-view') diff --git a/pages/home/personal/personal.wxml b/pages/home/personal/personal.wxml index 79eaa1a..79cc39a 100644 --- a/pages/home/personal/personal.wxml +++ b/pages/home/personal/personal.wxml @@ -19,23 +19,23 @@ 从业身份 {{userInfo.identityTag || '点击修改从业身份'}} - + 所在城市 {{userInfo.locateCityTag.provinceName+userInfo.locateCityTag.cityName||'请选择所在地区'}} - + 从业经验 {{userInfo.experienceTag || '点击修改从业经验'}} - + 希望采购品类 {{userInfo.numberOfPurchaseCategoriesTag || '点击修改希望采购品类'}} - + 希望出货品类 {{userInfo.numberOfProxyCategoriesTag || '点击修改希望出货品类'}} - + 月出货量 {{userInfo.shipmentPerMonth || '点击月出货量'}}