diff --git a/api/api.js b/api/api.js index 1cde47d..971e4a0 100644 --- a/api/api.js +++ b/api/api.js @@ -206,9 +206,9 @@ export function api(key, data, callback, loadingTitle) { //必须登录 if (req.auth) { if (!uni.getStorageSync('token')) { - // uni.navigateTo({ - // url: '/pages/auth/login' - // }) + uni.navigateTo({ + url: '/pages/auth/login' + }) console.error('需要登录') return } diff --git a/api/http.js b/api/http.js index ceacc7b..936af76 100644 --- a/api/http.js +++ b/api/http.js @@ -29,7 +29,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) { uni.removeStorageSync('token') console.error('登录过期'); uni.navigateTo({ - url: '/pages/index/index' + url: '/pages/auth/login' }) } diff --git a/components/base/navbar.vue b/components/base/navbar.vue index bd958f6..a7526b9 100644 --- a/components/base/navbar.vue +++ b/components/base/navbar.vue @@ -1,6 +1,8 @@ + + + + diff --git a/pages/index/center.vue b/pages/index/center.vue index 4130632..895ae3d 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -78,13 +78,11 @@ - diff --git a/pages/index/publish.vue b/pages/index/publish.vue index 0071443..4a1be76 100644 --- a/pages/index/publish.vue +++ b/pages/index/publish.vue @@ -20,26 +20,22 @@ - + + diff --git a/static/image/competition/1.png b/static/image/competition/1.png new file mode 100644 index 0000000..fef1a8d Binary files /dev/null and b/static/image/competition/1.png differ diff --git a/static/image/competition/k.png b/static/image/competition/k.png new file mode 100644 index 0000000..89f6ba3 Binary files /dev/null and b/static/image/competition/k.png differ diff --git a/static/image/login/logo.png b/static/image/login/logo.png new file mode 100644 index 0000000..e91cb9f Binary files /dev/null and b/static/image/login/logo.png differ diff --git a/static/image/login/wx.png b/static/image/login/wx.png new file mode 100644 index 0000000..2e9fec4 Binary files /dev/null and b/static/image/login/wx.png differ diff --git a/store/store.js b/store/store.js index 9a018ba..501d784 100644 --- a/store/store.js +++ b/store/store.js @@ -43,6 +43,8 @@ const store = new Vuex.Store({ uni.navigateTo({ url: '/pages/auth/wxUserInfo' }) + }else{ + uni.navigateBack(-1) } }) }