feat: --

packages/base/src/antiquity.js

@@ -4,26 +4,34 @@
 export const antiquityData = [
   {
     id: 1,
-    img: ["/images/1/1.jpg", "/images/1/2.jpg", "/images/1/3.jpg"],
-    minImg: "/images/1/M1.jpg",
+    img: [
+     "/images/1/1.jpg",
+     "/images/1/2.jpg",
+     "/images/1/3.jpg",
+    ],
+    minImg: '/images/1/M1.jpg',
     name: "1930年代红二方面军战士用过的牙刷",
-    level: "3",
-    sd: "1930年代",
-    zd: "复合",
-    from: "捐赠",
+    level: '3',
+    sd:'1930年代',
+    zd: '复合',
+    from:'捐赠',
     content: `
       <p></p>
     `,
   },
   {
     id: 2,
-    img: ["/images/2/1.jpg", "/images/2/2.jpg", "/images/2/3.jpg"],
-    minImg: "/images/2/M1.jpg",
+    img: [
+      "/images/2/1.jpg",
+      "/images/2/2.jpg",
+      "/images/2/3.jpg",
+    ],
+    minImg: '/images/2/M1.jpg',
     name: "1950年代贺龙在西南局工作时用过的绣花枕套",
-    level: "",
-    sd: "1950年代",
-    zd: "棉",
-    from: "薛明捐赠",
+    level: '',
+    sd:'1950年代',
+    zd: '棉',
+    from:'薛明捐赠',
     content: `
       <p></p>
     `,
@@ -38,12 +46,12 @@ export const antiquityData = [
       "/images/3/5.jpg",
       "/images/3/6.jpg",
     ],
-    minImg: "/images/3/M1.jpg",
+    minImg: '/images/3/M1.jpg',
     name: "1950年代贺龙用过的手帕",
-    level: "",
-    sd: "1950年代",
-    zd: "棉",
-    from: "薛明捐赠",
+    level: '',
+    sd:'1950年代',
+    zd: '棉',
+    from:'薛明捐赠',
     content: `
       <p></p>
     `,
@@ -56,12 +64,12 @@ export const antiquityData = [
       "/images/4/3.jpg",
       "/images/4/4.jpg",
     ],
-    minImg: "/images/4/M1.jpg",
+    minImg: '/images/4/M1.jpg',
     name: "1920年代红军用过的环首竹柄大刀",
-    level: "",
-    sd: "1920年代",
-    zd: "铁",
-    from: "征集",
+    level: '',
+    sd:'1920年代',
+    zd: '铁',
+    from:'征集',
     content: `
       <p></p>
     `,
@@ -104,25 +112,29 @@ export const antiquityData = [
       "/images/5/33.jpg",
       "/images/5/34.jpg",
     ],
-    minImg: "/images/5/M1.jpg",
+    minImg: '/images/5/M1.jpg',
     name: "1960年代铁道兵师政治委员朱绍田的学习笔记本",
-    level: "2",
-    sd: "1960年代",
-    zd: "纸",
-    from: "朱晋源捐赠",
+    level: '2',
+    sd:'1960年代',
+    zd: '纸',
+    from:'朱晋源捐赠',
     content: `
       <p></p>
     `,
   },
   {
     id: 6,
-    img: ["/images/6/1.jpg", "/images/6/2.jpg", "/images/6/3.jpg"],
-    minImg: "/images/6/M1.jpg",
+    img: [
+      "/images/6/1.jpg",
+      "/images/6/2.jpg",
+      "/images/6/3.jpg",
+    ],
+    minImg: '/images/6/M1.jpg',
     name: "朱绍田使用过的军用帐篷布帘",
-    level: "",
-    sd: "中华人民共和国",
-    zd: "布",
-    from: "朱晋源捐赠",
+    level: '',
+    sd:'中华人民共和国',
+    zd: '布',
+    from:'朱晋源捐赠',
     content: `
       <p></p>
     `,
@@ -130,12 +142,12 @@ export const antiquityData = [
   {
     id: 7,
     img: ["/images/7/1.jpg"],
-    minImg: "/images/7/M1.jpg",
+    minImg: '/images/7/M1.jpg',
     name: "“开路先锋”旗帜",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "捐赠",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'捐赠',
     content: `
       <p></p>
     `,
@@ -143,12 +155,12 @@ export const antiquityData = [
   {
     id: 8,
     img: ["/images/8/1.jpg"],
-    minImg: "/images/8/M1.jpg",
+    minImg: '/images/8/M1.jpg',
     name: "“成渝铁路”通车签名册",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "捐赠",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'捐赠',
     content: `
       <p></p>
     `,
@@ -161,12 +173,12 @@ export const antiquityData = [
       "/images/9/3.jpg",
       "/images/9/4.jpg",
     ],
-    minImg: "/images/9/M1.jpg",
+    minImg: '/images/9/M1.jpg',
     name: "战争年代使用的马搭（实物）",
-    level: "",
-    sd: "",
-    zd: "黄钢",
-    from: "捐赠",
+    level: '',
+    sd:'',
+    zd: '黄钢',
+    from:'捐赠',
     content: `
       <p></p>
     `,
@@ -179,79 +191,353 @@ export const antiquityData = [
       "/images/10/3.jpg",
       "/images/10/4.jpg",
     ],
-    minImg: "/images/10/M1.jpg",
+    minImg: '/images/10/M1.jpg',
     name: "行军使用的马搭（实物）",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "捐赠",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'捐赠',
     content: `
       <p></p>
     `,
   },
   {
     id: 11,
-    img: ["/images/11/1.jpg", "/images/11/2.jpg", "/images/11/3.jpg"],
-    minImg: "/images/11/M1.jpg",
+    img: [
+      "/images/11/1.jpg",
+      "/images/11/2.jpg",
+      "/images/11/3.jpg",
+    ],
+    minImg: '/images/11/M1.jpg',
     name: "贺文玳手绘《红二方面军长征路线示意图》 附：自绘图说明",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "捐赠",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'捐赠',
     content: `
       <p></p>
     `,
   },
   {
     id: 12,
-    img: ["/images/12/1.jpg", "/images/12/2.jpg", "/images/12/3.jpg"],
-    minImg: "/images/12/M1.jpg",
+    img: [
+      "/images/12/1.jpg",
+      "/images/12/2.jpg",
+      "/images/12/3.jpg",
+    ],
+    minImg: '/images/12/M1.jpg',
     name: "工农革命军旗帜",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'',
     content: `
       <p></p>
     `,
   },
   {
     id: 13,
-    img: ["/images/13/1.jpg", "/images/13/2.jpg"],
-    minImg: "/images/13/M1.jpg",
+    img: [
+      "/images/13/1.jpg",
+      "/images/13/2.jpg"
+    ],
+    minImg: '/images/13/M1.jpg',
     name: "国画《桑植起义》",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'',
     content: `
       <p></p>
     `,
   },
   {
     id: 14,
-    img: ["/images/14/1.jpg", "/images/14/2.jpg"],
-    minImg: "/images/14/M1.jpg",
+    img: [
+      "/images/14/1.jpg",
+      "/images/14/2.jpg"
+    ],
+    minImg: '/images/14/M1.jpg',
     name: "油画《小船会议》",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'',
     content: `
       <p></p>
     `,
   },
   {
     id: 15,
-    img: ["/images/15/1.jpg", "/images/15/2.jpg"],
-    minImg: "/images/15/M1.jpg",
+    img: [
+      "/images/15/1.jpg",
+      "/images/15/2.jpg"
+    ],
+    minImg: '/images/15/M1.jpg',
     name: "国画《北伐名将》",
-    level: "",
-    sd: "",
-    zd: "",
-    from: "",
+    level: '',
+    sd:'',
+    zd: '',
+    from:'',
     content: `
       <p></p>
     `,
   },
-];
+  {
+    id:16,
+    link: "hl01",
+    minImg: '/images/16/M1.jpg',
+    name: "范子瑜家用过的长方形竹编提篮",
+    sd:'中华人民共和国',
+    zd:'竹',
+    from:'范志勇捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:17,
+    link: "hl02",
+    minImg: '/images/17/M1.jpg',
+    name: "1955年李文清授衔时戴过的军礼帽",
+    sd:'中华人民共和国',
+    zd:'毛呢',
+    from:'李海捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:18,
+    link: "hl03",
+    minImg: '/images/18/M1.jpg',
+    name: "李文清用过的1940年代缴获日军军医的皮箱",
+    sd:'1940年代',
+    zd:'牛皮',
+    from:'李海捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:19,
+    link: "hl04",
+    minImg: '/images/19/M1.jpg',
+    name: "1960年代贺龙送给堂弟贺文玳的长城雪茄",
+    level: '3',
+    sd:'1960年代',
+    zd:'复合',
+    from:'贺秦岭捐赠',
+    content: `
+    <p>包含雪茄2根、说明1份、带盖盒。</p>
+  `,
+  },
+  {
+    id:20,
+    link: "hl05",
+    minImg: '/images/20/M1.jpg',
+    name: "2011年山西和顺人民用五种粮食粘贴而成的“建国后的贺龙元帅”图像",
+    level: '3',
+    sd:'2011年',
+    zd:'复合',
+    from:'贺邦靖转赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:21,
+    link: "hl06",
+    minImg: '/images/21/M1.jpg',
+    name: "2011年山西和顺人民用五种粮食粘贴而成的“抗战时期的贺龙在山西”图像",
+    level: '3',
+    sd:'2011年',
+    zd:'复合',
+    from:'贺邦靖转赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:22,
+    link: "hl07",
+    minImg: '/images/22/M1.jpg',
+    name: "老红军向轩体内的弹片",
+    level: '2',
+    sd:'1930年代',
+    zd:'金属',
+    from:'向国荣捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:23,
+    link: "hl08",
+    minImg: '/images/23/M1.jpg',
+    name: "老红军向轩荣获的“独立自由”奖章",
+    level: '3',
+    sd:'1955年',
+    zd:'金属',
+    from:'向国荣捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:24,
+    link: "hl09",
+    minImg: '/images/24/M1.jpg',
+    name: "老红军向轩荣获的“解放”奖章",
+    level: '3',
+    sd:'1955年',
+    zd:'金属',
+    from:'向国荣捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:25,
+    link: "hl10",
+    minImg: '/images/25/M1.jpg',
+    name: "成都市关心下一代工作委员会颁给老红军向轩的“优秀工作者”奖章",
+    level: '3',
+    sd:'2000年',
+    zd:'金属',
+    from:'向国荣捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:26,
+    link: "hl11",
+    minImg: '/images/26/M1.jpg',
+    name: "老红军向轩荣获的“华北解放纪念”章",
+    level: '',
+    sd:'1950年',
+    zd: '金属',
+    from:'向国荣捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:27,
+    link: "hl12",
+    minImg: '/images/27/M1.jpg',
+    name: "老红军向轩荣获的“解放西北纪念”章",
+    level: '',
+    sd:'1950年',
+    zd: '金属',
+    from:'向国荣捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:28,
+    link: "hl13",
+    minImg: '/images/28/M1.jpg',
+    name: "1930年代红军战士使用过的铁柄大刀",
+    level: '3',
+    sd:'1930年代',
+    zd: '铁',
+    from:'征集',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:29,
+     link: "hl14",
+    minImg: '/images/29/M1.jpg',
+    name: "贺龙用过的毛毯",
+    level: '3',
+    sd:'中华人民共和国',
+    zd: '羊毛',
+    from:'肖晋捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:30,
+     link: "hl15",
+    minImg: '/images/30/M1.jpg',
+    name: "1955年贺龙视察工厂、农村时戴过的北京盛锡福制“帽业专家”牌鸭舌黑呢帽",
+    level: '2',
+    sd:'1955年',
+    zd: '毛呢',
+    from:'薛明捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:31,
+     link: "hl16",
+    minImg: '/images/31/M1.jpg',
+    name: "清长铁柄大神刀",
+    level: '3',
+    sd:'清',
+    zd:'铁',
+    from:'拨交',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:32,
+     link: "hl17",
+    minImg: '/images/32/M1.jpg',
+    name: "清长铁柄带刺大神刀",
+    level: '3',
+    sd:'清',
+    zd:'铁',
+    from:'拨交',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:33,
+     link: "hl18",
+    minImg: '/images/33/M1.jpg',
+    name: "朱绍田穿过的毛呢少将军服",
+    level: '3',
+    sd:'1950年代',
+    zd: '毛呢',
+    from:'朱晋源捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:34,
+     link: "hl19",
+    minImg: '/images/34/M1.jpg',
+    name: "1955年贺龙授衔后穿过的五五式军大衣常服",
+    level: '1',
+    sd:'中华人民共和国',
+    zd: '毛呢',
+    from:'贺明卿捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+  {
+    id:35,
+     link: "hl20",
+    minImg: '/images/35/M1.jpg',
+    name: "朱绍田家使用过的躺椅",
+    level: '',
+    sd:'中华人民共和国',
+    zd: '复合',
+    from:'朱晋源捐赠',
+    content: `
+    <p></p>
+  `,
+  },
+];

packages/mobile/public/model.html

@@ -38,7 +38,7 @@
     console.log('ppppppppp',number);
 
     window.autoRotate = true; // 是否自动旋转
-    fdage.embed('https://4dscene.4dage.com/culturalrelics/LBCJNG/4dage/' + number + '.4dage', {
+    fdage.embed('https://4dscene.4dage.com/culturalrelics/HLJNG/4dage/' + number + '.4dage', {
         width: 800,
         height: 600,
         autoStart: true,

packages/mobile/src/views/Antiquity/Detail/index.vue

@@ -24,12 +24,12 @@
         />
       </div>
     </template>
-    <!-- <template v-else>
+    <template v-else>
       <iframe ref="iframe" :src="iframeUrl" />
       <div class="antiquity-detail-tools">
         <img
           draggable="false"
-          src="@/assets/images/icon_5-min.png"
+          src="@/assets/images/2.png"
           @click="handleZoom"
         />
         <img
@@ -39,11 +39,11 @@
         />
         <img
           draggable="false"
-          src="@/assets/images/icon_7-min.png"
+          src="@/assets/images/4.png"
           @click="handleResetView"
         />
       </div>
-    </template> -->
+    </template>
 
     <div class="antiquity-detail-wrap">
       <h3>{{ detail?.name }}</h3>
@@ -67,8 +67,8 @@
 import { computed, ref } from "vue";
 import { antiquityData, getEnvImagePath, isDevelopment } from "@helong/base";
 import { useRoute } from "vue-router";
-// import PlayImg from "@/assets/images/icon_6-min.png";
-// import PauseImg from "@/assets/images/icon_8-min.png";
+import PlayImg from "@/assets/images/3.png";
+import PauseImg from "@/assets/images/3-1.png";
 
 const route = useRoute();
 const detail = computed(() =>

packages/pc/public/model.html

@@ -38,7 +38,7 @@
     console.log('ppppppppp',number);
 
     window.autoRotate = true; // 是否自动旋转
-    fdage.embed('https://4dscene.4dage.com/culturalrelics/LBCJNG/4dage/' + number + '.4dage', {
+    fdage.embed('https://4dscene.4dage.com/culturalrelics/HLJNG/4dage/' + number + '.4dage', {
         width: 800,
         height: 600,
         autoStart: true,

packages/pc/src/views/Antiquity/Detail/index.scss

@@ -20,6 +20,26 @@
       width: 750px;
       height: 500px;
 
+      &.is-model {
+        height: 630px;
+      }
+      iframe {
+        width: 100%;
+        height: 100%;
+      }
+      &-tools {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-top: 70px;
+        gap: 60px;
+
+        img {
+          width: 60px;
+          height: 60px;
+          cursor: pointer;
+        }
+      }
       &__preview {
         position: absolute;
         right: 20px;

packages/pc/src/views/Antiquity/Detail/index.vue

@@ -19,7 +19,7 @@
         </div>
       </template>
 
-      <!-- <div v-else class="antiquity-detail-two-left">
+      <div v-else class="antiquity-detail-two-left is-model">
         <iframe ref="iframe" :src="`./model.html?m=${detail?.link}`" />
         <div class="antiquity-detail-two-left-tools">
           <img
@@ -29,7 +29,7 @@
           />
           <img
             draggable="false"
-            src="@/assets/images/icon_5-min.png"
+            src="@/assets/images/2.png"
             @click="handleZoom"
           />
           <img
@@ -39,11 +39,11 @@
           />
           <img
             draggable="false"
-            src="@/assets/images/icon_7-min.png"
+            src="@/assets/images/4.png"
             @click="handleResetView"
           />
         </div>
-      </div> -->
+      </div>
 
       <ElScrollbar class="antiquity-detail-two-right">
         <h3>{{ detail?.name }}</h3>
@@ -71,9 +71,9 @@ import { antiquityData, getEnvImagePath } from "@helong/base";
 import { useRoute } from "vue-router";
 import Topbar from "@/components/Topbar.vue";
 import FullscreenImg from "@/assets/images/icon.png";
-// import UnFullscreenImg from "@/assets/images/icon_4-min.png";
-// import PlayImg from "@/assets/images/icon_6-min.png";
-// import PauseImg from "@/assets/images/icon_8-min.png";
+import UnFullscreenImg from "@/assets/images/1.png";
+import PlayImg from "@/assets/images/3.png";
+import PauseImg from "@/assets/images/3-1.png";
 
 const { isFullscreen, toggle } = useFullscreen();
 const route = useRoute();