快乐的梦鱼 3 тижнів тому
батько
коміт
4fc6c72e11
60 змінених файлів з 101 додано та 392 видалено
  1. 1 2
      src/App.vue
  2. 1 1
      src/common/components/parts/HomeLargeTitle.vue
  3. 1 1
      src/common/components/parts/HomeTitle.vue
  4. 1 1
      src/pages/dig/index.vue
  5. 1 1
      src/pages/home/components/VillageMiniMap.vue
  6. 2 2
      src/pages/home/components/VillageRankList.vue
  7. 1 1
      src/pages/home/components/VillageUserRankList.vue
  8. 7 7
      src/pages/home/discover/index.vue
  9. 5 5
      src/pages/home/index.vue
  10. 65 2
      src/pages/home/village/index.vue
  11. 6 6
      src/pages/index.vue
  12. 10 10
      src/pages/user/index.vue
  13. 0 353
      src/static/css/font.css
  14. BIN
      src/static/images/StarLarge.png
  15. BIN
      src/static/images/StarMid.png
  16. BIN
      src/static/images/StarNotLight1.png
  17. BIN
      src/static/images/StarSmall.png
  18. BIN
      src/static/images/StarX.png
  19. BIN
      src/static/images/dig/IntrodBanner.png
  20. BIN
      src/static/images/dig/TopBanner.png
  21. BIN
      src/static/images/discover/IconAll.png
  22. BIN
      src/static/images/discover/IconBase.png
  23. BIN
      src/static/images/discover/IconExamples.png
  24. BIN
      src/static/images/discover/IconQuestions.png
  25. BIN
      src/static/images/discover/IconShare.png
  26. BIN
      src/static/images/discover/IconTrick.png
  27. BIN
      src/static/images/discover/TopBanner.png
  28. BIN
      src/static/images/home/BannerHome.png
  29. BIN
      src/static/images/home/BannerIndex.png
  30. BIN
      src/static/images/home/HomeTitleIcon.png
  31. BIN
      src/static/images/home/IconLight.png
  32. BIN
      src/static/images/home/IconLightActive.png
  33. BIN
      src/static/images/home/IconSwitch.png
  34. BIN
      src/static/images/home/Rank1.png
  35. BIN
      src/static/images/home/Rank2.png
  36. BIN
      src/static/images/home/Rank3.png
  37. BIN
      src/static/images/home/RankBadge1.png
  38. BIN
      src/static/images/home/RankBadgeN.png
  39. BIN
      src/static/images/home/image 2280@2x.png
  40. BIN
      src/static/images/mine/IconAbout.png
  41. BIN
      src/static/images/mine/IconArchive.png
  42. BIN
      src/static/images/mine/IconContract.png
  43. BIN
      src/static/images/mine/IconLevel.png
  44. BIN
      src/static/images/mine/IconMyArticle.png
  45. BIN
      src/static/images/mine/IconMyRecord.png
  46. BIN
      src/static/images/mine/IconMyReward.png
  47. BIN
      src/static/images/mine/IconQuit.png
  48. BIN
      src/static/images/mine/IconShop.png
  49. BIN
      src/static/images/mine/IconTask.png
  50. BIN
      src/static/images/mine/TopBanner.png
  51. BIN
      src/static/images/tabs/TabIconDig.png
  52. BIN
      src/static/images/tabs/TabIconDigActive.png
  53. BIN
      src/static/images/tabs/TabIconDiscover.png
  54. BIN
      src/static/images/tabs/TabIconDiscoverActive.png
  55. BIN
      src/static/images/tabs/TabIconHome.png
  56. BIN
      src/static/images/tabs/TabIconHomeActive.png
  57. BIN
      src/static/images/tabs/TabIconMine.png
  58. BIN
      src/static/images/tabs/TabIconMineActive.png
  59. BIN
      src/static/images/tabs/TabIconVillage.png
  60. BIN
      src/static/images/tabs/TabIconVillageActive.png

+ 1 - 2
src/App.vue

@@ -86,7 +86,7 @@ configTheme(false, (theme, defaultDarkTheme) => {
   theme.colorConfigs.background.secondary = '#f7f8f9';
   theme.colorConfigs.background.tertiary = '#fff7f1';
 
-  theme.varOverrides['ImageDefaultImage'] = 'https://mncdn.wenlvti.net/app_static/xiangyuan/EmptyImage.png';
+  theme.varOverrides['ImageDefaultImage'] = 'https://xy.wenlvti.net/app_static/EmptyImage.png';
   return [theme, defaultDarkTheme];
 });
 
@@ -95,7 +95,6 @@ IconUtils.loadDefaultIcons('https://mncdn.wenlvti.net/app_static/xiangyuan/data/
 
 <style lang="scss">
 	/*每个页面公共css */
-  @import "@/static/css/font.css";
   @import "@/components/index.scss";
 
   page {

+ 1 - 1
src/common/components/parts/HomeLargeTitle.vue

@@ -20,7 +20,7 @@ const props = defineProps({
   },
   icon: {
     type: String,
-    default: '/static/images/home/HomeTitleIcon.png',
+    default: 'https://xy.wenlvti.net/app_static/images/home/HomeTitleIcon.png',
   },
   lightCount: {
     type: Number,

+ 1 - 1
src/common/components/parts/HomeTitle.vue

@@ -35,7 +35,7 @@ const props = defineProps({
   },
   icon: {
     type: String,
-    default: '/static/images/home/HomeTitleIcon.png',
+    default: 'https://xy.wenlvti.net/app_static/images/home/HomeTitleIcon.png',
   },
   showMore: {
     type: Boolean,

+ 1 - 1
src/pages/dig/index.vue

@@ -4,7 +4,7 @@
       <HomeLargeTitle title="挖掘" />
       <Image 
         mode="aspectFill" 
-        src="/static/images/dig/IntrodBanner.png"
+        src="https://xy.wenlvti.net/app_static/images/dig/IntrodBanner.png"
         width="100%"
         :height="300"
         radius="20"

+ 1 - 1
src/pages/home/components/VillageMiniMap.vue

@@ -28,7 +28,7 @@
       :textStyle="{
         fontSize: '26rpx',
       }"
-      icon="/static/images/home/IconLightActive.png"
+      icon="https://xy.wenlvti.net/app_static/images/home/IconLightActive.png"
       :iconProps="{
         size: 34,
       }"

+ 2 - 2
src/pages/home/components/VillageRankList.vue

@@ -33,8 +33,8 @@
           backgroundRepeat: 'no-repeat',
           backgroundPosition: 'center',
           backgroundImage: item.rank == 1 ?
-            `url('/static/images/home/RankBadge1.png')` :
-            `url('/static/images/home/RankBadgeN.png')`,
+            `url('https://xy.wenlvti.net/app_static/images/home/RankBadge1.png')` :
+            `url('https://xy.wenlvti.net/app_static/images/home/RankBadgeN.png')`,
         }"
       >
         <Text v-if="item.rank > 1" fontConfig="h4" :text="item.rank" color="white" />

+ 1 - 1
src/pages/home/components/VillageUserRankList.vue

@@ -10,7 +10,7 @@
         backgroundSize: '100% auto',
         backgroundRepeat: 'no-repeat',
         backgroundPosition: 'center',
-        backgroundImage: `url('/static/images/home/Rank${item.rank}.png')`
+        backgroundImage: `url('https://xy.wenlvti.net/app_static/images/home/Rank${item.rank}.png')`
       }"
       overflow="hidden"
     >

+ 7 - 7
src/pages/home/discover/index.vue

@@ -3,7 +3,7 @@
     <HomeLargeTitle title="发现" />
     <Image
       mode="aspectFill" 
-      src="/static/images/dig/IntrodBanner.png"
+      src="https://xy.wenlvti.net/app_static/images/dig/IntrodBanner.png"
       width="100%"
       :height="300"
       radius="20"
@@ -19,12 +19,12 @@
       GridItemPaddingHorizontal: 0,
     }">
       <Grid :borderGrid="false" :mainAxisCount="3">
-        <GridItem title="全部" icon="/static/images/discover/IconAll.png" touchable @click="goList('')" />
-        <GridItem title="优秀案例" icon="/static/images/discover/IconExamples.png" touchable @click="goList('环境格局')" />
-        <GridItem title="经验分享" icon="/static/images/discover/IconShare.png" touchable @click="goList('传统建筑')" />
-        <GridItem title="常见问题" icon="/static/images/discover/IconQuestions.png" touchable @click="goList('民俗文化')" />
-        <GridItem title="挖掘技巧" icon="/static/images/discover/IconTrick.png" touchable @click="goList('美食物产')" />
-        <GridItem title="认知基础" icon="/static/images/discover/IconBase.png" touchable @click="goList('历史人物')" />
+        <GridItem title="全部" icon="https://xy.wenlvti.net/app_static/images/discover/IconAll.png" touchable @click="goList('')" />
+        <GridItem title="优秀案例" icon="https://xy.wenlvti.net/app_static/images/discover/IconExamples.png" touchable @click="goList('环境格局')" />
+        <GridItem title="经验分享" icon="https://xy.wenlvti.net/app_static/images/discover/IconShare.png" touchable @click="goList('传统建筑')" />
+        <GridItem title="常见问题" icon="https://xy.wenlvti.net/app_static/images/discover/IconQuestions.png" touchable @click="goList('民俗文化')" />
+        <GridItem title="挖掘技巧" icon="https://xy.wenlvti.net/app_static/images/discover/IconTrick.png" touchable @click="goList('美食物产')" />
+        <GridItem title="认知基础" icon="https://xy.wenlvti.net/app_static/images/discover/IconBase.png" touchable @click="goList('历史人物')" />
       </Grid>
     </ProvideVar>
     

+ 5 - 5
src/pages/home/index.vue

@@ -1,7 +1,7 @@
 <template>
   <FlexCol :gap="20" :padding="30" :innerStyle="{
     marginTop: '-130px',
-    backgroundImage: 'url(/static/images/home/BannerHome.png)',
+    backgroundImage: 'url(https://xy.wenlvti.net/app_static/images/home/BannerHome.png)',
     backgroundSize: '100% auto',
     backgroundRepeat: 'no-repeat',
     backgroundPosition: 'top center',
@@ -18,7 +18,7 @@
         width: '650rpx',
       }" />
       <Image 
-        src="/static/images/home/BannerIndex.png" 
+        src="https://xy.wenlvti.net/app_static/images/home/BannerIndex.png" 
         width="700rpx" 
         mode="widthFix" 
         :innerStyle="{
@@ -30,9 +30,9 @@
 
     <VillageMiniMap />
     <FlexRow justify="space-between" :padding="[10, 16]">
-      <Button icon="/static/images/home/IconSwitch.png" :radius="40" :padding="[10, 30]" :iconProps="{ innerStyle: { marginRight: '10rpx' }}">切换城市</Button>
-      <Button icon="/static/images/home/IconSwitch.png" :radius="40" :padding="[10, 30]" :iconProps="{ innerStyle: { marginRight: '10rpx' }}">我的关注</Button>
-      <Button icon="/static/images/home/IconLight.png" :radius="40" :padding="[10, 30]" :iconProps="{ innerStyle: { marginRight: '10rpx' }}">点亮村社</Button>
+      <Button icon="https://xy.wenlvti.net/app_static/images/home/IconSwitch.png" :radius="40" :padding="[10, 30]" :iconProps="{ innerStyle: { marginRight: '10rpx' }}">切换城市</Button>
+      <Button icon="https://xy.wenlvti.net/app_static/images/home/IconSwitch.png" :radius="40" :padding="[10, 30]" :iconProps="{ innerStyle: { marginRight: '10rpx' }}">我的关注</Button>
+      <Button icon="https://xy.wenlvti.net/app_static/images/home/IconLight.png" :radius="40" :padding="[10, 30]" :iconProps="{ innerStyle: { marginRight: '10rpx' }}">点亮村社</Button>
     </FlexRow>
 
     <HomeTitle title="乡村排名" showMore />

+ 65 - 2
src/pages/home/village/index.vue

@@ -1,3 +1,66 @@
 <template>
-  
-</template>
+  <FlexCol :gap="20" :padding="30">
+    <HomeLargeTitle title="发现" />
+    <Image
+      mode="aspectFill" 
+      src="https://xy.wenlvti.net/app_static/images/dig/IntrodBanner.png"
+      width="100%"
+      :height="300"
+      radius="20"
+      :innerStyle="{
+        border: '1px solid #fff',
+      }"
+    />
+    
+
+
+    <HomeTitle title="最新推荐" />
+    <SimplePageContentLoader :loader="discoverLoader">
+      <FlexCol :gap="25" backgroundColor="background.tertiary" :radius="20" :padding="30">
+        <ImageBlock3 
+          v-for="(item, i) in discoverLoader.content.value"
+          :key="i"
+          backgroundColor="transparent"
+          :src="item.image"
+          :title="item.title"
+          :desc="item.desc"
+          :imageRadius="15"
+          :imageWidth="200"
+          :imageHeight="140"
+        />
+      </FlexCol>
+    </SimplePageContentLoader>
+    
+    <Loadmore status="nomore" />
+    <Height :height="150" />
+  </FlexCol>
+</template>
+
+<script setup lang="ts">
+import { navTo } from '@/components/utils/PageAction';
+import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
+import SimplePageContentLoader from '@/common/components/SimplePageContentLoader.vue';
+import Loadmore from '@/components/display/loading/Loadmore.vue';
+import FlexCol from '@/components/layout/FlexCol.vue';
+import Height from '@/components/layout/space/Height.vue';
+import ProvideVar from '@/components/theme/ProvideVar.vue';
+import Grid from '@/components/layout/grid/Grid.vue';
+import GridItem from '@/components/layout/grid/GridItem.vue';
+import VillageInfoApi from '@/api/inhert/VillageInfoApi';
+import Tag from '@/components/display/Tag.vue';
+import Image from '@/components/basic/Image.vue';
+import HomeLargeTitle from '@/common/components/parts/HomeLargeTitle.vue';
+import HomeTitle from '@/common/components/parts/HomeTitle.vue';
+import ImageBlock3 from '@/components/display/block/ImageBlock3.vue';
+
+const discoverLoader = useSimpleDataLoader(async () => {
+  return (await VillageInfoApi.getListForDiscover(1, 30)).list.map((item) => {
+    return {
+      ...item,
+      image: (item.thumbnail || item.image) as string,
+      desc: item.desc || '',
+      title: item.title,
+    }
+  })
+});
+</script>

+ 6 - 6
src/pages/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="index" :style="{
-    backgroundImage: tabIndex === 4 ? `url('/static/images/mine/TopBanner.png')` : `url('/static/images/dig/TopBanner.png')`,
+    backgroundImage: tabIndex === 4 ? `url('https://xy.wenlvti.net/app_static/images/mine/TopBanner.png')` : `url('https://xy.wenlvti.net/app_static/images/dig/TopBanner.png')`,
     backgroundRepeat: 'no-repeat',
     backgroundSize: '100% auto',
     backgroundPosition: 'top center',
@@ -27,11 +27,11 @@
           backgroundColor: '#ffead8',
         }"
       >
-        <TabBarItem icon="/static/images/tabs/TabIconHome.png" activeIcon="/static/images/tabs/TabIconHomeActive.png" text="首页" :iconSize="70" />
-        <TabBarItem icon="/static/images/tabs/TabIconVillage.png" activeIcon="/static/images/tabs/TabIconVillageActive.png" text="乡源" :iconSize="70" />
-        <TabBarItem icon="/static/images/tabs/TabIconDig.png" activeIcon="/static/images/tabs/TabIconDigActive.png" text="挖掘" :iconSize="70" />
-        <TabBarItem icon="/static/images/tabs/TabIconDiscover.png" activeIcon="/static/images/tabs/TabIconDiscoverActive.png" text="发现" :iconSize="70" />
-        <TabBarItem icon="/static/images/tabs/TabIconMine.png" activeIcon="/static/images/tabs/TabIconMineActive.png" text="我的" :iconSize="70" />
+        <TabBarItem icon="https://xy.wenlvti.net/app_static/images/tabs/TabIconHome.png" activeIcon="https://xy.wenlvti.net/app_static/images/tabs/TabIconHomeActive.png" text="首页" :iconSize="70" />
+        <TabBarItem icon="https://xy.wenlvti.net/app_static/images/tabs/TabIconVillage.png" activeIcon="https://xy.wenlvti.net/app_static/images/tabs/TabIconVillageActive.png" text="乡源" :iconSize="70" />
+        <TabBarItem icon="https://xy.wenlvti.net/app_static/images/tabs/TabIconDig.png" activeIcon="https://xy.wenlvti.net/app_static/images/tabs/TabIconDigActive.png" text="挖掘" :iconSize="70" />
+        <TabBarItem icon="https://xy.wenlvti.net/app_static/images/tabs/TabIconDiscover.png" activeIcon="https://xy.wenlvti.net/app_static/images/tabs/TabIconDiscoverActive.png" text="发现" :iconSize="70" />
+        <TabBarItem icon="https://xy.wenlvti.net/app_static/images/tabs/TabIconMine.png" activeIcon="https://xy.wenlvti.net/app_static/images/tabs/TabIconMineActive.png" text="我的" :iconSize="70" />
       </TabBar>
     </CommonRoot>
 	</view>

+ 10 - 10
src/pages/user/index.vue

@@ -34,10 +34,10 @@
       GridItemPaddingHorizontal: 0,
     }">
       <Grid :borderGrid="false" :mainAxisCount="4">
-        <GridItem title="乡源等级" icon="/static/images/mine/IconLevel.png" touchable />
-        <GridItem title="我的成就" icon="/static/images/mine/IconArchive.png" touchable />
-        <GridItem title="任务中心" icon="/static/images/mine/IconTask.png" touchable />
-        <GridItem title="积分商城" icon="/static/images/mine/IconShop.png" touchable />
+        <GridItem title="乡源等级" icon="https://xy.wenlvti.net/app_static/images/mine/IconLevel.png" touchable />
+        <GridItem title="我的成就" icon="https://xy.wenlvti.net/app_static/images/mine/IconArchive.png" touchable />
+        <GridItem title="任务中心" icon="https://xy.wenlvti.net/app_static/images/mine/IconTask.png" touchable />
+        <GridItem title="积分商城" icon="https://xy.wenlvti.net/app_static/images/mine/IconShop.png" touchable />
       </Grid>
     </ProvideVar>
     <ProvideVar :vars="{
@@ -45,16 +45,16 @@
       CellBottomBorder: false,
     }">
       <CellGroup round>
-        <Cell v-if="userInfo" icon="/static/images/mine/IconMyArticle.png" title="我的投稿" showArrow touchable @click="navTo('/pages/dig/forms/submits', { 
+        <Cell v-if="userInfo" icon="https://xy.wenlvti.net/app_static/images/mine/IconMyArticle.png" title="我的投稿" showArrow touchable @click="navTo('/pages/dig/forms/submits', { 
           villageVolunteerId: volunteerInfoLoader.content.value?.id || 0 
         })" />
-        <Cell icon="/static/images/mine/IconMyRecord.png" title="福泽记录" showArrow touchable />
-        <Cell icon="/static/images/mine/IconMyReward.png" title="兑换记录" showArrow touchable />
-        <Cell icon="/static/images/mine/IconAbout.png" title="关于我们" showArrow touchable @click="navTo('/pages/home/about/about')" />
+        <Cell icon="https://xy.wenlvti.net/app_static/images/mine/IconMyRecord.png" title="福泽记录" showArrow touchable />
+        <Cell icon="https://xy.wenlvti.net/app_static/images/mine/IconMyReward.png" title="兑换记录" showArrow touchable />
+        <Cell icon="https://xy.wenlvti.net/app_static/images/mine/IconAbout.png" title="关于我们" showArrow touchable @click="navTo('/pages/home/about/about')" />
         <button open-type="contact" class="remove-button-style">
-          <Cell icon="/static/images/mine/IconContract.png" title="联系客服" showArrow touchable />
+          <Cell icon="https://xy.wenlvti.net/app_static/images/mine/IconContract.png" title="联系客服" showArrow touchable />
         </button>
-        <Cell v-if="userInfo" icon="/static/images/mine/IconQuit.png" title="退出登录" showArrow touchable @click="doLogout" />
+        <Cell v-if="userInfo" icon="https://xy.wenlvti.net/app_static/images/mine/IconQuit.png" title="退出登录" showArrow touchable @click="doLogout" />
       </CellGroup>
     </ProvideVar>
     <DebugButton />

Різницю між файлами не показано, бо вона завелика
+ 0 - 353
src/static/css/font.css


BIN
src/static/images/StarLarge.png


BIN
src/static/images/StarMid.png


BIN
src/static/images/StarNotLight1.png


BIN
src/static/images/StarSmall.png


BIN
src/static/images/StarX.png


BIN
src/static/images/dig/IntrodBanner.png


BIN
src/static/images/dig/TopBanner.png


BIN
src/static/images/discover/IconAll.png


BIN
src/static/images/discover/IconBase.png


BIN
src/static/images/discover/IconExamples.png


BIN
src/static/images/discover/IconQuestions.png


BIN
src/static/images/discover/IconShare.png


BIN
src/static/images/discover/IconTrick.png


BIN
src/static/images/discover/TopBanner.png


BIN
src/static/images/home/BannerHome.png


BIN
src/static/images/home/BannerIndex.png


BIN
src/static/images/home/HomeTitleIcon.png


BIN
src/static/images/home/IconLight.png


BIN
src/static/images/home/IconLightActive.png


BIN
src/static/images/home/IconSwitch.png


BIN
src/static/images/home/Rank1.png


BIN
src/static/images/home/Rank2.png


BIN
src/static/images/home/Rank3.png


BIN
src/static/images/home/RankBadge1.png


BIN
src/static/images/home/RankBadgeN.png


BIN
src/static/images/home/image 2280@2x.png


BIN
src/static/images/mine/IconAbout.png


BIN
src/static/images/mine/IconArchive.png


BIN
src/static/images/mine/IconContract.png


BIN
src/static/images/mine/IconLevel.png


BIN
src/static/images/mine/IconMyArticle.png


BIN
src/static/images/mine/IconMyRecord.png


BIN
src/static/images/mine/IconMyReward.png


BIN
src/static/images/mine/IconQuit.png


BIN
src/static/images/mine/IconShop.png


BIN
src/static/images/mine/IconTask.png


BIN
src/static/images/mine/TopBanner.png


BIN
src/static/images/tabs/TabIconDig.png


BIN
src/static/images/tabs/TabIconDigActive.png


BIN
src/static/images/tabs/TabIconDiscover.png


BIN
src/static/images/tabs/TabIconDiscoverActive.png


BIN
src/static/images/tabs/TabIconHome.png


BIN
src/static/images/tabs/TabIconHomeActive.png


BIN
src/static/images/tabs/TabIconMine.png


BIN
src/static/images/tabs/TabIconMineActive.png


BIN
src/static/images/tabs/TabIconVillage.png


BIN
src/static/images/tabs/TabIconVillageActive.png