vue2-client 1.2.85 → 1.2.86

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.81 - 1.2.85 -2022-07-21 @朱子峰**
+**1.2.81 - 1.2.86 -2022-07-21 @朱子峰**
 - 功能新增：
 - 兼容V4登陆
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.85",
+  "version": "1.2.86",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/App.vue

@@ -24,6 +24,7 @@ export default {
   },
   mounted () {
    this.setWeekModeTheme(this.weekMode)
+    localStorage.setItem('compatible', this.compatible)
   },
   watch: {
     weekMode (val) {
@@ -55,7 +56,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang'])
+    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang', 'compatible'])
   },
   methods: {
     ...mapMutations('setting', ['setDevice']),

package/src/pages/login/Login.vue

@@ -118,9 +118,16 @@ export default {
       const loginRes = res
       const V4Token = { token: res.access_token, expire: res.expires_in }
       this.setV4AccessToken(V4Token)
+      // 如果这是用户首次打开本系统，localStorage无法初始化，改用code判断
+      let pass = false
+      if (res.code) {
+        if (res.code === 200) {
+          pass = true
+        }
+      }
       // 向本地缓存中临时存储compatible
-      localStorage.setItem('compatible', this.compatible)
-      if (loginRes.access_token) {
+      console.log(loginRes)
+      if (loginRes.access_token || pass) {
         const encrypt = new JSEncrypt()
         encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
         const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))

package/src/utils/map-utils.js

@@ -3,7 +3,7 @@ let Amap
 async function GetGDMap () {
   if (!Amap) {
     window._AMapSecurityConfig = {
-      securityJsCode:'275e59edb26ab1f917cfe7f05bea7979'
+      securityJsCode: '275e59edb26ab1f917cfe7f05bea7979'
     }
     Amap = await AMapLoader.load({
       key: '55a4807a6fc3adca5510f69578b1ae4a', // 申请好的Web端开发者Key，首次调用 load 时必填

package/src/utils/request.js

@@ -4,7 +4,7 @@ import Vue from 'vue'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import notification from 'ant-design-vue/es/notification'
 
-const setting = require('../config/default/setting.config')
+const compatible = localStorage.getItem('compatible')
 
 // 跨域认证信息 header 名
 const xsrfHeaderName = 'Authorization'
@@ -156,7 +156,7 @@ function loadInterceptors () {
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
       // 判断是否为V4环境
-      if (setting.compatible === 'V4') {
+      if (compatible === 'V4') {
         // V4 环境则添加 V4请求头
         config.headers['ACCESS_TOKEN'] = localStorage.getItem('ACCESS_TOKEN')
         config.headers['ACCESS_TOKEN_EXPIRES'] = localStorage.getItem('ACCESS_TOKEN_EXPIRES')
@@ -172,7 +172,7 @@ function loadInterceptors () {
   // 加载响应拦截器
   axios.interceptors.response.use((response) => {
     // 判断是否为V4环境
-    if (setting.compatible === 'V4') {
+    if (compatible === 'V4') {
       if (response.data.data) {
         return response.data.data
       } else {