快乐的梦鱼 1 месяц назад
Родитель
Сommit
c13b64c05d

+ 1 - 1
src/pages/home/village/bless/recharge.vue

@@ -30,7 +30,7 @@
       </FlexCol>
 
       <SimplePageContentLoader :loader="infoLoader">
-        <FlexCol gap="gap.md" padding="padding.md">
+        <FlexCol v-if="infoLoader.isLoaded.value" gap="gap.md" padding="padding.md">
           <IconTextBlock icon="prompt" :iconProps="{ 
             color: 'text.content',
             size: 40,

+ 1 - 1
src/pages/home/village/goods/detail.vue

@@ -2,7 +2,7 @@
   <CommonTopBanner title="乡源好物详情">
     <FlexCol gap="gap.md" padding="padding.md">
     <SimplePageContentLoader :loader="goodLoader">
-      <template v-if="goodLoader.content.value">
+      <template v-if="goodLoader.content.value && goodLoader.isLoaded.value">
         <BoxMid>
           <ImageSwiper 
             :images="goodLoader.content.value.images"

+ 5 - 3
src/pages/home/village/goods/index.vue

@@ -46,7 +46,7 @@ import { onMounted, ref } from 'vue';
 import { useSimplePageListLoader } from '@/components/composeabe/loader/SimplePageListLoader';
 import { useLoadQuerys } from '@/components/composeabe/LoadQuerys';
 import { useUserTools } from '@/common/composeabe/UserTools';
-import { confirm } from '@/components/utils/DialogAction';
+import { alert, confirm } from '@/components/dialog/CommonRoot';
 import BoxMid from '@/common/components/box/BoxMid.vue';
 import FrameButton from '@/common/components/FrameButton.vue';
 import Image from '@/components/basic/Image.vue';
@@ -59,7 +59,6 @@ import FlexRow from '@/components/layout/FlexRow.vue';
 import SimplePageListLoader from '@/components/loader/SimplePageListLoader.vue';
 import VillageInfoApi from '@/api/inhert/VillageInfoApi';
 import CommonTopBanner from '@/common/components/CommonTopBanner.vue';
-import { toast } from '@/components/dialog/CommonRoot';
 
 const { querys } = useLoadQuerys({
   villageId: 0,
@@ -111,7 +110,10 @@ const handlePublish = () => {
   });
 }
 const handleOpen = () => {
-  toast('暂未开放,敬请期待!');
+  alert({
+    title: '提示',
+    content: '暂未开放,敬请期待!若有开店需求,可通过在线客服联系我们'
+  });
 }
 
 async function loadVolunteerInfo() {

+ 1 - 1
src/pages/home/village/rank/village.vue

@@ -1,7 +1,7 @@
 <template>
   <CommonTopBanner title="村社排名">
     <SimplePageContentLoader :loader="villageRankListLoader">
-      <FlexCol gap="gap.lg" padding="space.md">
+      <FlexCol v-if="villageRankListLoader.isLoaded.value" gap="gap.lg" padding="space.md">
         <RankVillageItem
           v-for="item in villageRankListLoader.content.value"
           :key="item.id"

+ 1 - 1
src/pages/home/village/rank/volunteer.vue

@@ -1,7 +1,7 @@
 <template>
   <CommonTopBanner title="志愿者排名">
     <SimplePageContentLoader :loader="villageUserRankListLoader">
-      <FlexCol gap="gap.lg" padding="space.md">
+      <FlexCol v-if="villageUserRankListLoader.isLoaded.value" gap="gap.lg" padding="space.md">
         <VillageUserRankList 
           :list="villageUserRankListFirst3" 
           scoreSuffix="文化积分"

+ 1 - 1
src/pages/home/village/upgrade/pay-public.vue

@@ -5,7 +5,7 @@
   >
     <FlexCol padding="padding.md">
       <SimplePageContentLoader :loader="loader">
-        <template v-if="loader.content.value">
+        <template v-if="loader.content.value && loader.isLoaded.value">
           <FlexCol :gap="20">
             <FlexCol :padding="20" :radius="20">
               <Parse

+ 1 - 0
src/pages/index.vue

@@ -135,6 +135,7 @@ async function paySuccessAndRefresh() {
 
 watch(tabIndex, () => {
   uni.setStorageSync('lastTabIndex', tabIndex.value);
+  uni.pageScrollTo({ scrollTop: 0 });
 });