Selaa lähdekoodia

🎨 修改传习所页面细节

快乐的梦鱼 1 kuukausi sitten
vanhempi
commit
ab6152bb7d

+ 6 - 0
src/common/config/ImagesUrls.ts

@@ -0,0 +1,6 @@
+
+const root = 'https://mn.wenlvti.net/app_static/minnan/';
+
+export default {
+  IconMarker: `${root}/images/icon_marker.png`,
+}

+ 46 - 3
src/pages/inhert/intangible/details.vue

@@ -16,6 +16,11 @@
         id: 7,
         name: '非遗作品',
         visible: true,
+      },
+      {
+        id: 8,
+        name: '地理位置',
+        visible: true,
       }
     ]"
   >
@@ -59,6 +64,41 @@
           }"
         />
       </template>
+      <template v-else-if="tabCurrentId==8">
+        <!-- 地理位置 -->
+        <view class="d-flex flex-col mt-3 mb-2">
+         <HomeTitle title="地理位置" />
+          <map id="map"
+            class="w-100 height-350 mt-3"
+            :latitude="content.latitude"
+            :longitude="content.longitude"
+            :markers="[
+              {
+                id: 1,
+                latitude: content.latitude,
+                longitude: content.longitude,
+                iconPath: ImagesUrls.IconMarker,
+                width: 40,
+                height: 40,
+              }
+            ]"
+            :scale="15"
+          />
+          <view class="d-flex flex-row justify-between bg-light radius-base p-2 mt-2">
+            <view>
+              <text class="iconfont icon-navigation"></text>
+              <text class="address">{{ content.address }}</text>
+            </view>
+            <view class="d-flex flex-row align-center" @click="navTo('/pages/travel/nav/navto', {
+              latitude: content.latitude,
+              longitude: content.longitude,
+            })">
+              <text class="color-orange">去这里</text>
+              <text class="iconfont icon-arrow-right"></text>
+            </view>
+          </view>
+        </view>
+      </template>
     </template>
     <template #titleEnd="{ content }">
       <u-tag 
@@ -75,7 +115,7 @@
           :descItems="[
             {
               label: '地址',
-              value: content.address ,
+              value: content.address,
             },
             {
               label: '项目级别',
@@ -107,13 +147,15 @@
 import DetailTabPage from "@/pages/article/common/DetailTabPage.vue";
 import ProjectsContent from "@/api/inheritor/ProjectsContent";
 import CommonListPage from "@/pages/article/common/CommonListPage.vue";
+import IntroBlock from "@/pages/article/common/IntroBlock.vue";
+import { useLoadQuerys } from "@/common/composeabe/LoadQuerys";
 import type { TabControlItem } from "@/common/composeabe/TabControl";
 import type { Ref } from "vue";
 import InheritorContent from "@/api/inheritor/InheritorContent";
 import ProductsContent from "@/api/inheritor/ProductsContent";
 import SeminarContent from "@/api/inheritor/SeminarContent";
-import IntroBlock from "@/pages/article/common/IntroBlock.vue";
-import { useLoadQuerys } from "@/common/composeabe/LoadQuerys";
+import { navTo } from "@/common/utils/PageAction";
+import ImagesUrls from "@/common/config/ImagesUrls";
 
 async function load(id: number, tabsArray: Ref<TabControlItem[]>) {
   const d = await ProjectsContent.getContentDetail(
@@ -124,6 +166,7 @@ async function load(id: number, tabsArray: Ref<TabControlItem[]>) {
   tabsArray.value[4].visible = Boolean(d.ichSitesList && (d.ichSitesList as any[]).length > 0);
   tabsArray.value[5].visible = Boolean(d.inheritorsList && (d.inheritorsList as any[]).length > 0);
   tabsArray.value[6].visible = Boolean(d.associationMeList && (d.associationMeList as any[]).length > 0);
+  tabsArray.value[7].visible = Boolean(d.longitude && d.latitude);
   return d;
 }
 async function loadSubList(page: number, pageSize: number, content: any, subList: string) {

+ 2 - 1
src/pages/inhert/village/details.vue

@@ -133,6 +133,7 @@ import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 import { useHomePageMiniCommonListGoMoreAndGoDetail, type IHomePageMiniCommonListGoMoreAndGoDetail } from '@/pages/article/common/CommonContent';
 import ContentNote from '@/pages/parts/ContentNote.vue';
 import IntroBlock from '@/pages/article/common/IntroBlock.vue';
+import ImagesUrls from '@/common/config/ImagesUrls';
 
 const EmptyImage = 'https://mn.wenlvti.net/app_static/minnan/EmptyImage.png';
 
@@ -197,7 +198,7 @@ const contentLoader = useSimpleDataLoader(async () => {
       id: 1,
       latitude: center.value[1],
       longitude: center.value[0],
-      iconPath: 'https://mn.wenlvti.net/app_static/minnan/images/icon_marker.png',
+      iconPath: ImagesUrls.IconMarker,
       width: 40,
       height: 40,
     }

+ 2 - 1
src/pages/inhert/village/list.vue

@@ -24,6 +24,7 @@ async function loadData(
   searchText: string,
   dropDownValues: number[]
 ) {
+
   const list = dropDownValues[0] == 1 ? await VillageApi.getVallageList() : [];
   list.forEach((p) => {
     p.desc = p.ichName as string;
@@ -31,7 +32,7 @@ async function loadData(
     p.bottomTags = [
       p.levelText, 
       p.batchText,
-      p.ichTypeText,
+      p.historyLevel,
     ];
   })
   return { list: list, total: list.length }