Ver código fonte

热点列表顺序调整/2D文物图片修改

shaogen1995 2 anos atrás
pai
commit
df1d24eb4f

+ 11 - 2
SWKK/src/components/Rbottom.vue

@@ -279,7 +279,7 @@ export default {
         // 如果有对应的点位音频,删除
         const dotAudioDomId = document.querySelector("#dotAudioDomId");
         if (dotAudioDomId) document.body.removeChild(dotAudioDomId);
-        
+
         dom.play();
       } else dom.pause();
     },
@@ -288,9 +288,18 @@ export default {
   methods: {
     // 给父组件调用,拿到热点数据
     getHotListToFather(data) {
-      this.hotList = data.filter(
+      const tempArr = data.filter(
         (v) => v.title.split("&")[2] || !v.title.includes("&")
       );
+
+      tempArr.forEach((v, i) => {
+        const bs = v.title.split("&")[1];
+        if (bs) v.myBs = Number(bs);
+        else v.myBs = -i;
+      });
+
+      this.hotList = tempArr.sort((a, b) => a.myBs - b.myBs);
+
       this.hotListShowData = [...this.hotList];
     },
 

+ 1 - 1
vue/src/views/Goods/data copy.js

@@ -44,7 +44,7 @@ export const goodsData = {
   {
     type: 'tool',
     bs: 'yht04',
-    name: '邓振询烈士用的私章及盒子',
+    name: '邓振询烈士用的私章',
     age: '中华民国时期(1912~1949)',
     sort: '文件、宣传品',
     size: '印章2.3*1.1*1.1 印章盒5.2*1.2*1.8',

+ 3 - 3
vue/src/views/Goods/data.js

@@ -44,7 +44,7 @@ export const goodsData = {
   {
     type: 'tool',
     bs: 'yht04',
-    name: '邓振询烈士用的私章及盒子',
+    name: '邓振询烈士用的私章',
     age: '中华民国时期(1912~1949)',
     sort: '文件、宣传品',
     size: '印章2.3*1.1*1.1 印章盒5.2*1.2*1.8',
@@ -1197,7 +1197,7 @@ export const goodsData = {
     {type:'straw',bs:'399',name:'中华民国时期高文华烈士的随感录',age:'中华民国时期(1912~1949)',sort:'文件、宣传品',size:'22.6*15.3*0.5厘米',grain:'纸',estate:'三级',imgNum:3},
     {type:'straw',bs:'400',name:'1942年邓振询烈士的日记本',age:'中华民国时期(1912~1949)',sort:'文件、宣传品',size:'22.6*12.4*0.5厘米',grain:'纸',estate:'三级',imgNum:6},
     // {type:'',bs:'',name:'',age:'',sort:'',size:'',grain:'',estate:'',imgNum:0},
-    {type:'straw',bs:'401',name:'1942年邓振询烈士在华中局扩大会议关于苏南工作的报告本',age:'中华民国时期(1912~1949)',sort:'文件、宣传品',size:'16*10.5*0.2厘米',grain:'纸',estate:'二级',imgNum:8},
+    {type:'straw',bs:'401',name:'1942年邓振询烈士在华中局扩大会议关于苏南工作的报告本',age:'中华民国时期(1912~1949)',sort:'文件、宣传品',size:'16*10.5*0.2厘米',grain:'纸',estate:'二级',imgNum:5},
     {type:'straw',bs:'402',name:'中华民国时期邓振询烈士的工作杂记本',age:'中华民国时期(1912~1949)',sort:'文件、宣传品',size:'9.2*6.2*0.5厘米',grain:'纸',estate:'二级',imgNum:3},
     {type:'book',bs:'403',name:'1944年吕惠生烈士学习的文件',age:'中华民国时期(1912~1949)',sort:'文件、宣传品',size:'19*12.5*0.7厘米',grain:'纸',estate:'二级',imgNum:3},
     {type:'straw',bs:'404',name:'1932年吕惠生烈士的参代会政府报告书',age:'中华民国时期(1912~1949)',sort:'文件、宣传品',size:'27*19.2*1.8厘米',grain:'纸',estate:'二级',imgNum:3},
@@ -1243,7 +1243,7 @@ export const goodsData = {
     {type:'picture',bs:'444',name:'20世纪40年代成贻宾烈士头像',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'7.5*4厘米',grain:'纸',estate:'三级',imgNum:1},
     {type:'picture',bs:'445',name:'中华民国时期杜焕卿烈士半身像',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'7.2*5.2厘米',grain:'纸',estate:'三级',imgNum:1},
     {type:'picture',bs:'446',name:'中华民国时期吴本祥烈士头像',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'8*4.8厘米',grain:'纸',estate:'三级',imgNum:1},
-    {type:'picture',bs:'447',name:'20世纪20年代陈景星烈士半身像',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'10*8厘米',grain:'纸',estate:'三级',imgNum:1},
+    // {type:'picture',bs:'447',name:'20世纪20年代陈景星烈士半身像',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'10*8厘米',grain:'纸',estate:'三级',imgNum:1},
     {type:'picture',bs:'448',name:'20世纪二三十年代蓝文胜烈士像',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'11.5*8.5厘米',grain:'纸',estate:'三级',imgNum:1},
     {type:'picture',bs:'449',name:'1928年孟琇焘烈士头像',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'10.5*8厘米',grain:'纸',estate:'三级',imgNum:1},
     {type:'picture',bs:'450',name:'中华民国时期孟琇焘烈士与友人的合影',age:'中华民国时期(1912~1949)',sort:'音像制品',size:'9.8*7.2厘米',grain:'纸',estate:'三级',imgNum:1},

+ 41 - 33
vue/src/views/LookGoods.vue

@@ -1,54 +1,62 @@
 <template>
-<div class='LookGoods'>
-  <div class="lookBtn" @click="$router.push('/Goods?k=1')">
-    <img src="../assets/img/lookBtn.png" alt="">
+  <div class="LookGoods">
+    <div class="lookBtn" @click="$router.push('/Goods?k=1')">
+      <img src="../assets/img/lookBtn.png" alt="" />
+    </div>
   </div>
-</div>
 </template>
 
 <script>
-
 export default {
-components: {},
-data() {
-return {
-
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  watch: {},
+  methods: {},
+  created() {
+    // 移动端和pc端的切换
+    if (
+      window.navigator.userAgent.match(
+        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+      )
+    ) {
+      // 移动端
+      if (window.location.href.includes("YHT")) {
+        window.location.href = window.location.href.replace("YHT", "YHTM");
+        setTimeout(() => {
+          location.reload(true);
+        }, 200);
+      }
+    }
+  },
+  mounted() {
+    //
+  },
+  beforeCreate() {}, //生命周期 - 创建之前
+  beforeMount() {}, //生命周期 - 挂载之前
+  beforeUpdate() {}, //生命周期 - 更新之前
+  updated() {}, //生命周期 - 更新之后
+  beforeDestroy() {}, //生命周期 - 销毁之前
+  destroyed() {}, //生命周期 - 销毁完成
+  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
 };
-},
-computed: {},
-watch: {},
-methods: {
-
-},
-created() {
-
-},
-mounted() {
-
-},
-beforeCreate() {}, //生命周期 - 创建之前
-beforeMount() {}, //生命周期 - 挂载之前
-beforeUpdate() {}, //生命周期 - 更新之前
-updated() {}, //生命周期 - 更新之后
-beforeDestroy() {}, //生命周期 - 销毁之前
-destroyed() {}, //生命周期 - 销毁完成
-activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
-}
 </script>
 <style lang='less' scoped>
-.LookGoods{
+.LookGoods {
   width: 100%;
   height: 100%;
-  background-image: url('../assets/img/lookBg.jpg');
+  background-image: url("../assets/img/lookBg.jpg");
   background-size: 100% 100%;
   position: relative;
-  .lookBtn{
+  .lookBtn {
     cursor: pointer;
     position: absolute;
     bottom: 100px;
     left: 50%;
     transform: translateX(-50%);
-    &>img{
+    & > img {
       width: 270px;
     }
   }