From 15ef40a1a6380f2bc09181812daee36eaa998a62 Mon Sep 17 00:00:00 2001 From: "[caserKing]" <[wkx12138@126.com]> Date: Thu, 22 Oct 2020 08:00:55 +0800 Subject: [PATCH] fix --- src/App.vue | 18 ++-- src/routers/index.js | 6 ++ src/services/request.js | 13 ++- src/stores/index.js | 11 ++- src/views/demo/index.vue | 154 ------------------------------- src/views/home/index.vue | 2 +- src/views/login/index.vue | 8 +- src/views/person/index.vue | 21 +++-- src/views/person/myTicket.vue | 8 +- src/views/person/pointRecord.vue | 6 +- src/views/person/userInfo.vue | 2 +- 11 files changed, 61 insertions(+), 188 deletions(-) delete mode 100644 src/views/demo/index.vue diff --git a/src/App.vue b/src/App.vue index 4a66050..a33b4e4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,10 +5,10 @@ -
- - - {{item.title}} +
+ + + {{item.title}}
@@ -26,7 +26,7 @@ export default { iconN: require('./assets/images/home-n.png'), checked: true, title: '首页', - path: 'hello', + path: 'home', }, /* { iconY: require('./assets/images/bill1.png'), @@ -52,7 +52,8 @@ export default { const localRoute = (window.myVue && window.myVue.localRoute) || []; // console.log(localRoute, currentPath); const index = localRoute.indexOf(currentPath); - let tranName = 'fade'; + let tranName = ''; + // let tranName = 'fade'; /* if (localRoute.length === 0) { tranName = 'fade'; // 首页,渐显 @@ -71,11 +72,12 @@ export default { } }, created() { - console.log('欢迎访问...'); + let index = sessionStorage.getItem('navIndex') != 'undefined' ? sessionStorage.getItem('navIndex') : 0 + this.selRouter(index) }, methods: { selRouter(index) { - console.log(index) + sessionStorage.setItem('navIndex',index) this.footBarList.map(item => { item.checked = false; }) diff --git a/src/routers/index.js b/src/routers/index.js index d1c4c69..6bc4464 100644 --- a/src/routers/index.js +++ b/src/routers/index.js @@ -21,6 +21,7 @@ const routes = [ name: 'login', component: Login, meta: { + isShowNav: false, title: '登陆' } }, @@ -29,6 +30,7 @@ const routes = [ name: 'home', component: Home, meta: { + isShowNav: true, title: '首页' } }, @@ -47,6 +49,7 @@ const routes = [ name: 'person', component: Person, meta: { + isShowNav: true, title: '我的' } }, @@ -55,6 +58,7 @@ const routes = [ name: 'myTicket', component: MyTicket, meta: { + isShowNav: false, title: '赠券库存' } }, @@ -63,6 +67,7 @@ const routes = [ name: 'pointRecord', component: PointRecord, meta: { + isShowNav: false, title: '积分操作记录' } }, @@ -71,6 +76,7 @@ const routes = [ name: 'userInfo', component: UserInfo, meta: { + isShowNav: false, title: '登陆信息' } }, diff --git a/src/services/request.js b/src/services/request.js index e6176f6..652089e 100644 --- a/src/services/request.js +++ b/src/services/request.js @@ -31,6 +31,7 @@ const instance = axios.create({ // 实例添加请求拦截器 instance.interceptors.request.use( function(config) { + config.headers.bid = store.state.token; config.headers.token = store.state.token; // 在发送请求之前做处理... config.headers = Object.assign( @@ -84,6 +85,14 @@ instance.interceptors.response.use( // window.location.href = '/login'; // }, 3000) // } + console.log(response) + console.log(response.data.code === 1053) + if (response.data.code === 1052 || response.data.code === 1053) { + this.$router.push({ + path: '/login' + }) + return + } return Promise.resolve(checkStatus(response)); }, function(error) { @@ -121,10 +130,10 @@ const request = async function(opt) { } return res; } catch (err) { - if (options.ifHandleError) { + /* if (options.ifHandleError) { // 自定义参数,是否允许全局提示错误信息 Toast(err.msg || "请求处理失败!"); - } + } */ return err; } }; diff --git a/src/stores/index.js b/src/stores/index.js index 39e9221..ded46aa 100644 --- a/src/stores/index.js +++ b/src/stores/index.js @@ -1,3 +1,4 @@ +import { resolve } from 'core-js/fn/promise' /** * @Author: nowThen * @Date: 2019-08-22 14:30:51 @@ -10,14 +11,18 @@ Vue.use(Vuex) export default new Vuex.Store({ state: { - token: '0f2e7947-b7d8-444a-9d3a-7786e58e9177', + token: '', }, mutations: { - + setToken (state, token) { + state.token = token + } }, actions: { - + doLogin ({commit}, res) { + commit('setToken', res.data.bUserId) + } } }) diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue deleted file mode 100644 index d0f0222..0000000 --- a/src/views/demo/index.vue +++ /dev/null @@ -1,154 +0,0 @@ - - - - - diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 8f8e1c4..9559201 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -344,7 +344,7 @@ export default { } - diff --git a/src/views/person/index.vue b/src/views/person/index.vue index bdbc999..1a13e54 100644 --- a/src/views/person/index.vue +++ b/src/views/person/index.vue @@ -30,10 +30,10 @@ -
+
积分操作记录 @@ -101,12 +101,15 @@ export default { method: 'get', }).then(res => { - this.userInfo.mall_name = res.data.mall_name - this.userInfo.merchant_name = res.data.merchant_name - this.userInfo.phone = res.data.phone - this.userInfo.service_phone = res.data.service_phone - this.userInfo.name = res.data.name - this.userInfo.name = res.data.merchant_id + if (res.code && res.code == 200) { + this.userInfo.mall_name = res.data.mall_name + this.userInfo.merchant_name = res.data.merchant_name + this.userInfo.phone = res.data.phone + this.userInfo.service_phone = res.data.service_phone + this.userInfo.name = res.data.name + this.userInfo.name = res.data.merchant_id + } + }) }, goToUserInfo () { @@ -121,7 +124,7 @@ export default { } -