From 9fb4dddf5aa21a8ff0aaa720d3dfea1106012d37 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Thu, 9 Nov 2023 16:17:05 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9D=A1=E4=BB=B6=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/component.uvue                   | 76 +++++++++----------
 .../utils/call-check-version.ts               |  2 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/pages/tabBar/component.uvue b/pages/tabBar/component.uvue
index c31f51c6..b4245b3a 100644
--- a/pages/tabBar/component.uvue
+++ b/pages/tabBar/component.uvue
@@ -38,10 +38,10 @@
             </view>
           </uni-collapse-item>
         </template>
-      </uni-collapse>
-
-      <!-- #ifdef UNI-APP-X -->
-      <uni-upgrade-center-app ref="upgradePopup" @close="upgradePopupClose" />
+      </uni-collapse>
+
+      <!-- #ifdef UNI-APP-X & APP -->
+      <uni-upgrade-center-app ref="upgradePopup" @close="upgradePopupClose" />
       <!-- #endif -->
     </view>
     <!-- #ifdef APP -->
@@ -49,10 +49,10 @@
   <!-- #endif -->
 </template>
 
-<script lang="uts">
-// #ifdef UNI-APP-X
-import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
-// #endif
+<script lang="uts">
+// #ifdef UNI-APP-X & APP
+import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
+// #endif
 
 type Page = {
   name : string
@@ -95,12 +95,12 @@ export default {
               */
             {
               name: 'list-view',
-            },
-            {
-              name: 'sticky-header',
-            },
-            {
-              name: 'sticky-section',
+            },
+            {
+              name: 'sticky-header',
+            },
+            {
+              name: 'sticky-section',
             }
           ] as Page[],
         },
@@ -230,17 +230,17 @@ export default {
               url: '/pages/component/web-view-local/web-view-local',
             },
           ] as Page[],
-        },
-        {
-          id: 'unicloud-db',
-          name: 'unicloud-db',
-          pages: [
-            {
-              name: '联系人',
-              enable: true,
-              url: '/pages/component/unicloud-db-contacts/list'
-            }
-          ] as Page[],
+        },
+        {
+          id: 'unicloud-db',
+          name: 'unicloud-db',
+          pages: [
+            {
+              name: '联系人',
+              enable: true,
+              url: '/pages/component/unicloud-db-contacts/list'
+            }
+          ] as Page[],
         },
         /*
           {
@@ -291,20 +291,20 @@ export default {
       uni.navigateTo({
         url,
       })
-    }
-    // #ifdef UNI-APP-X
-    ,upgradePopupClose() {
-      console.log('upgradePopup close');
-    }
+    }
+    // #ifdef UNI-APP-X & APP
+    ,upgradePopupClose() {
+      console.log('upgradePopup close');
+    }
+    // #endif
+  },
+  onReady() {
+    // #ifdef UNI-APP-X & APP
+  	checkUpdate(this.$refs['upgradePopup'] as UniUpgradeCenterAppComponentPublicInstance)
     // #endif
-  },
-  onReady() {
-    // #ifdef UNI-APP-X
-  	checkUpdate(this.$refs['upgradePopup'] as UniUpgradeCenterAppComponentPublicInstance)
-    // #endif
-  },
-  beforeUnmount() {
-    uni.showTabBar()?.catch(_ => {})
+  },
+  beforeUnmount() {
+    uni.showTabBar()?.catch(_ => {})
   }
 }
 </script>
diff --git a/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts b/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
index f14d99b5..0ca97842 100644
--- a/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
+++ b/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
@@ -63,7 +63,7 @@ export default function (): Promise<UniUpgradeCenterResult> {
 			reject('plus.runtime.appid is EMPTY')
 		}
 		// #endif
-		// // #ifdef UNI-APP-X
+		// #ifdef UNI-APP-X
 		if (typeof appId === 'string' && typeof appVersion === 'string' && appId.length > 0 && appVersion.length > 0) {
 			let data = {
 				action: 'checkVersion',
-- 
GitLab