From 82441268a10ab3cc6a9394487cc162b82d370b5e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 9 Jun 2022 11:55:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20weblink?=
 =?UTF-8?q?=20=E5=85=8D=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         |  3 +-
 src/api/phoneWeLink.js               | 13 ++------
 src/common/axiosV2Phone/index.js     |  8 ++++-
 src/main.js                          |  2 --
 src/pages/loginVerifyPhone/index.vue | 46 ++++++++--------------------
 5 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/package.json b/package.json
index 6ba1f959d..b06a0849d 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "vue-contextmenujs": "^1.3.13",
     "vue-i18n": "^8.22.4",
     "vue-router": "^3.2.0",
-    "vuex": "^3.4.0"
+    "vuex": "^3.4.0",
+    "qs": "latest"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",
diff --git a/src/api/phoneWeLink.js b/src/api/phoneWeLink.js
index 20d73d4e8..d0b0d2895 100644
--- a/src/api/phoneWeLink.js
+++ b/src/api/phoneWeLink.js
@@ -1,16 +1,9 @@
 import axios from "@/common/axiosV2Phone";
 
-export function getUserInfoByAuthCode (data) {
+
+export function getTokenToWeLink (data) {
     return axios({
-        url: 'getUserInfoByAuthCode',
-        method: 'get',
-        params: data
-    })
-}
-// 编辑
-export function getIftappCodeByWelinkCode (data) {
-    return axios({
-        url: 'getIftappCodeByWelinkCode',
+        url: '/api/getTokenToWeLink',
         method: 'post',
         params: data
     })
diff --git a/src/common/axiosV2Phone/index.js b/src/common/axiosV2Phone/index.js
index b440611e4..fdcec972e 100644
--- a/src/common/axiosV2Phone/index.js
+++ b/src/common/axiosV2Phone/index.js
@@ -4,6 +4,8 @@ import store from '@/store'
 import {Message} from 'element-ui'
 import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig'
 import isMobile from "../../store/isMobile";
+import Qs from 'qs';
+
 
 import domMessage from '../messageOnce/messageOnce'
 
@@ -25,7 +27,10 @@ let formData = (data) => {
 }
 
 const service = axios.create({
-  baseURL: 'https://iftappwelink.foton.com.cn/devserver/welink/'
+    baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/',
+    paramsSerializer: function(params) {//序列化请求参数，避免get请求参数出现&,空格等识别错误的问题
+        return Qs.stringify(params, {arrayFormat: 'brackets'})
+    }
 })
 
 service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
@@ -48,6 +53,7 @@ service.interceptors.request.use(
  */
 service.interceptors.response.use(
     res => {
+        console.log(res)
       // IE 8-9
       if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
         try {
diff --git a/src/main.js b/src/main.js
index 9f1d95ae1..a922140d6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,4 @@
 import '@babel/polyfill'
-import Es6Promise from 'es6-promise'
 require('es6-promise').polyfill();
 require('es6-promise/auto');
 import Vue from 'vue'
@@ -65,7 +64,6 @@ import VConsole from 'vuex'
 import isMobile from "./store/isMobile";
 // 路由拦截
 router.beforeEach(function (to, from, next) {
-
   let fromName = from.name
   if(fromName === undefined || fromName === null){
       window.sessionStorage.clear()
diff --git a/src/pages/loginVerifyPhone/index.vue b/src/pages/loginVerifyPhone/index.vue
index 936813d41..e71c91cc1 100644
--- a/src/pages/loginVerifyPhone/index.vue
+++ b/src/pages/loginVerifyPhone/index.vue
@@ -8,7 +8,7 @@
     import axios from 'axios'
     import util from 'util'
     import { get_verify_by_instance,loginIdm,getMenu,checkPageNoEncryption } from 'api/process'
-    import { getUserInfoByAuthCode,getIftappCodeByWelinkCode } from 'api/phoneWeLink'
+    import { getTokenToWeLink } from 'api/phoneWeLink'
     import { ssoLoginUrlDev,ssoLogoutUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
     import HWH5 from '../../api/hwh5-cloudonline.js';
 
@@ -105,40 +105,20 @@
                 console.log(data)
                 if(data){
                     let code = data.code
-                    console.log(code)
-                    getIftappCodeByWelinkCode({
+                    getTokenToWeLink({
                         code: code,
-                        name: encodeURIComponent("standards regulations"),
+                        name: encodeURIComponent("standards"+"-"+"regulations"),
+                        type:"",
+                        corpCode:"",
+                    }, {
+                        _this: this
                     }).then(res => {
-                        console.log(res)
-                        if(res.data){
-                            getUserInfoByAuthCode({
-                                code: code,
-                            }).then(res => {
-                                console.log(res)
-                                if(res.data){
-                                    let userName = res.data.username;
-                                    if(userName !== undefined && userName !== ""){
-                                        checkPageNoEncryption({
-                                            username: userName
-                                        }, {
-                                            _this: this
-                                        }).then(res => {
-                                            if (res.ok) {
-                                                this.loginNew(res)
-                                            } else {
-                                                if(res.respCode && res.respCode === 'r0011'){
-                                                    this.logout()
-                                                }
-                                            }
-                                        })
-                                    }else {
-                                        // window.location.href = ssoLogoutUrlDev
-                                    }
-                                }else {
-                                    this.logout()
-                                }
-                            })
+                        if (res.ok) {
+                            this.loginNew(res)
+                        } else {
+                            if(res.respCode && res.respCode === 'r0011'){
+                                this.logout()
+                            }
                         }
                     })
                 }