💊 优化村社详情页

src/common/components/FrameButton.vue

@@ -11,8 +11,8 @@
     gap="gap.md"
     @click="emit('click')"
   >
-    <ActivityIndicator v-if="loading" :size="36" :color="primary ? 'white' : 'text.content'" />
-    <Text :text="text" fontConfig="lightTitle" :fontSize="36" :color="primary ? 'white' : 'text.content'" />
+    <ActivityIndicator v-if="loading" :size="size === 'large' ? 36 : 28" :color="primary ? 'white' : 'text.content'" />
+    <Text :text="text" fontConfig="lightTitle" :fontSize="size === 'large' ? 36 : 28" :color="primary ? 'white' : 'text.content'" />
   </BackgroundImageButton>
 </template>
 
@@ -39,7 +39,7 @@ const padding = computed(() => {
   if (props.size === 'large') {
     return [22, 36];
   } else {
-    return [24, 25];
+    return [18, 20];
   }
 });
 

src/pages.json

@@ -112,13 +112,6 @@
       }
     },
     {
-      "path": "pages/home/village/honor/index",
-      "style": {
-        "navigationBarTitleText": "乡源荣光",
-        "navigationStyle": "custom"
-      }
-    },
-    {
       "path": "pages/home/village/gov/index",
       "style": {
         "navigationBarTitleText": "政贤连心",

src/pages/dig/details.vue

@@ -9,12 +9,13 @@
       />
       <FlexRow align="center" :gap="10" backgroundColor="white" :padding="20" radius="radius.md">
         <FlexRow flexBasis="50%">
-          <Text :fontSize="30" text="已点亮:" />
+          <Text :fontSize="30" :text="isJoined ? '已认领:' : '未认领:'" />
           <Width :width="20" />
           <Text :fontSize="30" color="primary" :text="decodeURIComponent(querys.name)" />
         </FlexRow>
         <FlexRow flexBasis="50%" align="center">
           <Text :fontSize="30" color="text.content" :text="`文化积分: `" />
+          <Width :width="20" />
           <Text :fontSize="40" fontFamily="SongtiSCBlack" color="primary" :text="querys.points" />
           <Width :width="20" />
           <Text :fontSize="40" fontFamily="SongtiSCBlack" color="primary" :text="`Lv.${querys.level}`" />

src/pages/home/village/dialogs/ApplyGoodsDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonDialog v-model:show="show" title="TODO：申请逻辑等着设计">
+  <CommonDialog v-model:show="show" title="申请村社">
     <FlexCol gap="gap.lg">
       <FlexRow wrap justify="space-around" gap="gap.md">
         <BackgroundBox 
@@ -31,7 +31,7 @@
         center
       >
         <Text text="额外权益" fontConfig="lightImportantTitle" />
-        <Text text="平台首页展厅/阁楼名投、好图上传、村图券赠送、修改图片平台基础建设、花田引入正版授权歌曲+30%、乡源果奖励等" fontConfig="contentText" />
+        <Text text="TODO: 此处为测试数据，还未规定升级方案。平台首页展厅/阁楼名投、好图上传、村图券赠送、修改图片平台基础建设、花田引入正版授权歌曲+30%、乡源果奖励等" fontConfig="contentText" />
       </BackgroundBox>
       <FlexRow justify="space-around" gap="gap.md">
         <FrameButton text="取消" @click="show = false" width="220rpx" />

src/pages/home/village/goods/index.vue

@@ -1,7 +1,7 @@
 <template>
   <FlexCol gap="gap.md" padding="padding.md">
     <FlexRow justify="space-between" align="center" gap="gap.sm">
-      <SearchBar v-model:value="searchValue" :innerStyle="{ width: '440rpx' }" />
+      <SearchBar v-model:value="searchValue" placeholder="搜索乡源好物" :innerStyle="{ width: '440rpx' }" />
       <FrameButton text="开通微信小店" size="small" />
     </FlexRow>
     <Construction text="现在是测试数据，暂无接口" />

src/pages/home/village/honor/index.vue

@@ -1,23 +0,0 @@
-<template>
-  <CommonTopBanner title="乡源荣光">
-    <Construction
-      text="等待设计《乡源荣光》页面"
-    />
-  </CommonTopBanner>
-</template>
-
-<script setup lang="ts">  
-import { useSimpleDataLoader } from '@/components/composeabe/loader/SimpleDataLoader';
-import { useVillageStore } from '@/store/village';
-import Construction from '@/common/components/Construction.vue';
-import CommonTopBanner from '@/common/components/CommonTopBanner.vue';
-
-const villageStore = useVillageStore();
-const recommendLoader = useSimpleDataLoader(async () => {
-  if (!villageStore.currentRegion)
-    return [];
-
-
-  return [];
-});
-</script>

src/pages/home/village/introd/card.vue

@@ -38,22 +38,20 @@
       </FlexRow>
 
       <!-- 状态与申请 -->
-      <Construction text="暂无数据">
-        <FlexRow 
-          backgroundColor="background.tertiary" 
-          radius="radius.md" 
-          padding="space.md" 
-          justify="space-between" 
-        >
-          <FlexCol gap="gap.md"> 
-            <Text :text="`${villageInfoLoader.content.value?.applyCount} 个乡源果可申请`" fontConfig="secondText" />  
-            <Text :text="`存储空间内存：${villageInfoLoader.content.value?.sizeText}`" fontConfig="secondText" />
-          </FlexCol>
-          <FlexCol gap="gap.md">
-            <Button icon="https://xy.wenlvti.net/app_static/images/village/IconUser.png" radius="radius.lgr" :padding="[10, 30]" backgroundColor="white" @click="($refs.applyGoodsDialog as any).show()">申请管理者</Button>
-          </FlexCol>
-        </FlexRow>
-      </Construction>
+      <FlexRow 
+        backgroundColor="background.tertiary" 
+        radius="radius.md" 
+        padding="space.md" 
+        justify="space-between" 
+      >
+        <FlexCol gap="gap.md"> 
+          <Text :text="`${villageInfoLoader.content.value?.applyCount} 个乡源果可申请`" fontConfig="secondText" />  
+          <Text :text="`存储空间内存：${villageInfoLoader.content.value?.sizeText}`" fontConfig="secondText" />
+        </FlexCol>
+        <FlexCol gap="gap.md">
+          <Button icon="https://xy.wenlvti.net/app_static/images/village/IconUser.png" radius="radius.lgr" :padding="[10, 30]" backgroundColor="white" @click="($refs.applyGoodsDialog as any).show()">升级村社</Button>
+        </FlexCol>
+      </FlexRow>
       
       <!-- 图片 -->
       <VillageGallery
@@ -180,7 +178,7 @@
       GridItemPaddingVertical: 8,
     }">
       <Grid :borderGrid="false" :mainAxisCount="4">
-        <GridItem title="乡源荣光" icon="https://xy.wenlvti.net/app_static/images/village/IconLargeHornor.png" touchable @click="navTo('/pages/home/village/honor/index')" />
+        <GridItem title="乡源荣光" icon="https://xy.wenlvti.net/app_static/images/village/IconLargeHornor.png" touchable @click="handleGoCollect(23, '乡源荣光')" />
         <GridItem title="乡源好物" icon="https://xy.wenlvti.net/app_static/images/village/IconLargeGoods.png" touchable @click="navTo('/pages/home/village/goods/index')" />
         <GridItem title="乡源树" icon="https://xy.wenlvti.net/app_static/images/village/IconLargeTree.png" touchable @click="emit('goTree')" />
         <!-- <GridItem title="政贤连心" icon="https://xy.wenlvti.net/app_static/images/village/IconGovAffairs.png" touchable @click="navTo('/pages/home/village/gov/index')" /> -->
@@ -335,6 +333,7 @@ function handleGoCollect(collectModuleId?: number, title?: string) {
   if (!collectModuleId) {
     navTo('/pages/dig/details', {
       villageId: villageStore.currentVillage?.id ?? undefined,
+      name: villageInfoLoader.content.value?.title,
     });
     return;
   }