diff --git a/client_mp/App.vue b/client_mp/App.vue
index 02f8d12..051fa44 100644
--- a/client_mp/App.vue
+++ b/client_mp/App.vue
@@ -16,37 +16,43 @@
//var that=this
// 小程序自动登录
uni.showLoading({
- title:'微信自动登录中...',
+ title: '微信自动登录中...',
mask: true
})
uni.login({
- provider: 'weixin',
- success: (loginRes)=>{
- this.$u.api.wxmplogin({code:loginRes.code}).then(res=>{
- this.$u.vuex('vuex_token', res.data.access)
- this.$u.api.getUserInfo().then(res=>{
- uni.hideLoading()
- uni.showToast({
- title:"登录成功",
- icon:"none"
- })
- uni.reLaunch({
- url:"/pages/home/home"
- })
- this.$u.vuex('vuex_user', res.data)
- })
- }).catch(e=>{
- uni.hideLoading()
- uni.showToast({
- title:"暂未绑定微信!",
- icon:"none"
- })
- uni.reLaunch({
- url:'/pages/login/login'
- })})
- }
+ provider: 'weixin',
+ success: (loginRes) => {
+ this.$u.api.wxmplogin({
+ code: loginRes.code
+ }).then(res => {
+ this.$u.vuex('vuex_token', res.data.access)
+ this.$u.api.getUserInfo().then(res => {
+ uni.hideLoading()
+ uni.showToast({
+ title: "登录成功",
+ icon: "none"
+ })
+ uni.reLaunch({
+ url: "/pages/home/home"
+ })
+ this.$u.vuex('vuex_user', res.data)
+ // 修改资源请求地址
+ this.$u.vuex('vuex_user.avatar', this.vuex_user.avatar +
+ '?token=' + this.vuex_token)
+ })
+ }).catch(e => {
+ uni.hideLoading()
+ // uni.showToast({
+ // title: "暂未绑定微信!",
+ // icon: "none"
+ // })
+ uni.reLaunch({
+ url: '/pages/login/login'
+ })
+ })
+ }
});
-
+
},
}
@@ -54,4 +60,4 @@
\ No newline at end of file
+
diff --git a/client_mp/common/http.api.js b/client_mp/common/http.api.js
index 2c5f7dd..aaabc11 100644
--- a/client_mp/common/http.api.js
+++ b/client_mp/common/http.api.js
@@ -23,6 +23,8 @@ const install = (Vue, vm) => {
let bindmp = (params = {}) => vm.$u.post('/system/user/bindwxmp/', params); //微信绑定
+ let unbindmp = (params = {}) => vm.$u.post('/system/user/unbindwxmp/', params); //微信绑定
+
let getMyInspectTaskList = (params = {}) => vm.$u.get('/quality/subinspecttask/self/', params);
let getSubinspectTask = (id, params)=> vm.$u.get(`/quality/subinspecttask/${id}/`, params);
@@ -49,6 +51,7 @@ const install = (Vue, vm) => {
login,
wxmplogin,
bindmp,
+ unbindmp,
getMyInspectTaskList,
getSubinspectTask,
getSubtaskDepts,
diff --git a/client_mp/common/http.interceptor.js b/client_mp/common/http.interceptor.js
index 3f1961f..4b39a9b 100644
--- a/client_mp/common/http.interceptor.js
+++ b/client_mp/common/http.interceptor.js
@@ -45,24 +45,22 @@ const install = (Vue, vm) => {
return res;
}
else if(res.code === 401){
- vm.$u.toast('验证失败,请重新登录');
+ uni.showToast({
+ title: "验证失败,请重新登录!",
+ icon: "none"
+ })
uni.reLaunch({
url:'/pages/login/login'
})
return false;
}
else{
- if(typeof(res.msg)=='string'){
- vm.$u.toast(res.msg)
- }else{
- let msg = JSON.stringify(res.msg)
- vm.$u.toast(res.msg)
- }
-
-
-
+ uni.showToast({
+ title: res.msg,
+ icon: "none"
+ })
return false;
- }
+ }
}
}
diff --git a/client_mp/pages/inspectrecord/recorddo.vue b/client_mp/pages/inspectrecord/recorddo.vue
index 5be5b08..0d640ae 100644
--- a/client_mp/pages/inspectrecord/recorddo.vue
+++ b/client_mp/pages/inspectrecord/recorddo.vue
@@ -77,10 +77,11 @@
for (var i = 0; i < res.data.imgs_.length; i++) {
fileList.push({
id: res.data.imgs_[i].id,
- url: res.data.imgs_[i].file
+ url: res.data.imgs_[i].file + '?token='+ this.vuex_token
})
}
this.fileList = fileList
+ console.log(this.fileList)
})
},
submit() {
diff --git a/client_mp/pages/login/login.vue b/client_mp/pages/login/login.vue
index 0f92a65..a64f148 100644
--- a/client_mp/pages/login/login.vue
+++ b/client_mp/pages/login/login.vue
@@ -14,9 +14,9 @@
-
-
- 登录
+
+
+ 登录
密码登录
@@ -24,7 +24,9 @@
-
+
+
+
微信登录