diff --git a/uni-app/src/App.vue b/uni-app/src/App.vue index 199f52586..ca856c82b 100644 --- a/uni-app/src/App.vue +++ b/uni-app/src/App.vue @@ -1,22 +1,20 @@ diff --git a/uni-app/src/addon/components/diy/group/index.vue b/uni-app/src/addon/components/diy/group/index.vue index 0cd1466e4..1e09a79bb 100644 --- a/uni-app/src/addon/components/diy/group/index.vue +++ b/uni-app/src/addon/components/diy/group/index.vue @@ -61,22 +61,43 @@ import topTabbar from '@/components/top-tabbar/top-tabbar.vue' import useDiyStore from '@/app/stores/diy'; - import { ref, onMounted, nextTick, computed } from 'vue'; - import { getLocation } from '@/utils/common'; + import { ref, onMounted, nextTick, computed, watch } from 'vue'; + import { useRouter } from 'vue-router'; + import { getLocation } from '@/utils/common'; import Sortable from 'sortablejs'; import { range } from 'lodash-es'; import { onPageScroll } from '@dcloudio/uni-app' import useConfigStore from '@/stores/config' + const props = defineProps(['data','pullDownRefreshCount']); const diyStore = useDiyStore(); - - const data = computed(() => { - if (diyStore.mode == 'decorate') { - return diyStore; - } else { - return props.data; - } + const router = useRouter(); + const data = computed(()=>{ + if (diyStore.mode == 'decorate') { + return diyStore; + } else { + return props.data; + } }) + + // 兼容轮播搜索组件-切换分类时,导致个人中心白屏 - start + // #ifdef H5 + watch(() => router.currentRoute.value, (newRoute) => { + if(newRoute.path != "/addon/shop/pages/index"){ + diyStore.topFixedStatus = 'home' + } + }); + + // #endif + + // #ifdef MP + wx.onAppRoute(function(res) { + if(res.path != "addon/shop/pages/index"){ + diyStore.topFixedStatus = 'home' + } + }); + // #endif + // 兼容轮播搜索组件-切换分类时,导致个人中心白屏 - end const tabbarAddonName = computed(() => { return useConfigStore().addon; @@ -100,7 +121,7 @@ } return obj; } - + onMounted(() => { // #ifdef H5 if (diyStore.mode == 'decorate') { diff --git a/uni-app/src/manifest.json b/uni-app/src/manifest.json index f3a46c504..3e9ba82c9 100644 --- a/uni-app/src/manifest.json +++ b/uni-app/src/manifest.json @@ -1,5 +1,5 @@ { - "name" : "wx59e6ba6050bbe7bc", + "name" : "", "appid" : "__UNI__ED923AB", "description" : "", "versionName" : "1.0.0", diff --git a/uni-app/src/pages.json b/uni-app/src/pages.json index 9d6a20c25..3c259f73d 100644 --- a/uni-app/src/pages.json +++ b/uni-app/src/pages.json @@ -86,6 +86,9 @@ { "path": "app/pages/member/commission", "style": { + // #ifndef H5 + "navigationStyle": "custom", + // #endif "navigationBarTitleText": "%pages.member.commission%" }, "needLogin": true @@ -93,6 +96,9 @@ { "path": "app/pages/member/balance", "style": { + // #ifndef H5 + "navigationStyle": "custom", + // #endif "navigationBarTitleText": "%pages.member.balance%" }, "needLogin": true @@ -128,10 +134,10 @@ { "path": "app/pages/member/index", "style": { - "navigationBarTitleText": "%pages.member.index%", // #ifndef H5 "navigationStyle": "custom", // #endif + "navigationBarTitleText": "%pages.member.index%", "usingComponents": { "diy-group": "../../../../addon/components/diy/group/index", "fixed-group": "../../../../addon/components/fixed/group/index" @@ -152,10 +158,20 @@ { "path": "app/pages/member/point", "style": { + // #ifndef H5 + "navigationStyle": "custom", + // #endif "navigationBarTitleText": "%pages.member.point%" }, "needLogin": true }, + { + "path": "app/pages/member/point_detail", + "style": { + "navigationBarTitleText": "%pages.member.point_detail%" + }, + "needLogin": true + }, { "path": "app/pages/member/account", "style": {