From 7e42473c799bd5e221946132666b2ede4e2c1058 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Tue, 14 Jun 2022 19:51:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E9=9B=86=E6=88=90WELINK=E9=A1=B5=E9=9D=A2=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/axiosV2Phone/index.js              |  1 -
 src/main.js                                   |  6 ++--
 src/pages/loginVerifyPhone/index.vue          | 31 +++++++++++++------
 src/pages/phone/phoneHome.vue                 |  1 -
 .../pages/creatProcess/qbrk-product/step1.vue |  1 -
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/common/axiosV2Phone/index.js b/src/common/axiosV2Phone/index.js
index fdcec972e..bfdc37482 100644
--- a/src/common/axiosV2Phone/index.js
+++ b/src/common/axiosV2Phone/index.js
@@ -41,7 +41,6 @@ service.defaults.headers['Content-type'] = 'application/json'
  */
 service.interceptors.request.use(
     config => {
-    debugger
       return config
     },
     error => {
diff --git a/src/main.js b/src/main.js
index a922140d6..1f4539da8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -144,9 +144,11 @@ router.beforeEach(function (to, from, next) {
   // 单点登录
   /** 判断是不是在手机端操作 */
   if (isMobile()) {
-    if(toName === 'phoneHome'){
+    if(toName === 'phoneHome' && (token === undefined || token === null || token === '')){
       next('/loginVerifyPhone')
-    }else if(toName === 'processCenter'){
+    }else if(toName === 'phoneHome' && token != null){
+      next()
+    } else if(toName === 'processCenter'){
       // hwh5.close();
       //关闭当前窗口
       let userAgent = navigator.userAgent;
diff --git a/src/pages/loginVerifyPhone/index.vue b/src/pages/loginVerifyPhone/index.vue
index e71c91cc1..f7c9d1cdb 100644
--- a/src/pages/loginVerifyPhone/index.vue
+++ b/src/pages/loginVerifyPhone/index.vue
@@ -1,6 +1,10 @@
 <!-- 长城项目 登录页 -->
 <template>
-
+    <div style="width: 100%;height: 100%;overflow: auto;margin: 0;padding: 0;background: #F6F6F6;" >
+        <div class="card-box">
+            <van-loading size="24px" color="#3170A8">验证中...</van-loading>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -14,6 +18,8 @@
 
     export default {
         name: 'loginVerifyPhone',
+        components: {},
+
         data () {
             return {
                 username: this.$store.state.laws_urm || '', // 用户名
@@ -58,6 +64,7 @@
             loginNew (res) {
                 let Base64 = require('js-base64').Base64
                 let userInfoStr = Base64.decode(res.data)
+                console.log(userInfoStr)
                 let userInfo2 = decodeURIComponent(userInfoStr)
                 let userInfoObj = JSON.parse(userInfo2)
                 userInfoObj.userId = userInfoObj.usid
@@ -76,21 +83,19 @@
                 // 获取用户菜单
                 window.sessionStorage.setItem('userInfo', userInfo); // del
                 this.getMenu().then((menuList) => {
-                    let hasHomeMenu = false
-                    menuList.map((menuItem) => {
-                        if (menuItem.id === 'asdfadf') {
-                            hasHomeMenu = true
-                        }
-                    })
+                    let hasHomeMenu = true
+                    console.log("权限检查结果："+hasHomeMenu)
                     window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
                     window.sessionStorage.setItem('menuList', menuList); // del
                     if (hasHomeMenu) {
                         this.setMenu(JSON.stringify(menuList)).then(res => {
-                            this.$router.push('phoneHome')
+                            this.$router.push("/phoneHome")
                         }, e => {
+                            console.log("解析遍历权限列表出现异常")
                             this.logout()
                         })
                     } else {
+                        console.log("权限检查失败，没有首页权限")
                         this.logout()
                     }
                 })
@@ -102,6 +107,7 @@
         },
         mounted () {
             window.HWH5.getAuthCode().then(data => {
+                console.log("获取到了welinkCode")
                 console.log(data)
                 if(data){
                     let code = data.code
@@ -117,6 +123,7 @@
                             this.loginNew(res)
                         } else {
                             if(res.respCode && res.respCode === 'r0011'){
+                                console.log("根据welinkCode获取用户信息失败")
                                 this.logout()
                             }
                         }
@@ -139,5 +146,11 @@
 </script>
 
 <style lang="less" scoped>
-
+    .card-box{
+        height: 85%;
+        position: relative;
+        overflow-y: scroll;
+        top: 100px;
+        text-align: center;
+    }
 </style>
diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue
index ff6883784..242b6a93a 100644
--- a/src/pages/phone/phoneHome.vue
+++ b/src/pages/phone/phoneHome.vue
@@ -4,7 +4,6 @@
       <div class="top-title">
       </div>
       <h3 class="home-title">标 准 法 规 管 理 系 统 S R M S</h3>
-      <div style="border: 1px solid #FFFFFF; position:absolute; top: 15%; left: 49% ;width: 25px; "></div>
     </div>
     <div class="search-head">
       <van-search
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index fed907aa7..202082132 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -1557,7 +1557,6 @@
                 return data
             },
             getStandInfoByReviseStatus(type) {
-            debugger
                 let date = new Date();
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){