Kaynağa Gözat

💄 村落相关修改

imengyu 1 ay önce
ebeveyn
işleme
ee7d5315f8

+ 1 - 0
src/api/village/VillageApi.ts

@@ -80,6 +80,7 @@ export class VillageApi extends AppServerRequestModule<DataModel> {
   }
   async getVillageMenuList(id: number) {
     return (this.get('/village/menu/getList', '村落菜单列表', {
+      platform: 1,
       village_id: id,
     })) 
       .then(res => transformArrayDataModel<VillageMenuListItem>(VillageMenuListItem, res.data2, `村落菜单`, true))

+ 0 - 1
src/views/InheritorView.vue

@@ -104,7 +104,6 @@
           :desc="overviewsLoader.content.value?.[2]"
           :image="Image10"
           :showExpand="false"
-          left
           @moreClick="navTo('/village/index')"
         />
       </div>

+ 4 - 1
src/views/village/detail.vue

@@ -72,6 +72,7 @@ const data = ref({
   latitude: '',
   modelId: 0,
   mainBodyColumnId: 0,
+  region: 0,
 })
 const zoom = ref(12);
 const center = ref([121.59996, 31.197646]);
@@ -105,10 +106,11 @@ async function loadInfo() {
 
   const menu = await VillageApi.getVillageMenuList(id);
 
-  tagsData.value = menu.filter((i) => i.platform == 1).map((item, index) => {
+  tagsData.value = menu.map((item, index) => {
     return {
       title: item.name,
       image: item.logo,
+      region: data.value.region,
       ...item,
     };
   });
@@ -120,6 +122,7 @@ function handleGoDetail(item: any) {
       id: item.id,
       model_id: item.modelId,
       main_body_column_id: item.mainBodyColumnId,
+      region: item.region,
     }, 
   })
 }

+ 5 - 12
src/views/village/index.vue

@@ -9,9 +9,10 @@
     :rowType="2"
     :load="loadData"
     :showDetail="showDetail"
+    :tagsData="tagsData"
+    :defaultSelectTag="tagsData[0].id"
   />
-    <!-- :tagsData="tagsData"
-    :defaultSelectTag="tagsData[0].id" -->
+    <!--  -->
   <ContentDialog v-model:show="popupContentShow" light :small="smallDialog">
     <RouterView></RouterView>
   </ContentDialog>
@@ -67,16 +68,8 @@ async function loadData(
 
 //子分类
 const tagsData = ref([
-  { id: 38, name: '全部' },
-  { id: 39, name: '传统技艺' },
-  { id: 40, name: '传统舞蹈' },
-  { id: 41, name: '曲艺' },
-  { id: 42, name: '传统美术' },
-  { id: 43, name: '传统音乐' },
-  { id: 44, name: '民俗' },
-  { id: 45, name: '传统医药' },
-  { id: 46, name: '传统体育与杂技' },
-  { id: 47, name: '民间文学' },
+  { id: 38, name: '省级传统村落' },
+  { id: 39, name: '未分级' },
 ]);
 </script>
 

+ 3 - 0
src/views/village/list.vue

@@ -41,6 +41,9 @@ async function loadData(
     .setModelId(Number(route.query.model_id))
     .setMainBodyColumnId(Number(route.query.main_body_column_id))
     .setKeywords(searchText)
+    .setSelfValues({
+      region: Number(route.query.region),
+    })
   , page, pageSize);
 
   return {