From ba103440c54e52ddc296869b5230d329c4a613d6 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Thu, 21 Apr 2022 11:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 ++++++++++++++ package.json | 1 + src/components/FirstJob/detail.vue | 2 +- src/components/FirstJob/joblist.vue | 2 +- src/components/Login/login.vue | 3 +++ src/components/main/index.vue | 19 ++++++++++++++++--- src/permission.js | 10 +++++++++- src/utils/request.js | 7 ++++--- src/views/main.vue | 32 +++++++++++++++++++------------- src/views/userinfo.vue | 3 +++ yarn.lock | 5 +++++ 11 files changed, 76 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2181236..ced35b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "axios": "^0.25.0", "core-js": "^3.6.5", "jquery": "^3.6.0", + "js-cookie": "^3.0.1", "moment": "^2.29.1", "popmotion": "^9.3.5", "vue": "^2.6.11", @@ -9033,6 +9034,14 @@ "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz", "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, + "node_modules/js-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.1.tgz", + "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==", + "engines": { + "node": ">=12" + } + }, "node_modules/js-message": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz", @@ -23593,6 +23602,11 @@ "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz", "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, + "js-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.1.tgz", + "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==" + }, "js-message": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz", diff --git a/package.json b/package.json index 0c3af9c..79aec92 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "axios": "^0.25.0", "core-js": "^3.6.5", "jquery": "^3.6.0", + "js-cookie": "^3.0.1", "moment": "^2.29.1", "popmotion": "^9.3.5", "vue": "^2.6.11", diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index 7c58acf..1f245db 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -624,7 +624,7 @@

服务热线

-

0371-666666666

+

135 2307 4549

diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index 2531bc4..8e7f26d 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -320,7 +320,7 @@

服务热线

-

0371-6666 6666

+

135 2307 4549

-
查看职位
+
+ 查看职位 +
+
+ 登录 +

总部地址：河南省郑州市郑东新区升龙广场2号楼A座

接待地址：河南省郑州市航空港区相州街29-60号

-

联系电话：168 3666 8888

+

联系电话：135 2307 4549

import Vue from "vue"; - +import Cookies from "js-cookie"; const path = require("path"); const files = require.context("../../../static/img", false, /.png$/); @@ -166,6 +175,7 @@ export default { require("../../assets/banner3.png"), ], cooperativeImg: [], + isLogin: false, }; }, // 计算属性 @@ -177,6 +187,9 @@ export default { * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在 */ created() { + if (sessionStorage.getItem("LOGIN_DATA") || Cookies.get("LOGIN_DATA")) { + this.isLogin = true; + } setTimeout(() => { this.isshow = true; }, 500); diff --git a/src/permission.js b/src/permission.js index 4feacf2..24474ed 100644 --- a/src/permission.js +++ b/src/permission.js @@ -1,6 +1,8 @@ // 路由权限的配置 import router from "./router"; import Vue from "vue"; +import Cookies from "js-cookie"; + console.dir(Vue); router.beforeEach(async (to, from, next) => { // console.log(to); @@ -23,7 +25,13 @@ router.beforeEach(async (to, from, next) => { "/updatepsw", // "/register", ]; - const isLogin = sessionStorage.getItem("LOGIN_DATA") !== null ? true : false; + if (sessionStorage.getItem("LOGIN_DATA") || Cookies.get("LOGIN_DATA")) { + if (!sessionStorage.getItem("LOGIN_DATA")) { + console.log("notset"); + sessionStorage.setItem("LOGIN_DATA", Cookies.get("LOGIN_DATA")); + } + var isLogin = true; + } // const isLogin = localStorage.getItem("LOGIN_DATA") !== null ? true : false; // if (to.fullPath === from.fullPath) { // next(to.path); diff --git a/src/utils/request.js b/src/utils/request.js index e006e3f..f663313 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,5 +1,6 @@ import axios from "axios"; import router from "@/router"; +import Cookies from "js-cookie"; // import Vue from "vue"; const baseURL = "http://1shoudan.com"; // 正式环境线上 console.log(baseURL); @@ -12,8 +13,8 @@ console.log(baseURL); axios.defaults.withCredentials = true; //添加这行代码 // console.log(axios); const service = axios.create({ - // baseURL: "/api_prod", // url = base url + request url - baseURL: baseURL, // baseURL: "/api", // url = base url + request url + baseURL: "/api_prod", // url = base url + request url + // baseURL: baseURL, // baseURL: "/api", // url = base url + request url withCredentials: true, // send cookies when cross-domain requests timeout: 10000, // request timeout crossDomain: true, @@ -24,7 +25,7 @@ service.interceptors.response.use( // console.log(status); if (status == 9999) { sessionStorage.removeItem("LOGIN_DATA"); - + Cookies.remove("LOGIN_DATA"); router.push("/login"); // 跳转到登录页面 // this.$message.warning(msg); diff --git a/src/views/main.vue b/src/views/main.vue index f051330..530dae6 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -13,27 +13,28 @@
  • - - 首页 + 首页
  • - 一手职位一手职位
  • 我的报名
    • @@ -217,6 +218,7 @@