From 2e960e53b5682f84e749c212f4b09e6f8e951e47 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Fri, 14 Jan 2022 17:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/scroll-list/scroll-list.vue |  7 ++++---
 pages/login/index.vue                  | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/scroll-list/scroll-list.vue b/components/scroll-list/scroll-list.vue
index 40d82a4..261facc 100644
--- a/components/scroll-list/scroll-list.vue
+++ b/components/scroll-list/scroll-list.vue
@@ -580,7 +580,7 @@ export default {
     .scroll-content {
       height: 100%;
       display: flex;
-      will-change: transform;
+      // will-change: transform;
       flex-direction: column;
       .pull-down-wrap {
         left: 0;
@@ -627,10 +627,11 @@ export default {
           margin: auto;
           display: flex;
           align-items: center;
+          margin-bottom: 400rpx;
           flex-direction: column;
           .empty-image {
-            width: 200rpx;
-            height: 200rpx;
+            width: 600rpx;
+            height: 600rpx;
           }
           .empty-text {
             color: #606266;
diff --git a/pages/login/index.vue b/pages/login/index.vue
index d94bb7f..6444812 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -139,12 +139,12 @@ export default {
                     store.commit('setToken', token)
                     // 登录成功先查看是否有下一个页面
                     const nextPage = store.state.nextPage
+                    let page = null
                     if (nextPage.name) {
-                      go2(nextPage.name, nextPage.data, true)
-                    } else {
-                      // 初始登录没有下一个页面，进行账号信息处理
-                      this.setAccountInfo()
+                      page = { url: nextPage.name, data: nextPage.data, isRedirect: true }
                     }
+                    // 初始登录没有下一个页面，进行账号信息处理
+                    this.setAccountInfo(page)
                     store.commit('removeNextPage')
                   }, 1000)
                 }
@@ -154,13 +154,13 @@ export default {
         }
       })
     },
-    setAccountInfo() {
+    setAccountInfo(page = { url: 'client', data: {}, isRedirect: true }) {
       getBaseInfo({}, true).then((res) => {
         if (res) {
           if (!res.enterpriseList || res.enterpriseList.length === 0) {
             go2('enterprise-info', { operation: 'add' }, true)
           } else {
-            go2('client')
+            go2(page.url, page.data, page.isRedirect)
           }
         }
       })