feat1

hot/src/views/Home.vue

@@ -260,6 +260,7 @@ export default {
             },
             pagination: {
               el: '.swiper-pagination',
+              clickable: true,
             }
           })
         })
@@ -411,7 +412,7 @@ export default {
     .flooTxt {
       margin: 0 auto;
       margin-top: 10px;
-      width: 70%;
+      width: 80%;
       max-height: 120px;
       .flooTxtBox {
         width: 100%;
@@ -434,7 +435,7 @@ export default {
           /*滚动条里面小方块*/
           border-radius: 10px;
           -webkit-box-shadow: inset 0 0 5px transparent;
-          background: rgb(192, 166, 126);
+          background: rgb(121, 113, 103);
         }
         &::-webkit-scrollbar-track {
           /*滚动条里面轨道*/
@@ -507,7 +508,7 @@ export default {
       padding: 0;
       position: absolute;
       .myTitle {
-        font-size: 16px;
+        font-size: 20px;
       }
       .mainCon {
         border-radius: 0;

scene/public/css/oldVer/main0.css

@@ -78,7 +78,7 @@ iframe {
 }
 .popup-content {
   position: relative;
-  width: 80%;
+  width: 55%;
   height: 85%;
   overflow: hidden;
 }
@@ -91,14 +91,14 @@ iframe {
 }
 #closepop {
   background: url(../../images/close1.png) no-repeat;
+  background-size: 100% 100%;
   width: 45px;
   height: 45px;
   cursor: pointer;
   text-indent: -999em;
-  background-size: 100% 100%;
   position: absolute;
-  top: 80px;
-  right: 200px;
+  top: 95px;
+  right: 460px;
 }
 .specialTitle {
   bottom: 65%;
@@ -207,7 +207,7 @@ a {
 @media screen and (max-width: 1000px) {
   .popup-content {
     width: 90%;
-    height: 80%;
+    height: 64%;
   }
 }
 @media screen and (max-width: 768px) {
@@ -232,11 +232,15 @@ a {
 }
 @media screen and (max-width: 667px) {
   #closepop {
-    width: 30px;
-    height: 30px;
+    background: url(../../images/close2.png) no-repeat;
+    background-size: 100% 100%;
+    width: 50px;
+    height: 50px;
     position: absolute;
-    top: 70px;
-    right: 25px;
+    top: auto;
+    bottom: 95px;
+    right: 50%;
+    transform: translateX(50%);
   }
 
   #title-toggle {

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>武汉博物馆-琬琰英华</title>
+    <title>银雀山-汉简文化展</title>
 
     <!-- 大场景相关 -->
     <link rel="stylesheet" href="./css/oldVer/main0.css" />

scene/public/showa/js/loadCAD.js

@@ -45,14 +45,7 @@ window.grendCAD = (function grendCAD() {
         width: 200px;
         height: 200px;
         background: rgba(0, 0, 0, .3);
-        border-radius: 5px; 
-        background-image: url('./images/map_1.png');
-        path {
-          opacity: 0;
-        }
-        g.sign>path {
-          opacity: 1;
-        }
+        border-radius: 5px;
       }
 
       .cad > div {
@@ -80,14 +73,6 @@ window.grendCAD = (function grendCAD() {
             height: 100px;
             background: rgba(0, 0, 0, .3);
             border-radius: 5px;
-            background-image: url('./images/map_1.png');
-            background-size: cover;
-            path {
-              opacity: 0;
-            }
-            g.sign>path {
-              opacity: 1;
-            }
           }
           .img {
             width: 90%;
@@ -134,11 +119,6 @@ window.grendCAD = (function grendCAD() {
     loadScript(function () {
       let [$layer, $img] = loadDOM($parent)
 
-      $layer.addEventListener('click', () => {
-        console.log(12)
-        $img.src = './images/map_2.png'
-        $img.style.display = $img.style.display === 'block' ? 'none' : 'block'
-      })
 
       $layer.style.visibility = 'hidden'
       window.cad = structureCAD({
@@ -164,7 +144,7 @@ window.grendCAD = (function grendCAD() {
       if (point && dire) {
         window.cad.setSign(point, dire)
       }
-      $layer.style.visibility = 'visible'
+      $layer.style.visibility = 'hidden'
     })
   }
 })()

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

@@ -197,6 +197,102 @@
       }
     }
 
+    .modalBtn{
+      position: fixed;
+      top: 4%;
+      right: 40px;
+      width: 200px;
+      cursor: pointer;
+      &>img{
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
+    }
+
+    .modal {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      width: 100%;
+      height: 100%;
+      transform: translate(-50%, -50%);
+      background-color: rgba(0, 0, 0, 0.4);
+      z-index: 30000;
+      ::-webkit-scrollbar {
+        width: 3px;
+      }
+      ::-webkit-scrollbar-track {
+        background: #c0adad;
+      }
+      ::-webkit-scrollbar-thumb {
+        background: #805858;
+      }
+      .infoBox {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 20px;
+        padding: 0 30px;
+        .box {
+          width: 24%;
+          max-width: 24%;
+          height: 650px;
+          background-color: #cdc5c4;
+          color: #26160d;
+          padding: 0 20px;
+          .title {
+            width: 100%;
+            padding: 25px 20px;
+            max-height: 350px;
+          }
+          .text {
+            width: 100%;
+            padding: 0 20px;
+            overflow: auto;
+            height: 400px;
+            max-height: 600px;
+            text-indent: 2em;
+            line-height: 30px;
+            font-weight: lighter;
+            font-size: 18px;
+          }
+        }
+        .box1 {
+          display: flex;
+          padding: 0 20px;
+          .prologue {
+            padding-top: 50px;
+            font-size: 30px;
+            font-weight: 500;
+            width: 42px;
+            writing-mode: vertical-lr;
+            & > div {
+              display: inline-block;
+              width: 26px;
+              margin: 0 6px 0 10px;
+              height: 2px;
+              background-color: rgba(0, 0, 0, 0.5);
+            }
+          }
+          .text {
+            height: 540px;
+            max-height: 600px;
+            padding: 0 20px;
+            margin-top: 80px;
+          }
+        }
+      }
+      .modalClose {
+        position: absolute;
+        top: 65px;
+        right: 30px;
+        cursor: pointer;
+      }
+    }
+
     // 移动端
 
     @media screen and (max-width: 1000px) {
@@ -304,6 +400,9 @@
           border-color: #fff !important;
         }
       }
+      .modalBtn{
+        display: none;
+      }
     }
   }
 }

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

@@ -52,7 +52,7 @@
         bottom: 0;
         width: 250px;
         height: 40px;
-        background-color: rgba(157, 135, 106, 0.9);
+        background-color: #cdc5c4;
         border-top: 1px solid rgba(43, 31, 23, 0.1);
         cursor: pointer;
         &:hover {
@@ -101,7 +101,7 @@
         .A3close {
           width: 100%;
           height: 40px;
-          background-color: rgba(157, 135, 106, 0.9);
+          background-color: #cdc5c4;
           border-top: 1px solid rgba(43, 31, 23, 0.1);
           img {
             width: 16px;

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

@@ -37,7 +37,7 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      transform: translate(-50%, -280px);
+      transform: translate(-65%, -325px);
       .A4base-title2 {
         width: 68%;
         height: 100%;
@@ -53,19 +53,20 @@
     }
 
     .A4base-pic1 {
-      transform: translate(650px, -70px);
-      width: 202px;
-      height: 316px;
+      transform: translate(-830px, 140px);
+    width: 115px;
     }
     .A4base-pic2 {
-      transform: translate(-50%, 50%);
-      width: 1920px;
-      height: 325px;
+      transform: translate(-830px, 340px);
+      width: 200px;
+    }
+     .A4base-pic3 {
+      transform: translate(830px, 25px);
+      width: 80px;
     }
     .A4base-button {
-      transform: translate(-50%, 345px);
-      width: 164px;
-      height: 41px;
+      transform: translate(620px, 200px);
+      width: 175px;
       cursor: pointer;
     }
   }

scene/src/pages/A4base/index.tsx

@@ -10,11 +10,20 @@ function A4base({ show, setShow }: { show: boolean; setShow: (show: boolean) =>
           <img src={require('./image/title.png')} alt='' />
         </div>
       </div>
+      <div className="A4base-pic1">
+        <img src={require('./image/other.png')} alt='' />
+      </div>
+      <div className="A4base-pic2">
+        <img src={require('./image/time.png')} alt='' />
+      </div>
+      <div className="A4base-pic3">
+        <img src={require('./image/title_2.png')} alt='' />
+      </div>
       <div
         className='A4base-button'
         onClick={() => {
           setShow(false)
-          history.push('/home?m=SG-56imSLC7Zli')
+          history.push('/home?m=SG-Gs7eQXclHdT-01')
           window.location.reload()
         }}
       >

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

@@ -21,13 +21,25 @@
   }
   :global {
     .title {
-      transform: translate(-50%, -61%);
+      transform: translate(-50%, -150%);
+      width: calc(100% - 40px);
+    }
+    .A4base-pic1 {
+      transform: translate(-233%, 160%);
+    width: 77px;
+    }
+    .A4base-pic2 {
+      transform: translate(-85%, 322px);
       width: 200px;
     }
+     .A4base-pic3 {
+      transform: translate(170%, 40px);
+    width: 70px;
+    }
     .button {
       cursor: pointer;
       transform: translate(-50%, 229px);
-      width: 110px;
+      width: 120px;
     }
   }
 }

scene/src/pages/A5Mobile/index.tsx

@@ -8,11 +8,20 @@ function A5Mobile({ show, setShow }: { show: boolean; setShow: (show: boolean) =
       <div className='title'>
         <img src={require('./image/title.png')} alt='' />
       </div>
+      <div className="A4base-pic1">
+        <img src={require('./image/other.png')} alt='' />
+      </div>
+      <div className="A4base-pic2">
+        <img src={require('./image/time.png')} alt='' />
+      </div>
+      <div className="A4base-pic3">
+        <img src={require('./image/title_1.png')} alt='' />
+      </div>
       <div
         className='button'
         onClick={() => {
           setShow(false)
-          history.push('/home?m=SG-56imSLC7Zli')
+          history.push('/home?m=SG-Gs7eQXclHdT-01')
           window.location.reload()
         }}
       >