diff --git a/api/request.js b/api/request.js
index a60f1af..035f5c5 100644
--- a/api/request.js
+++ b/api/request.js
@@ -24,7 +24,6 @@ axios.interceptors.request.use(
return config
},
error => {
- // 做一些请求错误
console.error(error)
return Promise.reject(error)
}
@@ -46,7 +45,6 @@ axios.interceptors.response.use(
}
},
(err) => {
- // 做一些请求错误
console.error(err)
return Promise.reject(err)
}
@@ -82,8 +80,12 @@ function handleResponse({ data, status }) {
return Promise.reject('服务器错误')
}
}
+ var message = '请求错误'
+ if (data.message) {
+ message = data.message
+ }
// 有状态码但不在这个封装的配置里,就直接返回错误
- return STATUS[status] ? STATUS[status]() : Promise.reject('请求错误')
+ return STATUS[status] ? STATUS[status]() : Promise.reject(message)
}
function handleResult(result) {
diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js
index db5abfe..867a994 100644
--- a/pages/home/employee/index.js
+++ b/pages/home/employee/index.js
@@ -121,11 +121,9 @@ Page({
wx.showLoading({ title: '加载中', mask: true })
var item = this.data.checkList[event.currentTarget.dataset.index]
auditEmploye({id: item.id, status: 2 }).then(result => {
- //成功回调
this.setData({ ['checkList[' + event.currentTarget.dataset.index + '].applicantStatus']: 2})
wx.hideLoading()
}).catch(err => {
- //异常回调
wx.hideLoading()
util.showToast(err)
})
@@ -136,7 +134,7 @@ Page({
addEmployee: function(event){
wx.showLoading({ title: '加载中', mask: true })
const form = { id: 5 }
- form.metaData = { factoryId: app.userInfo.enterpriseId, factoryName: app.userInfo.enterpriseName }
+ form.metaData = { factoryId: app.userInfo.factoryId, factoryName: app.userInfo.factoryName }
generateCode(form).then(result => {
this.setData({ showEmbedded: true, base64: result.data })
wx.hideLoading()
diff --git a/pages/login/index.js b/pages/login/index.js
index 8b72fb1..7b92932 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -97,10 +97,10 @@ Page({
app.userInfo = result.data
app.globalData.token = authorization
wx.hideLoading()
- if(app.userInfo.enterpriseId){
+ if(app.userInfo.factoryId){
storage.put('Authorization', app.globalData.token)
this.setData({ loging: false})
- if(this.data.metaData && app.userInfo.enterpriseId != this.data.metaData.enterpriseId){
+ if(this.data.metaData && app.userInfo.factoryId != this.data.metaData.factoryId){
Dialog.alert({ title: '温馨提示', message: '您已经绑定过工厂了,现在就进入?' }).then(() => {
wx.redirectTo({ url: '/pages/index/index' })
})
@@ -109,8 +109,11 @@ Page({
}
} else if(this.data.metaData){
// 这里要进行账号的绑定,对工厂进行绑定;或者进行申请操作;
-
this.setData({ loging: false, metaData: this.data.metaData })
+ } else if(app.userInfo.applicationStatus == 0){
+ this.setData({ loging: false})
+ Dialog.alert({ title: '温馨提示', message: '您的申请还在审核中,如有疑问请联系管理员。' }).then(() => {
+ })
} else {
this.setData({ loging: false})
Dialog.alert({ title: '温馨提示', message: '您还不是纸通宝SAAS用户,请联系工厂管理员,或者联系纸通宝客户人员。' }).then(() => {
@@ -122,7 +125,7 @@ Page({
util.showToast('获取用户信息失败,请注册登录')
this.setData({ loging: false, regist: true})
} else {
- util.showToast('请求错误')
+ util.showToast(err)
this.setData({ loging: false})
}
config.header = null
@@ -289,8 +292,8 @@ Page({
bindingAdmin(this.data.metaData).then(result => {
wx.hideLoading()
storage.put('Authorization', app.globalData.token)
- app.userInfo.enterpriseId = this.data.metaData.factoryId
- app.userInfo.enterpriseName = this.data.metaData.factoryName
+ app.userInfo.factoryId = this.data.metaData.factoryId
+ app.userInfo.factoryName = this.data.metaData.factoryName
this.data.metaData = null
this.setData({loging: false})
wx.redirectTo({ url: '/pages/index/index' })
diff --git a/pages/message/index/index.wxml b/pages/message/index/index.wxml
index d1076ed..aacbd51 100644
--- a/pages/message/index/index.wxml
+++ b/pages/message/index/index.wxml
@@ -1,7 +1,6 @@
- {{userInfo.enterpriseName}}
- 消息
+ 消息
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index 93bcee8..6995305 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -7,7 +7,7 @@
- {{userInfo.enterpriseName}}
+ {{userInfo.factoryName}}