From 7b2c4584b4c19b9735acb80fa364a9b720085e1f Mon Sep 17 00:00:00 2001 From: xiaoronghao <1300399510@qq.com> Date: Tue, 18 Apr 2023 16:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HeaderNav.vue | 15 ++++++++------- src/router/index.js | 7 ++++--- src/utils/request.js | 3 +++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/components/HeaderNav.vue b/src/components/HeaderNav.vue index 81f0870..c90de23 100755 --- a/src/components/HeaderNav.vue +++ b/src/components/HeaderNav.vue @@ -21,24 +21,25 @@ <div class="head-arrows" :class="{ animation: headMorePopState }" v-if="headMorePopState"></div> <div class="head-more-pop" :class="{ animation: headMorePopState }"> <div class="head-more-userinfo flex1 flexacenter"> - <div class="head-more-left flexacenter"> + <div class="head-more-left flexacenter" v-if="islogin"> <router-link to="/user" @click.native="headMorePopState = !headMorePopState"> <img class="head-more-userinfo-avatar" :src="userInfo.avatar || './img/defaultAvatar.jpg'" /> + <div class="head-more-userinfo-username">{{ userInfo.nickname || '未登录' }}</div> </router-link> - - <div class="head-more-userinfo-username"> - {{ userInfo.nickname || '未登录' }} - </div> </div> + <div class="head-more-left flexacenter" v-else @click="handleRegister()"> + <img class="head-more-userinfo-avatar" :src="userInfo.avatar || './img/defaultAvatar.jpg'" /> + <div class="head-more-userinfo-username">{{ userInfo.nickname || '未登录' }}</div> + </div> + <div class="head-more-right"> <!-- 消息 --> <div class="information-box" v-if="userInfo.messagenum"> - <!-- <img class="information-icon" src="@/assets/img/headerNav/information.png" /> --> <img class="information-icon" src="@/assets/img/icon/email.png" /> <div class="red-dot flexcenter">{{ userInfo.messagenum }}</div> </div> <!-- 登录按钮 --> - <div v-if="!islogin" class="loginBtn flexcenter" @click="handleRegister"> + <div v-if="!islogin" class="loginBtn flexcenter" @click="handleRegister()"> 登录/注册 </div> </div> diff --git a/src/router/index.js b/src/router/index.js index 758792a..abac19f 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,5 @@ import Vue from 'vue' import VueRouter from 'vue-router' -// import Recommend from "views/recommend/Recommend.vue" Vue.use(VueRouter) @@ -8,10 +7,10 @@ const VueRouterPush = VueRouter.prototype.push VueRouter.prototype.push = function push(to) { return VueRouterPush.call(this, to).catch(err => err) } + //标题js import getPageTitle from "@/utils/title-config"; - const Index = () => import('views/index/index') const Recommend = () => import('views/index/recommend/Recommend') const Collect = () => import('views/index/collect/Collect') @@ -105,7 +104,9 @@ const routes = [ ] const router = new VueRouter({ - mode: 'history', + // mode: 'history', + // mode: 'hash', + mode: process.env.NODE_ENV == "development" ? 'hash' : 'history', base: process.env.BASE_URL, routes }) diff --git a/src/utils/request.js b/src/utils/request.js index e729cf5..7077777 100755 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -30,6 +30,9 @@ service.interceptors.request.use(config => { //注意使用token的时候需要引入cookie方法或者用本地localStorage等方法,推荐js-cookie // config['headers']['authorization'] = "qj2q1qk1on0curclipghjtv5ja1g9eq2" // config['headers']['authorization'] = "661aiz52k5e6vqgmkxnz0wvbv8nciz8h" + + if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "qj2q1qk1on0curclipghjtv5ja1g9eq2" + return config }, error => { Promise.reject(error)