修改条件判断

pages/component/general-attribute/general-attribute.uvue

@@ -70,13 +70,13 @@ export default {
   },
   methods: {
     validateGeneralAttributes() {
-      const generalTarget = this.$refs['general-target'] as Element
+      const generalTarget = this.$refs['general-target'] as UniElement
       const generalId = generalTarget.getAttribute('id')
       if (generalId != this.generalId) {
         this.validateGeneralAttrText = '基础属性 id 验证失败'
         return
       }
-      // #ifdef APP-ANDROID
+      // #ifdef APP
       if (!generalTarget.classList.includes('general-class')) {
       // #endif
       // #ifdef WEB

pages/tabBar/component.uvue

@@ -24,7 +24,7 @@
         </template>
       </uni-collapse>
 
-      <!-- #ifdef UNI-APP-X && APP -->
+      <!-- #ifdef UNI-APP-X && APP-ANDROID -->
       <uni-upgrade-center-app ref="upgradePopup" @show="upgradePopupShow" @close="upgradePopupClose" />
       <!-- #endif -->
     </view>
@@ -34,7 +34,7 @@
 </template>
 
 <script lang="uts">
-  // #ifdef UNI-APP-X && APP
+  // #ifdef UNI-APP-X && APP-ANDROID
   import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
   // #endif
 
@@ -290,7 +290,7 @@
           url,
         })
       }
-      // #ifdef UNI-APP-X && APP
+      // #ifdef UNI-APP-X && APP-ANDROID
       , upgradePopupShow() {
         console.log('upgradePopup show');
         if (!this.pageHiden) {
@@ -304,7 +304,7 @@
       // #endif
     },
     onReady() {
-      // #ifdef UNI-APP-X && APP
+      // #ifdef UNI-APP-X && APP-ANDROID
       checkUpdate(this.$refs['upgradePopup'] as UniUpgradeCenterAppComponentPublicInstance)
       // #endif
     },