first

hot/src/views/Home.vue

@@ -2,14 +2,10 @@
   <div class="home">
     <div class="main">
       <div class="myTitle">{{ myTitle }}</div>
+      <div class="line"><img src="@/assets/images/pc/line.png" alt="" /></div>
+
       <div class="mainCon" v-show="!oneTxt">
-        <audio
-          id="myAudio"
-          v-if="audio"
-          v-show="isOneAduio"
-          :src="urlToFitFu(audio)"
-          controls
-        ></audio>
+        <audio id="myAudio" v-if="audio" v-show="isOneAduio" :src="urlToFitFu(audio)" controls></audio>
         <!-- 如果只有一个模块 -->
         <!-- <div class="oneTabNum" v-if="
           flooTab.length === 1 &&
@@ -24,54 +20,27 @@
 
         <div class="contenBoxMain swiper-container">
           <div class="swiper-wrapper">
-            <div
-              class="contenBox swiper-slide"
-              v-for="(item, index) in data[myType]"
-              :key="myType === 'video' ? item.url : item"
-            >
+            <div class="contenBox swiper-slide" v-for="(item, index) in data[myType]" :key="myType === 'video' ? item.url : item">
               <!-- 模型页面 -->
               <div class="modelBox" v-if="myType === 'model'">
-                <iframe
-                  :src="urlToFitFu(item)"
-                  frameborder="0"
-                  v-if="index === myInd"
-                ></iframe>
+                <iframe :src="urlToFitFu(item)" frameborder="0" v-if="index === myInd"></iframe>
               </div>
               <!-- 视频页面 -->
               <div class="videoBox" v-else-if="myType === 'video'">
-                <video
-                  controls
-                  controlslist="nodownload"
-                  :src="urlToFitFu(item.url)"
-                  v-if="index === myInd"
-                ></video>
+                <video controls controlslist="nodownload" :src="urlToFitFu(item.url)" v-if="index === myInd"></video>
               </div>
               <!-- 图片页面 -->
               <div class="imgBox" v-else-if="myType === 'img'">
                 <div class="smImgBox">
-                  <img
-                    v-lazy="urlToFitFu(item)"
-                    alt=""
-                    @click="lookImg(urlToFitFu(item))"
-                  />
+                  <img v-lazy="urlToFitFu(item)" alt="" @click="lookImg(urlToFitFu(item))" />
                 </div>
               </div>
             </div>
           </div>
           <!-- 左右箭头 -->
           <template v-if="!isMobile">
-            <div
-              @click="cutMyInd(-1, myInd === 0)"
-              class="leftJJ awccJJ"
-              :class="{ noClick: myInd === 0 }"
-              v-if="data[myType] && data[myType].length > 1"
-            ></div>
-            <div
-              @click="cutMyInd(1, myInd === data[myType].length - 1)"
-              class="rightJJ awccJJ"
-              :class="{ noClick: myInd === data[myType].length - 1 }"
-              v-if="data[myType] && data[myType].length > 1"
-            ></div>
+            <div @click="cutMyInd(-1, myInd === 0)" class="leftJJ awccJJ" :class="{ noClick: myInd === 0 }" v-if="data[myType] && data[myType].length > 1"></div>
+            <div @click="cutMyInd(1, myInd === data[myType].length - 1)" class="rightJJ awccJJ" :class="{ noClick: myInd === data[myType].length - 1 }" v-if="data[myType] && data[myType].length > 1"></div>
           </template>
         </div>
       </div>
@@ -83,16 +52,8 @@
         <div class="flooTxtBox">
           <!-- <div class="myTitle">{{ myTitle }}</div> -->
           <!-- 视频的介绍 -->
-          <div
-            class="myTxt"
-            v-if="myType === 'video' && videoTxt[myInd]"
-            v-html="videoTxt[myInd]"
-          ></div>
-          <div
-            class="myTxt"
-            v-if="myType === 'img' && imgTxt[myInd]"
-            v-html="imgTxt[myInd]"
-          ></div>
+          <div class="myTxt" v-if="myType === 'video' && videoTxt[myInd]" v-html="videoTxt[myInd]"></div>
+          <div class="myTxt" v-if="myType === 'img' && imgTxt[myInd]" v-html="imgTxt[myInd]"></div>
           <div class="myTxt" v-html="myTxt"></div>
         </div>
       </div>
@@ -104,45 +65,16 @@
 
     <!-- 底部的tab -->
     <div class="flooTabBox" v-if="flooTab.length > 1">
-      <div
-        @click="myType = item.type"
-        class="tabRow"
-        :class="{ tabRowAc: myType === item.type }"
-        v-for="item in flooTab"
-        :key="item.id"
-      >
-        <img
-          :src="
-            require(`@/assets/images/pc/icon${item.id}${
-              myType === item.type ? 'Ac' : ''
-            }.png`)
-          "
-          alt=""
-        />
+      <div @click="myType = item.type" class="tabRow" :class="{ tabRowAc: myType === item.type }" v-for="item in flooTab" :key="item.id">
+        <img :src="require(`@/assets/images/pc/icon${item.id}${myType === item.type ? 'Ac' : ''}.png`)" alt="" />
         <div>
           {{ item.name }}
-          <span
-            v-if="
-              data[item.type] &&
-              data[item.type].length &&
-              data[item.type].length > 1
-            "
-            >{{ item.type === myType ? myInd + 1 + "/" : null
-            }}{{ data[item.type].length }}</span
-          >
+          <span v-if="data[item.type] && data[item.type].length && data[item.type].length > 1">{{ item.type === myType ? myInd + 1 + "/" : null }}{{ data[item.type].length }}</span>
         </div>
       </div>
       <!-- 音频图标 -->
-      <div
-        class="tabRow"
-        v-if="audio && !isOneAduio"
-        @click="audioSta = !audioSta"
-        :title="audioSta ? '关闭音频' : '打开音频'"
-      >
-        <img
-          :src="require(`@/assets/images/pc/audio${audioSta ? 'Ac' : ''}.png`)"
-          alt=""
-        />
+      <div class="tabRow" v-if="audio && !isOneAduio" @click="audioSta = !audioSta" :title="audioSta ? '关闭音频' : '打开音频'">
+        <img :src="require(`@/assets/images/pc/audio${audioSta ? 'Ac' : ''}.png`)" alt="" />
         <div>音频</div>
       </div>
     </div>
@@ -264,12 +196,7 @@ export default {
       if (resData) {
         this.audio = resData.backgroundMusic;
         // 只有单独的音频上传
-        if (
-          resData.backgroundMusic &&
-          !resData.model &&
-          !resData.video &&
-          !resData.images
-        ) {
+        if (resData.backgroundMusic && !resData.model && !resData.video && !resData.images) {
           this.isOneAduio = true;
         }
         // 底部的tab
@@ -334,7 +261,7 @@ export default {
   background-color: rgba(transparent, 0.8);
   background-size: 100% 100%;
   border-radius: 10px;
-  color: #f0ece0;
+  color: #6d4c29;
   .swiper-pagination {
     margin: 10px 0 0;
     position: relative;
@@ -382,9 +309,22 @@ export default {
     .myTitle {
       font-size: 22px;
       font-weight: 700;
-      margin-bottom: 20px;
+      padding: 10px;
       text-align: center;
     }
+    .line {
+      width: 100%;
+      height: 30px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      & > img {
+        height: 20px;
+        object-fit: contain;
+      }
+    }
     .mainCon {
       position: relative;
       border-radius: 6px;
@@ -478,7 +418,7 @@ export default {
 
         .myTxt {
           font-size: 16px;
-          color: #f0ece0;
+          color: #6d4c29;
           line-height: 24px;
         }
         &::-webkit-scrollbar {
@@ -544,7 +484,7 @@ export default {
 @media screen and (max-width: 1000px) {
   .home {
     background: url("../assets/images/pc/hot_bg_M.png") no-repeat center center;
-    background-size: cover !important;
+    background-size: 100% 100% !important;
     .swiper-pagination {
       margin: 10px 0 0;
       gap: 4px;
@@ -568,7 +508,7 @@ export default {
       }
       .mainCon {
         border-radius: 0;
-        height: calc(100% - 195px);
+        height: calc(100% - 255px);
         .contenBox {
           .videoBox {
             padding: 0 30px;

scene/public/index.html

@@ -8,7 +8,7 @@
     <meta name="description" content="Web site created using create-react-app" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
 
-    <title>碧色万里——10-12世纪的草原丝绸之路</title>
+    <title>福尔摩斯展</title>
 
     <!-- 大场景相关 -->
     <link rel="stylesheet" href="./css/oldVer/main0.css" />

scene/public/js/Hot.js

@@ -55,8 +55,8 @@ window.initHot = function (model) {
       o = 'en' == manage.number('lang') ? '&lang=' + manage.number('lang') : ''
     ;-1 == r.indexOf('?') ? (src = link + '?time=' + randomTime().getTime() + '&id=' + window.number + o) : (src = link + '&time=' + randomTime().getTime() + '&id=' + window.number + o)
 
-    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/sichouMuseum/bswl/hot')
-    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
+    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/sichouMuseum/bswl/hot')
+    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8081')
     // return src
   }
   var removeSrcPostMark = function (url) {

scene/public/showa/js/loadCAD.js

@@ -46,7 +46,7 @@ window.grendCAD = (function grendCAD() {
         height: 150px;
         background: rgba(0, 0, 0, .3);
         border-radius: 5px; 
-        visibility: visible;
+        visibility: visible !important;
         g.sign>path {
           opacity: 1;
         }

scene/src/pages/A2main/index.tsx

@@ -280,7 +280,7 @@ function A2main() {
               <div className='hoveImg'>关闭全屏</div>
             </div>
 
-            <div className="hiddenBar" onClick={() => {
+            {/* <div className="hiddenBar" onClick={() => {
               setHiddenBar(hiddenBar === '隐藏' ? '显示' : '隐藏')
             }}>
               <img src={require(`@/assets/img/${hiddenBar === '隐藏'
@@ -288,7 +288,7 @@ function A2main() {
                 : (isMobile() ? 'xs_M' : 'xs')
                 }.png`)} alt='' />
               <div className='hoveImg'>{hiddenBar}</div>
-            </div>
+            </div> */}
 
             <div className='pull-right terms terms2'>
               {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}

scene/src/pages/A3hotList/index.module.scss

@@ -20,7 +20,7 @@
       height: 100%;
       background: url('../../assets/img/hotlist_bg.png') center center;
       background-size: cover;
-      color: #F0ECE0;
+      color: #6D4C29;
       font-size: 17px;
       font-weight: 500;
       overflow: auto;
@@ -33,7 +33,7 @@
         padding: 40px 0 10px 0;
         font-size: 24px;
         font-weight: 400;
-        color: #F0ECE0;
+        color: #6D4C29;
       }
       .A3item {
         display: flex;
@@ -41,10 +41,10 @@
         justify-content: center;
         width: 100%;
         height: fit-content;
-        padding: 4px 3px;
+        padding: 4px 6px;
         cursor: pointer;
         &:hover {
-          background-color: rgb(155, 130, 97);
+          background-color: #dfcab0;
         }
       }
       .A3close {
@@ -52,7 +52,7 @@
         bottom: -12px;
         width: 250px;
         height: 60px;
-        background-color: #4d4a37;
+        background: url('../../assets/img/hotlist_bg.png') center center;
         cursor: pointer;
         &:hover {
           opacity: 1;