🎨 按要求优化对话框关闭按钮位置

src/api/light/TreeApi.ts

@@ -509,6 +509,22 @@ export class UpgradeOrderConfirm extends DataModel<UpgradeOrderConfirm> {
   };
 }
 
+export class ShareRewardItem extends DataModel<ShareRewardItem> {
+  constructor() {
+    super(ShareRewardItem, '分享奖励');
+    this.setNameMapperCase('Camel', 'Snake');
+  }
+
+  id!: number;
+  image = '';
+  name = '';
+  desc = '';
+  points = 0;
+  rewardWater = 0;
+  rewardLight = 0;
+  rewardFruit = 0;
+}
+
 type GrowthLogSearch = {
   page?: number;
   pageSize?: number;
@@ -982,10 +998,10 @@ export class TreeApi extends AppServerRequestModule<DataModel> {
         village_id: options?.villageId,
       },
     );
-    return this.parsePagedList<GrowthTaskItem>(
-      GrowthTaskItem,
+    return this.parsePagedList<ShareRewardItem>(
+      ShareRewardItem,
       res.requireData(),
-      '成长任务',
+      '分享奖励',
     );
   }
 

src/common/components/CommonDialog.vue

@@ -3,10 +3,10 @@
     v-bind="props"
     mask
     closeable
-    closeIcon=""
+    closeIcon="close"
     backgroundColor="transparent"
     contentScroll
-    contentScrollMaxHeight="90vh"
+    contentScrollMaxHeight="80vh"
     :contentPadding="0"
     width="auto"
     title=""
@@ -33,13 +33,6 @@
         <slot></slot>
         <Height :size="24" />
       </BackgroundBox>
-      <Height :size="24" />
-      <ImageButton v-if="props.showCloseButton"
-        src="https://xy.wenlvti.net/app_static/images/ButtonClose.png"
-        :width="80"
-        :height="80"
-        @click="emit('update:show', false);emit('close')"
-      />
     </template>
   </Dialog>
 </template>

src/common/components/FrameButton.vue

@@ -28,7 +28,7 @@ const props = withDefaults(defineProps<{
   text?: string;
   textProps?: object;
   primary?: boolean;
-  size?: 'large' | 'midium' | 'small';
+  size?: 'large' | 'medium' | 'small';
   width?: string|number;
   padding?: ThemePaddingOrMarginType,
   innerStyle?: object;
@@ -47,33 +47,33 @@ const padding = computed(() => {
     return props.padding;
   switch (props.size) {
     case 'large': return [20, 36];
-    case 'midium': return [18, 20];
+    case 'medium': return [18, 20];
     case 'small': return [15, 18];
   }
 });
 const backgroundCutBorderSize = computed(() => {
   switch (props.size) {
     case 'large': return 32;
-    case 'midium': return 28;
+    case 'medium': return 28;
     case 'small': return 18;
   }
 });
 const fontSize = computed(() => {
   switch (props.size) {
     case 'large': return 'fontSize.lg';
-    case 'midium': return 'fontSize.md';
+    case 'medium': return 'fontSize.md';
     case 'small': return 'fontSize.sm';
   }
 });
 const iconSize = computed(() => {
   switch (props.size) {
     case 'large': return 'fontSize.lg';
-    case 'midium': return 'fontSize.md';
+    case 'medium': return 'fontSize.md';
     case 'small': return 'fontSize.sm';
   }
 });
 const image =  computed(() => {
-  if (props.size === 'large' || props.size === 'midium') {
+  if (props.size === 'large' || props.size === 'medium') {
     return props.primary ? 
       'https://xy.wenlvti.net/app_static/images/FrameButtonPrimary.png' : 
       'https://xy.wenlvti.net/app_static/images/FrameButton.png';

src/pages/dig/forms/list-ordinary.vue

@@ -68,8 +68,8 @@
               </Touchable>
               <FlexCol>
                 <FlexRow gap="gap.md">
-                  <FrameButton :text="item.statusText" size="midium" @click="navTo('/pages/dig/about/goving')" />
-                  <FrameButton v-if="item.villageVolunteerId === volunteerInfo?.id || isManagement" :text="isManagement ? '管理' : '编辑'" size="midium" @click="goEdit(item)" />
+                  <FrameButton :text="item.statusText" size="medium" @click="navTo('/pages/dig/about/goving')" />
+                  <FrameButton v-if="item.villageVolunteerId === volunteerInfo?.id || isManagement" :text="isManagement ? '管理' : '编辑'" size="medium" @click="goEdit(item)" />
                 </FlexRow>
                 <FlexRow justify="flex-end" gap="gap.md">
                   <IconButton icon="appreciate-light-fill" size="30" :text="item.likes" color="primary" />

src/pages/dig/forms/list.vue

@@ -51,8 +51,8 @@
               </Touchable>
               <FlexCol>
                 <FlexRow>
-                  <FrameButton :text="item.statusText" size="midium" @click="navTo('/pages/dig/about/goving')" />
-                  <FrameButton v-if="item.villageVolunteerId === volunteerInfo?.id || isManagement" :text="isManagement ? '管理' : '编辑'" size="midium" @click="goEdit(item)" />
+                  <FrameButton :text="item.statusText" size="medium" @click="navTo('/pages/dig/about/goving')" />
+                  <FrameButton v-if="item.villageVolunteerId === volunteerInfo?.id || isManagement" :text="isManagement ? '管理' : '编辑'" size="medium" @click="goEdit(item)" />
                 </FlexRow>
                 <FlexRow justify="flex-end" gap="gap.md">
                   <IconButton icon="appreciate-light-fill" size="30" :text="item.likes" color="primary" />

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

@@ -3,8 +3,8 @@
     <FlexCol gap="gap.md" padding="padding.md">
       <FlexRow justify="space-between" align="center" gap="gap.sm">
         <SearchBar v-model:value="searchValue" placeholder="搜索乡源好物" :innerStyle="{ width: '270rpx' }" />
-        <FrameButton text="我要发布" @click="handlePublish" size="midium" />
-        <FrameButton text="开通微信小店" @click="handleOpen" size="midium" />
+        <FrameButton text="我要发布" @click="handlePublish" size="medium" />
+        <FrameButton text="开通微信小店" @click="handleOpen" size="medium" />
       </FlexRow>
       <SimplePageListLoader :loader="goodsLoader">
         <FlexRow wrap justify="space-around" gap="gap.sm">

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

@@ -39,7 +39,7 @@
                     primary
                     text="去完成"
                     width="100rpx"
-                    size="midium"
+                    size="medium"
                     @click="handleDoTask(item)"
                   />
                   <FrameButton
@@ -48,7 +48,7 @@
                     text="已完成"
                     :touchable="false"
                     width="100rpx"
-                    size="midium"
+                    size="medium"
                   />
                   <Text 
                     v-if="item.limitType === 'day' && item.limitNum > 0" 

src/pages/home/village/task/share-reward.vue

@@ -54,7 +54,7 @@ import Icon from '@/components/basic/Icon.vue';
 import Width from '@/components/layout/space/Width.vue';
 
 const listLoader = useSimplePageListLoader(20, async (page, pageSize) => {
-  const res = await TreeApi.getTaskList({
+  const res = await TreeApi.getShareRewardList({
     page,
     pageSize,
   });

src/pages/home/village/upgrade/components/UpgradeSelect.vue

@@ -18,8 +18,8 @@
         gap="gap.md"
       >
         <FlexCol>
-          <Text :text="item.name" fontConfig="lightImportantTitle" :fontSize="42" />
-          <Text :text="item.desc" fontConfig="lightGoldTitle" :fontSize="30" />
+          <Text :text="item.name" fontConfig="lightImportantTitle" fontSize="fontSize.md" />
+          <Text :text="item.desc" fontConfig="lightGoldTitle" fontSize="fontSize.sm" />
         </FlexCol>
 
         <FlexRow gap="gap.lg">
@@ -27,11 +27,11 @@
             <Text :text="item.vipLevel + '级'" fontConfig="contentText" />
             <FlexRow align="center" gap="gap.sm">
               <Text text="¥" color="text.gold" />
-              <Text :text="item.price" fontFamily="SongtiSCBlack" fontConfig="lightGoldTitle" fontSize="50" />
+              <Text :text="item.price" fontFamily="SongtiSCBlack" fontConfig="lightGoldTitle" fontSize="fontSize.lg" />
             </FlexRow>
           </FlexCol>
           <Badge :show="item.isRecommend" content="推荐">
-            <FrameButton primary text="选择" @click="handleSelect(item as UpgradePackageItem)" />
+            <FrameButton primary size="medium" text="选择" @click="handleSelect(item as UpgradePackageItem)" />
           </Badge>
         </FlexRow>
       </BoxMid>