shaogen1995 2 роки тому
батько
коміт
509d6ebacb

+ 1 - 1
SWKK/src/App.vue

@@ -8,7 +8,7 @@
 #app {
   width: 100vw;
   height: 100vh;
-  min-width: 1900px;
+  min-width: 1600px;
   min-height: 800px;
   overflow: auto;
 }

BIN
SWKK/src/assets/media/bacMusic.mp3


+ 7 - 7
SWKK/src/components/Hot.vue

@@ -213,12 +213,12 @@ export default {
           image: 3,
         };
         for (const k in val) {
-          this.rightList[obj[k]].show = true;
+          if (val[k].length) this.rightList[obj[k]].show = true;
         }
-        if (val["image"]) this.type = "image";
-        else if (val["video"]) this.type = "video";
-        else if (val["link"]) this.type = "link";
-        else if (val["audio"]) this.type = "audio";
+        if (val["image"] && val["image"].length) this.type = "image";
+        else if (val["video"] && val["video"].length) this.type = "video";
+        else if (val["link"] && val["link"].length) this.type = "link";
+        else if (val["audio"] && val["audio"].length) this.type = "audio";
       },
       immediate: true,
     },
@@ -281,8 +281,8 @@ export default {
   .mainrr {
     display: flex;
     position: absolute;
-    bottom: 30px;
-    right: 40px;
+    bottom: 15px;
+    right: 20px;
     z-index: 10;
     .row {
       position: relative;

+ 3 - 2
SWKK/src/views/Home.vue

@@ -285,14 +285,15 @@ export default {
               video: [],
             };
             temp.forEach((v) => {
+              console.log('pppppppppp',v);
               obj[v.type].push(v);
             });
             this.sonInfo = obj;
           } else {
             // 单个热点
-            this.sonInfo = { audio: [e.data] };
+            this.sonInfo = { [e.data.type]: [e.data] };
           }
-
+          console.log('-------------',this.sonInfo);
           // 如果只需监听热点点击,实现其他逻辑操作,下面的代码不需要调用
 
           // 聚焦当前点击的热点

+ 1 - 1
vue/src/App.vue

@@ -8,7 +8,7 @@
 #app {
   width: 100vw;
   height: 100vh;
-  min-width: 1900px;
+  min-width: 1600px;
   min-height: 800px;
   overflow: auto;
 }

BIN
vue/src/assets/media/bacMusic.mp3


+ 9 - 2
vue/src/views/Goods/components/Tow.vue

@@ -8,7 +8,9 @@
         v-for="(item, index) in data"
         :key="index"
       >
-        <div v-if="item.imgNum"><img v-lazy="`goodsData/2D/${item.bs}_1.JPG`" alt="" /></div>
+        <div v-if="item.imgNum">
+          <img v-lazy="`goodsData/2D/${item.bs}_1.JPG`" alt="" />
+        </div>
         <div v-else><img v-lazy="`goodsData/2D/${item.bs}.JPG`" alt="" /></div>
         <p>{{ item.name }}</p>
       </div>
@@ -106,7 +108,7 @@ export default {
       width: 23%;
       height: 280px;
       margin: 0 40px 40px 0;
-      background-color: #dddddd;
+      background-color: #f0f1f3;
       & > div {
         width: 100%;
         height: 210px;
@@ -136,6 +138,11 @@ export default {
         margin-right: 0;
       }
     }
+    @media screen and (max-width: 1800px) {
+      .row {
+        width: 22%;
+      }
+    }
   }
 }
 </style>

+ 1 - 1
vue/src/views/Goods/index.vue

@@ -403,7 +403,7 @@ export default {
   .rightTop {
     position: absolute;
     top: 32px;
-    right: 160px;
+    right: 140px;
     height: 60px;
     display: flex;
     .row {