diff --git a/main.js b/main.js index 15b5636..fc8e5f4 100644 --- a/main.js +++ b/main.js @@ -13,10 +13,18 @@ $http.baseUrl = 'http://223.75.53.141:83' // $http.baseUrl = 'http://192.168.66.27:24105' // 请求拦截器 $http.beforeRequest = function (options) { - if (options.url.indexOf('/doLogin') == -1) { + if (options.url.indexOf('/login') == -1) { options.header = { - 'Authorization': 'Bearer ' + uni.getStorageSync('Gs-Token') + ...(options.header || {}), + 'Authorization': 'Bearer ' + uni.getStorageSync('Gs-Token'), + loginType: 1 } + // if (options.url.indexOf('/gunshiApp/tsg/visitMenuLog/insert') !== -1) { + // options.header = { + // ...options.header, + // loginType: 1 + // } + // } } } // 响应拦截器 @@ -58,4 +66,4 @@ export function createApp() { app } } -// #endif \ No newline at end of file +// #endif diff --git a/manifest.json b/manifest.json index 6b2ef77..a6c54ae 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "檀树岗水库", "appid" : "__UNI__33ED56F", "description" : "", - "versionName" : "1.0.4", + "versionName" : "1.0.5", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index a0b9198..254ff2b 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -603,4 +603,4 @@ export default { .noData { width: 100px; } - \ No newline at end of file + diff --git a/pages/mypage/mypage.vue b/pages/mypage/mypage.vue index aca674b..d29b28d 100644 --- a/pages/mypage/mypage.vue +++ b/pages/mypage/mypage.vue @@ -7,13 +7,13 @@
{{userList.nickName}}
-
{{userList.dept.deptName}}
+
{{deptName}}
-
+
@@ -49,7 +49,7 @@ }, ] console.log(uni.getStorageSync('value')); - export default { +export default { data() { return { userList: uni.getStorageSync('value'), @@ -60,6 +60,12 @@ default_src: uni.getStorageSync('avatar'), } }, + computed: { + deptName() { + const d = this.userList && this.userList.dept + return (d && d.deptName) || '' + } + }, methods: { navigateToSubPage(item,index) { uni.navigateTo({