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

+ 3 - 0
src/common/components/SimplePageContentLoader.vue

@@ -13,6 +13,7 @@
       image="error"
       :description="loader.loadError.value"
     >
+      <Height :height="20" />
       <Button type="primary" text="刷新" @click="handleRetry" />
     </Empty>
   </view> 
@@ -24,6 +25,7 @@
       image="search"
       :description="emptyView?.text ?? '暂无数据'"
     >
+      <Height :height="20" />
       <Button 
         v-if="emptyView?.button"  
         type="primary"
@@ -50,6 +52,7 @@ import type { ISimplePageContentLoader } from '../composeabe/SimplePageContentLo
 import Empty from '@/components/feedback/Empty.vue';
 import Button from '@/components/basic/Button.vue';
 import LoadingPage from '@/components/display/loading/LoadingPage.vue';
+import Height from '@/components/layout/space/Height.vue';
 
 const props = defineProps({	
   loader: {

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

@@ -6,7 +6,7 @@
           v-model="searchText"
           placeholder="搜一搜" 
           :innerStyle="{ width: '300rpx' }"
-          @confirm="search"
+          @search="search"
         />
         <ButtonGroup>
           <NButton :radius="40" size="small" @click="navTo('review', { villageId: querys.villageId })">待审核志愿者</NButton>

+ 1 - 1
src/pages/dig/admin/review.vue

@@ -4,7 +4,7 @@
       <SearchBar
         v-model="searchText"
         placeholder="搜一搜" 
-        @confirm="search"
+        @search="search"
       />
 
       <SimplePageListLoader :loader="listLoader" :noEmpty="true">

+ 1 - 1
src/pages/dig/forms/list.vue

@@ -5,7 +5,7 @@
         v-model="searchText"
         placeholder="搜一搜" 
         :innerStyle="{ width: querys.isView ? '600rpx' : '460rpx' }"
-        @confirm="search"
+        @search="search"
       />
       <Button v-if="!querys.isView" type="primary" @click="newData">+ 新增</Button>
     </FlexRow>

+ 1 - 1
src/pages/dig/forms/submits.vue

@@ -3,7 +3,7 @@
     <SearchBar
       v-model="searchText"
       placeholder="搜一搜" 
-      @confirm="search"
+      @search="search"
     />
     <Height :height="20" />
     <SimplePageListLoader :loader="listLoader" :noEmpty="true">

+ 8 - 3
src/pages/home/about/about.vue

@@ -1,12 +1,17 @@
 <template>
   <FlexCol>
-    <H4>公司介绍页待补充</H4>
+    <SimplePageContentLoader :loader="loader">
+      <Parse :content="loader.content?.value || ''" />
+    </SimplePageContentLoader>
   </FlexCol>
 </template>
 
 <script setup lang="ts">
-import H4 from '@/components/typography/H4.vue';
 import FlexCol from '@/components/layout/FlexCol.vue';
+import Parse from '@/components/display/parse/Parse.vue';
+import SimplePageContentLoader from '@/common/components/SimplePageContentLoader.vue';
+import CommonContent from '@/api/CommonContent';
+import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 
-
+const loader = useSimpleDataLoader(async () => await CommonContent.getContentDetail(123));
 </script>

+ 8 - 3
src/pages/home/about/contract.vue

@@ -1,12 +1,17 @@
 <template>
   <FlexCol>
-    <H4>合作海报页待补充</H4>
+    <SimplePageContentLoader :loader="loader">
+      <Parse :content="loader.content?.value || ''" />
+    </SimplePageContentLoader>
   </FlexCol>
 </template>
 
 <script setup lang="ts">
-import H4 from '@/components/typography/H4.vue';
 import FlexCol from '@/components/layout/FlexCol.vue';
+import Parse from '@/components/display/parse/Parse.vue';
+import SimplePageContentLoader from '@/common/components/SimplePageContentLoader.vue';
+import CommonContent from '@/api/CommonContent';
+import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 
-
+const loader = useSimpleDataLoader(async () => await CommonContent.getContentDetail(123));
 </script>

+ 3 - 0
src/pages/user/index.vue

@@ -75,6 +75,9 @@ function showBuildInfo() {
      '\n构建时间:' + DateUtils.formatDate(new Date(parseInt(buildTime)), 'yyyy-MM-dd HH:mm:ss') + 
         ' (' + buildTime + ')' + 
      '\n构建GUID:' + buildInfo,
+     icon: 'prompt-filling',
+     iconColor: 'primary',
+     width: 560,
   })
 }
 function goUserProfile() {

+ 1 - 1
src/pages/user/update/profile.vue

@@ -30,7 +30,7 @@
       保存修改
     </Button>
     <Height :height="20" />
-    <Button type="primary" :plain="true" @click="navTo('/pages/user/update/password')">
+    <Button :plain="true" @click="navTo('/pages/user/update/password')">
       修改密码
     </Button>
   </FlexCol>