Bläddra i källkod

🎨 按要求修改对话框显示文字

快乐的梦鱼 1 månad sedan
förälder
incheckning
dd35b039b8

+ 8 - 8
src/api/light/LightVillageApi.ts

@@ -351,24 +351,24 @@ export class LightVillageApi extends AppServerRequestModule<DataModel> {
     return res.requireData();
   }
 
-  async getVillageList(data: {
+  async getVillageList(data?: {
     level?: number, 
     region?: number, 
     status?: number, 
     page?: number, 
     pageSize?: number,
     keyword?: string,
-  }) {
+  }|undefined) {
     const res = await this.get<{
       data: any[],
       total: number,
     }>('/village/village/list', '乡源村落列表', {
-      history_level: data.level,
-      status: data.status,
-      region: data.region,
-      page: data.page,
-      pageSize: data.pageSize,
-      keyword: data.keyword,
+      history_level: data?.level,
+      status: data?.status,
+      region: data?.region,
+      page: data?.page,
+      pageSize: data?.pageSize,
+      keyword: data?.keyword,
     });
     return {
       total: res.requireData().total,

+ 7 - 2
src/pages/home/village/dialogs/BlessBuyDialog.vue

@@ -54,10 +54,9 @@
       <Height :height="5" />
       <Text 
         textAlign="center" 
-        text="倍率仅作用于用户乡源果,村社乡源光不翻倍赐福到期后,倍率自动恢复为1倍"
+        text="注:倍率仅作用于用户乡源果,村社乡源光不翻倍赐福到期后,倍率自动恢复为1倍"
         fontConfig="contentText"
       />
-
     </FlexCol>
   </CommonDialog>
 </template>
@@ -96,6 +95,12 @@ const infoGrids = computed(() => [
     value: props.currentBless?.addFruit || 0,
     unit: '个',
   },
+  {
+    label: '得乡源果倍率',
+    image: 'https://xy.wenlvti.net/app_static/images/home/bless/IconFruit.png',
+    value: props.currentBless?.multiple || 0,
+    unit: '倍',
+  },
 ]);
 const effectiveDate = computed(() => {
   return DateUtils.formatDate(DateUtils.dateAddDays(new Date(), props.currentBless?.days || 0), 'YYYY-MM-DD');

+ 1 - 1
src/pages/home/village/dialogs/UpgradeDialog.vue

@@ -45,7 +45,7 @@
 
       <BoxMid :padding="24" direction="column" center>
         <Touchable @click="navTo('/pages/article/details', { id: 7021, modelId: 18, showRecommend: false })">
-          <Text text="不知道怎么选择?" fontConfig="lightImportantTitle" />
+          <Text text="了解各村社等级权益" fontConfig="lightImportantTitle" />
         </Touchable>
       </BoxMid>
     </FlexCol>

+ 1 - 0
src/pages/home/village/upgrade/select.vue

@@ -34,6 +34,7 @@
           <FrameButton primary text="选择" @click="handleDirectPay" />
         </BoxMid>
         <BoxMid
+          v-if="false"
           direction="row"
           justify="space-between"
           align="center"

+ 1 - 1
src/pages/index.vue

@@ -143,7 +143,7 @@ onShareTimeline(() => {
 })
 onMounted(() => {
   if (isDevEnv) {
-    //tabIndex.value = 1;
+    tabIndex.value = 1;
   }
 })
 </script>