diff --git a/App.vue b/App.vue
index 0368041..fce5850 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,4 @@
diff --git a/components/Projects/ProjectItem.vue b/components/Projects/ProjectItem.vue
index e6c5f03..3ae7d79 100644
--- a/components/Projects/ProjectItem.vue
+++ b/components/Projects/ProjectItem.vue
@@ -20,8 +20,8 @@
-
-
+
+
@@ -63,7 +63,7 @@
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7daadb6..733ef06 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -108,7 +108,7 @@ function onMove(event) {
}
function toLogin() {
- uni.navigateTo({ url: '/pages/user/accountLogin' })
+ uni.navigateTo({ url: '/pages/user/login' })
}
diff --git a/pages/user/login.vue b/pages/user/login.vue
index d44648c..fa1fa73 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -68,9 +68,7 @@
// 表单验证
const submitLogin = () => {
- console.log('111111')
phoneLoginForm.value.validate(valid => {
- console.log('2222', valid)
if (valid) {
login()
}
@@ -100,6 +98,7 @@
});
let res = await uni.$u.api.signin(params);
+ console.log(res, '----------')
store.commit('user/setToken', res.token);
store.commit('user/setUser', res);
uni.$storage.setStorageSync('anyringToken', res.token || '');
@@ -112,7 +111,7 @@
});
} catch (error) {
uni.$ui.hideLoading();
- uni.$ui.showToast(error);
+ uni.$ui.showToast(error.msg);
}
}
diff --git a/store/socket/actions.js b/store/socket/actions.js
index c769bf3..708aed4 100644
--- a/store/socket/actions.js
+++ b/store/socket/actions.js
@@ -202,7 +202,7 @@ const actions = {
dispatch('sendHeart');
} else {
uni.$u.toast('消息系统认证失败, 请退出重新登录');
- uni.$t.removeStorageSync('anyringToken');
+ uni.$storage.removeStorageSync('anyringToken');
commit('setSocket', null);
}
},
diff --git a/utils/request.js b/utils/request.js
index 9c4888f..49bb8a7 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -14,23 +14,28 @@ export function setupHttp(app) {
'content-type': 'application/json;charset=UTF-8'
},
});
-
+
// 请求拦截部分，如配置，每次请求前都会执行
app.config.globalProperties.$u.http.interceptor.request = config => {
const token = store.state.user.token || storage.getStorageSync('anyringToken');
if (token) {
config.header.Authorization = `Bearer ${token}`;
}
-
+
return config;
};
-
+
// 响应拦截，如配置，每次请求结束都会执行本方法
app.config.globalProperties.$u.http.interceptor.response = res => {
if (res.code === 200) {
// res为服务端返回值，可能有code，result等字段
// 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
- // 如果配置了originalData为true，请留意这里的返回值
+ // 如果配置了originalData为true，请留意这里的返回值
+ if (res.tokenObj.token) {
+ storage.setStorageSync('anyringToken', res.tokenObj.token || '');
+ store.commit('user/setToken', res.tokenObj.token);
+ }
+
return res.data;
} else if (res.code === 401) {
// 假设201为token失效，这里跳转登录
@@ -48,7 +53,7 @@ export function setupHttp(app) {
return false;
}
};
-
+
app.config.globalProperties.$u.post = (url, param = {}, header = {}) => {
return app.config.globalProperties.$u.http.request({
url,
@@ -59,4 +64,4 @@ export function setupHttp(app) {
},
});
};
-}
\ No newline at end of file
+}