fix(tabbar): import AppTabBar explicitly and use AppTabBar in templates for reliable rendering
这个提交包含在:
@@ -2,7 +2,9 @@
|
|||||||
"easycom": {
|
"easycom": {
|
||||||
"autoscan": true,
|
"autoscan": true,
|
||||||
"custom": {
|
"custom": {
|
||||||
|
"^AppTabBar$": "@/components/CustomTabBar.vue",
|
||||||
"^app-tab-bar$": "@/components/CustomTabBar.vue",
|
"^app-tab-bar$": "@/components/CustomTabBar.vue",
|
||||||
|
"^CustomTabBar$": "@/components/CustomTabBar.vue",
|
||||||
"^custom-tab-bar$": "@/components/CustomTabBar.vue"
|
"^custom-tab-bar$": "@/components/CustomTabBar.vue"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -167,14 +167,14 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部自定义导航栏 (发单人端:活动中心 / 我要发单 / 友圈 / 个人中心) -->
|
<!-- 底部自定义导航栏 (发单人端:活动中心 / 我要发单 / 友圈 / 个人中心) -->
|
||||||
<app-tab-bar current="activity" />
|
<AppTabBar current="activity" />
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
||||||
import { onShow, onLoad } from '@dcloudio/uni-app';
|
import { onShow, onLoad } from '@dcloudio/uni-app';
|
||||||
import CustomTabBar from '@/components/CustomTabBar.vue';
|
import AppTabBar from '@/components/CustomTabBar.vue';
|
||||||
import SkeletonScreen from '@/components/SkeletonScreen.vue';
|
import SkeletonScreen from '@/components/SkeletonScreen.vue';
|
||||||
import { getActivities, getNavCategories } from '@/common/api.js';
|
import { getActivities, getNavCategories } from '@/common/api.js';
|
||||||
import { ICONS } from '@/common/icons.js';
|
import { ICONS } from '@/common/icons.js';
|
||||||
|
|||||||
@@ -293,14 +293,14 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部自定义导航栏 (发单人端:活动中心 / 我要发单 / 友圈 / 个人中心) -->
|
<!-- 底部自定义导航栏 (发单人端:活动中心 / 我要发单 / 友圈 / 个人中心) -->
|
||||||
<app-tab-bar current="community" />
|
<AppTabBar current="community" />
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
||||||
import { onShow } from '@dcloudio/uni-app';
|
import { onShow } from '@dcloudio/uni-app';
|
||||||
import CustomTabBar from '@/components/CustomTabBar.vue';
|
import AppTabBar from '@/components/CustomTabBar.vue';
|
||||||
import SkeletonScreen from '@/components/SkeletonScreen.vue';
|
import SkeletonScreen from '@/components/SkeletonScreen.vue';
|
||||||
import { ICONS } from '@/common/icons.js';
|
import { ICONS } from '@/common/icons.js';
|
||||||
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
|
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
|
||||||
|
|||||||
@@ -104,14 +104,14 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部自定义导航栏 (接单人端:接单大厅 / 我要接单[5km雷达] / 个人中心) -->
|
<!-- 底部自定义导航栏 (接单人端:接单大厅 / 我要接单[5km雷达] / 个人中心) -->
|
||||||
<app-tab-bar current="hall" />
|
<AppTabBar current="hall" />
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
||||||
import { onShow } from '@dcloudio/uni-app';
|
import { onShow } from '@dcloudio/uni-app';
|
||||||
import CustomTabBar from '@/components/CustomTabBar.vue';
|
import AppTabBar from '@/components/CustomTabBar.vue';
|
||||||
import { ICONS } from '@/common/icons.js';
|
import { ICONS } from '@/common/icons.js';
|
||||||
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
|
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
|
||||||
import { isExpertCertified } from '@/common/role.js';
|
import { isExpertCertified } from '@/common/role.js';
|
||||||
|
|||||||
@@ -173,14 +173,14 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部自定义导航栏 (接单人端:接单大厅 / 我要接单[5km雷达] / 个人中心) -->
|
<!-- 底部自定义导航栏 (接单人端:接单大厅 / 我要接单[5km雷达] / 个人中心) -->
|
||||||
<app-tab-bar current="radar" />
|
<AppTabBar current="radar" />
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
||||||
import { onShow } from '@dcloudio/uni-app';
|
import { onShow } from '@dcloudio/uni-app';
|
||||||
import CustomTabBar from '@/components/CustomTabBar.vue';
|
import AppTabBar from '@/components/CustomTabBar.vue';
|
||||||
import { ICONS } from '@/common/icons.js';
|
import { ICONS } from '@/common/icons.js';
|
||||||
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
|
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
|
||||||
import { isExpertCertified } from '@/common/role.js';
|
import { isExpertCertified } from '@/common/role.js';
|
||||||
|
|||||||
@@ -116,7 +116,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部自定义导航栏 (发单人端:首页 / 活动中心 / 我要发单 / 友圈 / 个人中心) -->
|
<!-- 底部自定义导航栏 (发单人端:首页 / 活动中心 / 我要发单 / 友圈 / 个人中心) -->
|
||||||
<app-tab-bar current="home" />
|
<AppTabBar current="home" />
|
||||||
|
|
||||||
<!-- 微信小程序用户隐私保护指引弹窗 (微信合规) -->
|
<!-- 微信小程序用户隐私保护指引弹窗 (微信合规) -->
|
||||||
<privacy-modal />
|
<privacy-modal />
|
||||||
@@ -129,7 +129,7 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
||||||
import { onShow } from '@dcloudio/uni-app';
|
import { onShow } from '@dcloudio/uni-app';
|
||||||
import CustomTabBar from '@/components/CustomTabBar.vue';
|
import AppTabBar from '@/components/CustomTabBar.vue';
|
||||||
import SkeletonScreen from '@/components/SkeletonScreen.vue';
|
import SkeletonScreen from '@/components/SkeletonScreen.vue';
|
||||||
import PrivacyModal from '@/components/PrivacyModal.vue';
|
import PrivacyModal from '@/components/PrivacyModal.vue';
|
||||||
import HomePopupModal from '@/components/HomePopupModal.vue';
|
import HomePopupModal from '@/components/HomePopupModal.vue';
|
||||||
|
|||||||
@@ -325,7 +325,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部自定义导航栏 (动态自适应发单人4项 / 接单人3项) -->
|
<!-- 底部自定义导航栏 (动态自适应发单人4项 / 接单人3项) -->
|
||||||
<app-tab-bar current="user" />
|
<AppTabBar current="user" />
|
||||||
|
|
||||||
<!-- 微信小程序用户隐私保护指引弹窗 (微信合规) -->
|
<!-- 微信小程序用户隐私保护指引弹窗 (微信合规) -->
|
||||||
<privacy-modal ref="privacyModalRef" />
|
<privacy-modal ref="privacyModalRef" />
|
||||||
@@ -335,7 +335,7 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
import { ref, computed, onMounted, onUnmounted } from 'vue';
|
||||||
import { onShow } from '@dcloudio/uni-app';
|
import { onShow } from '@dcloudio/uni-app';
|
||||||
import CustomTabBar from '@/components/CustomTabBar.vue';
|
import AppTabBar from '@/components/CustomTabBar.vue';
|
||||||
import PrivacyModal from '@/components/PrivacyModal.vue';
|
import PrivacyModal from '@/components/PrivacyModal.vue';
|
||||||
import { ICONS } from '@/common/icons.js';
|
import { ICONS } from '@/common/icons.js';
|
||||||
import { getCurrentThemeKey, setTheme, THEME_KEYS, applyThemeToNativeUI } from '@/common/theme.js';
|
import { getCurrentThemeKey, setTheme, THEME_KEYS, applyThemeToNativeUI } from '@/common/theme.js';
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户