vue2-client 1.2.85 → 1.2.89

package/src/pages/login/Login.vue

@@ -93,7 +93,7 @@ export default {
             }
             case 'OA' : {
               loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
-             break
+              break
             }
             case 'V4' : {
               V4Login(name, password).then(this.afterLoginV4)
@@ -116,16 +116,27 @@ export default {
       const password = this.form.getFieldValue('password')
       this.logging = false
       const loginRes = res
-      const V4Token = { token: res.access_token, expire: res.expires_in }
+      // 如果这是用户首次打开本系统，localStorage无法初始化，改用code判断
+      let pass = false
+      let V4Token = {}
+      // 判断是否是第一次使用本系统
+      if (res.code) {
+        if (res.code === 200) {
+          pass = true
+          // 如果返回值有code，证明是第一次使用系统，localStorage判断compatible失效
+          // token需要从.data中获取
+          V4Token = { token: res.data.access_token, expire: res.data.expires_in }
+        }
+      } else {
+        V4Token = { token: res.access_token, expire: res.expires_in }
+      }
       this.setV4AccessToken(V4Token)
       // 向本地缓存中临时存储compatible
-      localStorage.setItem('compatible', this.compatible)
-      if (loginRes.access_token) {
+      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 }))
         // 获取路由配置
-        console.log('开始请求智慧燃气')
         getRoutesConfig(data).then(result => {
           this.$login.login(result).then(() => {
             this.afterGeneral(result)
@@ -205,59 +216,59 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  .common-layout{
-    .top {
-      text-align: center;
-      .header {
+.common-layout{
+  .top {
+    text-align: center;
+    .header {
+      height: 44px;
+      line-height: 44px;
+      a {
+        text-decoration: none;
+      }
+      .logo {
         height: 44px;
-        line-height: 44px;
-        a {
-          text-decoration: none;
-        }
-        .logo {
-          height: 44px;
-          vertical-align: top;
-          margin-right: 16px;
-        }
-        .title {
-          font-size: 33px;
-          color: @title-color;
-          font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
-          font-weight: 600;
-          position: relative;
-          top: 2px;
-        }
+        vertical-align: top;
+        margin-right: 16px;
       }
-      .desc {
-        font-size: 14px;
-        color: @text-color-second;
-        margin-top: 12px;
-        margin-bottom: 40px;
+      .title {
+        font-size: 33px;
+        color: @title-color;
+        font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+        font-weight: 600;
+        position: relative;
+        top: 2px;
       }
     }
-    .login{
-      width: 368px;
-      margin: 0 auto;
-      @media screen and (max-width: 576px) {
-        width: 95%;
-      }
-      @media screen and (max-width: 320px) {
-        .captcha-button{
-          font-size: 14px;
-        }
+    .desc {
+      font-size: 14px;
+      color: @text-color-second;
+      margin-top: 12px;
+      margin-bottom: 40px;
+    }
+  }
+  .login{
+    width: 368px;
+    margin: 0 auto;
+    @media screen and (max-width: 576px) {
+      width: 95%;
+    }
+    @media screen and (max-width: 320px) {
+      .captcha-button{
+        font-size: 14px;
       }
-      .icon {
-        font-size: 24px;
-        color: @text-color-second;
-        margin-left: 16px;
-        vertical-align: middle;
-        cursor: pointer;
-        transition: color 0.3s;
+    }
+    .icon {
+      font-size: 24px;
+      color: @text-color-second;
+      margin-left: 16px;
+      vertical-align: middle;
+      cursor: pointer;
+      transition: color 0.3s;
 
-        &:hover {
-          color: @primary-color;
-        }
+      &:hover {
+        color: @primary-color;
       }
     }
   }
+}
 </style>

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')
+let compatible
 
 // 跨域认证信息 header 名
 const xsrfHeaderName = 'Authorization'
@@ -151,12 +151,16 @@ function checkAuthorization (authType = AUTH_TYPE.BEARER) {
 function loadInterceptors () {
   // 加载请求拦截器
   axios.interceptors.request.use(config => {
-    const token = localStorage.getItem(ACCESS_TOKEN)
+    const token = localStorage.getItem('ACCESS_TOKEN')
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
+      // 如果是首次使用系统LocalStorage需要初始化，在登陆之后重新获取一次compatible
+      if (compatible === null) {
+        compatible = localStorage.getItem('compatible')
+      }
       // 判断是否为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')
@@ -171,8 +175,12 @@ function loadInterceptors () {
   }, errorHandler)
   // 加载响应拦截器
   axios.interceptors.response.use((response) => {
-    // 判断是否为V4环境
-    if (setting.compatible === 'V4') {
+    // 判断是否为V4环境，不为compatible赋初始值
+    // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
+    if (compatible === null || compatible === undefined) {
+      compatible = localStorage.getItem('compatible')
+    }
+    if (compatible === 'V4') {
       if (response.data.data) {
         return response.data.data
       } else {