From cda4ab36f8fb811bd00cfd46cb0a211f952524c0 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 27 Aug 2024 20:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BB=B7=E6=A0=BCLoadding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 50085dd..b76b995 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,7 +1,7 @@
 <template>
-    <!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/> -->
-    <!-- v-if="!isLoading" -->
-    <div class="home app_content">
+     <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
+    <div class="home app_content" v-if="!isLoading">
+<!--    <div class="home app_content">-->
         <!-- 导航栏 -->
         <!--		<div class="header_body">-->
         <!--			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@@ -52,9 +52,8 @@
     import Vconsolefrom from 'vconsole';
     import * as w6s from 'szient-js-sdk';
     import sha1 from 'crypto-js/sha1';
-    import { Loading } from 'vant';
     import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest, siqCode} from '../api/Home';
-    import {showSuccessToast} from "vant";
+    import {Loading, showFailToast, showSuccessToast} from "vant";
     import 'vant/es/toast/style';
     const {useCommon} = $globalStore;
     const router = useRouter();
@@ -181,16 +180,15 @@
             //     console.log(success.data);
             //     useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
             //     useCommon.SET_USER_ID(success.data.userId);
+            //     console.log("-----> success.data: ", success.data);
             //     useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
             //     useCommon.SET_TOKEN(success.data.token);
-            //     console.log(useCommon.userId);
-            //     console.log(useCommon.firstLoad);
-            //     if(useCommon.firstLoad){
-            //       isLoading.value = false;
-            //     }
+            //     console.log("-----> useCommon.userId: ", useCommon.userId);
+            //     console.log("-----> useCommon.firstLoad: ", useCommon.firstLoad);
             //      //设置已经初始化
             //     useCommon.SET_IS_FIRST_LOAD(false)
             //     getEnterpriseMerchant(success.data.phonenumber.toString());
+            //     isLoading.value = false;
             // }, error => {
             // })
 
@@ -234,9 +232,7 @@
                               //设置已经初始化
                             useCommon.SET_IS_FIRST_LOAD(false)
                             getEnterpriseMerchant(success.data.phonenumber.toString());
-                               if(useCommon.firstLoad){
-                                      isLoading.value = false;
-                                }
+                            isLoading.value = false;
                         }, error => {
                             console.log("error : " + error)
                         })