From ecba5dea0ee931bba79fee71e5ff3b8fa25bb90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 16 Dec 2024 15:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=BC=B9=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/common/common.vue       | 34 +++++++++++++++---------------
 components/user-base/user-base.vue |  3 ++-
 pages/index/index.vue              |  3 ++-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/components/common/common.vue b/components/common/common.vue
index 44f4b2ca..f6116cda 100644
--- a/components/common/common.vue
+++ b/components/common/common.vue
@@ -1,7 +1,7 @@
-<template>
+<template>
     <view :class="theme_view">
         <!-- 底部菜单 -->
-        <block v-if="is_tabbar">
+        <block v-if="is_tabbar">
             <component-diy-footer :propKey="key" :propValue="app_tabbar" @onFooterHeight="footer_height_value_event"></component-diy-footer>
             <view v-if="propIsFooterSeat && footer_height_value > 0" :style="'height:'+footer_height_value+'rpx;'"></view>
         </block>
@@ -36,16 +36,16 @@
         <component-app-admin ref="app_admin" :propIsHideStar="true"></component-app-admin>
 
         <!-- 用户基础 -->
-        <component-user-base ref="user_base" :propIsGrayscale="propIsGrayscale"></component-user-base>
-    </view>
-</template>
+        <component-user-base ref="user_base" :propIsGrayscale="propIsGrayscale"></component-user-base>
+    </view>
+</template>
 <script>
     const app = getApp();
     import componentDiyFooter from '@/components/diy/footer';
     import componentAppAdmin from '@/components/app-admin/app-admin';
-    import componentUserBase from '@/components/user-base/user-base';
-    export default {
-        data() {
+    import componentUserBase from '@/components/user-base/user-base';
+    export default {
+        data() {
             return {
                 theme_view: app.globalData.get_theme_value_view(),
                 logo: app.globalData.get_application_logo_square(),
@@ -53,10 +53,10 @@
                 is_show_privacy: false,
                 privacy_content: null,
                 key: '',
-                is_tabbar: false,
+                is_tabbar: false,
                 app_tabbar: null,
-                footer_height_value: 0,
-            };
+                footer_height_value: 0,
+            };
         },
         props: {
             // 是否灰度
@@ -84,11 +84,11 @@
             componentDiyFooter,
             componentAppAdmin,
             componentUserBase
-        },
-        // 页面被展示
+        },
+        // 页面被展示
         created: function () {
             // 初始化配置
-            this.init_config();
+            this.init_config();
         },
         methods: {
             // 显示响应方法
@@ -196,9 +196,9 @@
             exit_event(e) {
                 uni.exitMiniProgram();
             },
-        }
-    };
-</script>
+        }
+    };
+</script>
 <style scoped>
     .agreement-page {
         background-color: rgba(0, 0, 0, 0.6);
diff --git a/components/user-base/user-base.vue b/components/user-base/user-base.vue
index bd659db8..37fd5b81 100644
--- a/components/user-base/user-base.vue
+++ b/components/user-base/user-base.vue
@@ -104,7 +104,8 @@
                         type = Object.keys(obj)[index];
                     }
                 }
-                if((type || null) == null) {
+                
+                if((type || null) != null) {
                     // 是否需要展示弹窗提示
                     if (!this.popup_status && this.pages.indexOf(type) != -1 && this.client.indexOf(this.application_client_type) != -1) {
                         // 当前缓存用户
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5fc3c753..8a172cdf 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -448,7 +448,8 @@
             this.init();
             // 初始化配置
             this.init_config();
-
+            debugger;
+            console.log(this.$refs.common);
             // 公共onshow事件
             if ((this.$refs.common || null) != null) {
                 this.$refs.common.on_show();