lanxin 1 тиждень тому
батько
коміт
7f41c60d52

BIN
Scene/public/data/1.mp4


BIN
Scene/public/images/map_1.png


BIN
Scene/public/images/map_2.png


+ 15 - 5
Scene/public/showa/js/loadCAD.js

@@ -46,6 +46,11 @@ window.grendCAD = (function grendCAD() {
         height: 200px;
         background: rgba(0, 0, 0, .3);
         border-radius: 5px; 
+        background-image: url('./images/map_1.png');
+        background-size: 100% 100%;
+        path {
+          opacity: 0;
+        }
         g.sign>path {
           opacity: 1;
         }
@@ -76,6 +81,11 @@ window.grendCAD = (function grendCAD() {
             height: 100px;
             background: rgba(0, 0, 0, .3);
             border-radius: 5px;
+            background-image: url('./images/map_1.png');
+            background-size: 100% 100%;
+            path {
+              opacity: 0;
+            }
             g.sign>path {
               opacity: 1;
             }
@@ -125,11 +135,11 @@ 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.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({

BIN
Scene/src/assets/img/video.png


+ 27 - 1
Scene/src/pages/A2main/index.module.scss

@@ -61,6 +61,7 @@
       align-items: center;
       gap: 38px;
       .likeBox,
+      .videoBox,
       #volume,
       #gui-fullscreen,
       #gui-fullscreen-exit,
@@ -105,7 +106,8 @@
     }
 
     // 点赞
-    .likeBox {
+    .likeBox,
+    .videoBox {
       float: left;
       cursor: pointer;
 
@@ -286,6 +288,29 @@
       }
     }
 
+    .videoD {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(0, 0, 0, 0.712);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      z-index: 30000;
+      & > video {
+        width: 70%;
+        height: 80%;
+      }
+      .closeV {
+        position: absolute;
+        top: 11%;
+        right: 12%;
+        cursor: pointer;
+      }
+    }
+
     // 移动端
 
     @media screen and (max-width: 1000px) {
@@ -332,6 +357,7 @@
         gap: 30px;
         margin-bottom: -30px;
         .likeBox,
+        .videoBox,
         #volume,
         #gui-fullscreen,
         #gui-fullscreen-exit,

+ 17 - 6
Scene/src/pages/A2main/index.tsx

@@ -22,7 +22,7 @@ function A2main() {
   const [like, setLike] = useState(false)
   const [likeNum, setLikeNum] = useState(1)
   const [viewNum, setViewNum] = useState(1)
-  const [isShowSection, setIsShowSection] = useState(false)
+  const [isShowVideo, setIsShowVideo] = useState(false)
 
   useEffect(() => {
     http.get(`https://count.4dage.com/api/count/detail/${SCENE_CODE}`).then(res => {
@@ -216,12 +216,10 @@ function A2main() {
               <div className='hoveImg'>音乐开关</div>
             </div>
 
-            {/* 点赞 */}
-            <div className='likeBox' onClick={likeFu}>
-              <img src={like ? imgArr[1] : imgArr[0]} alt='' />
+            <div className='videoBox' onClick={() => setIsShowVideo(true)}>
+              <img src={require('@/assets/img/video.png')} alt='' />
               {/* 鼠标移入 */}
-              <div className='hoveImg'>点赞{likeNum}</div>
-              <div className={classNames('likeMove', like ? 'likeMoveAc' : '')}>+1</div>
+              <div className='hoveImg'>布展视频</div>
             </div>
 
             <div className='A2_share_box' onClick={handleShareClick}>
@@ -229,6 +227,14 @@ function A2main() {
               <div className='hoveImg'>分享</div>
             </div>
 
+            {/* 点赞 */}
+            <div className='likeBox' onClick={likeFu}>
+              <img src={like ? imgArr[1] : imgArr[0]} alt='' />
+              {/* 鼠标移入 */}
+              <div className='hoveImg'>点赞{likeNum}</div>
+              <div className={classNames('likeMove', like ? 'likeMoveAc' : '')}>+1</div>
+            </div>
+
             <div className='A2_view_box'>
               <img src={require('@/assets/img/view.png')} alt='' />
               <div className='hoveImg'>浏览量{viewNum}</div>
@@ -287,6 +293,11 @@ function A2main() {
           hiddenMap(false)
         }}
       />
+
+      {isShowVideo && <div className="videoD">
+        <video src='data/1.mp4' autoPlay muted></video>
+        <div className="closeV" onClick={() => setIsShowVideo(false)}><img src={require('@/assets/img/close.png')} alt="" draggable="false" /></div>
+      </div>}
     </div>
   )
 }

+ 1 - 1
Scene/src/pages/A3hotList/index.module.scss

@@ -43,7 +43,7 @@
         padding: 4px 3px;
         cursor: pointer;
         &:hover {
-          background-color: rgb(182, 154, 117);
+          background-color: rgba(233, 47, 66, 0.5);
         }
       }
       .A3close {