lanxin 2 dienas atpakaļ
vecāks
revīzija
6be9da9579

+ 2 - 2
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:8081')
+    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/shandongMuseum/fuermosi/hot')
+    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8081')
     // return src
   }
   var removeSrcPostMark = function (url) {

+ 29 - 23
scene/src/pages/A2main/index.tsx

@@ -15,7 +15,7 @@ const imgArrTemp = ['like.png', 'likeAc.png']
 const imgArr = imgArrTemp.map(item => require(`@/assets/img/${item}`))
 
 function A2main() {
-  const SCENE_CODE = 'SG-cZhL5llbCLb-09'
+  const SCENE_CODE = 'SG-VJm3IGDI0Hx-15'
   // 漫游的状态
   const { state3d } = useSelector((state: RootState) => state.three)
   const [hiddenBar, setHiddenBar] = useState('隐藏')
@@ -73,25 +73,31 @@ function A2main() {
   }
 
   // translate 隐藏
-  const hiddenBarCss = !isMobile() ? (hiddenBar === '显示' ? {
-    // 桌面端横向移出
-    transform: 'translateX(350%)',
-    opacity: 0,
-    transition: 'all 0.3s ease-in',
-  } : {
-    // 桌面端显示位置
-    transform: 'translateX(0)',
-    transition: 'all 0.3s ease-in-out',
-  }) : (hiddenBar === '显示' ? {
-    // 移动端纵向移出
-    transform: 'translateY(350%)',
-    opacity: 0,
-    transition: 'all 0.3s ease-in',
-  } : {
-    // 移动端纵向显示位置
-    transform: 'translateY(0)',
-    transition: 'all 0.3s ease-in-out',
-  })
+  const hiddenBarCss = !isMobile()
+    ? hiddenBar === '显示'
+      ? {
+          // 桌面端横向移出
+          transform: 'translateX(350%)',
+          opacity: 0,
+          transition: 'all 0.3s ease-in'
+        }
+      : {
+          // 桌面端显示位置
+          transform: 'translateX(0)',
+          transition: 'all 0.3s ease-in-out'
+        }
+    : hiddenBar === '显示'
+    ? {
+        // 移动端纵向移出
+        transform: 'translateY(350%)',
+        opacity: 0,
+        transition: 'all 0.3s ease-in'
+      }
+    : {
+        // 移动端纵向显示位置
+        transform: 'translateY(0)',
+        transition: 'all 0.3s ease-in-out'
+      }
 
   // const hiddenMap = (isShow: boolean) => {
   //   const cad: any = document.querySelector('.cad')
@@ -103,7 +109,7 @@ function A2main() {
   useEffect(() => {
     const sections = document.querySelectorAll('.sectionCont')
     sections.forEach((section, index) => {
-      section.setAttribute('data-index', index.toString());
+      section.setAttribute('data-index', index.toString())
     })
   }, [])
 
@@ -271,7 +277,7 @@ function A2main() {
               {/* 鼠标移入 */}
               <div className='hoveImg'>全屏</div>
             </div>
-            <div id='gui-fullscreen-exit' className='ui-icon wide' data-placement='top' rel='tooltip' style={{ display: 'none' }} >
+            <div id='gui-fullscreen-exit' className='ui-icon wide' data-placement='top' rel='tooltip' style={{ display: 'none' }}>
               {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
               <a>
                 <img src='images/fullx.png' alt='' />
@@ -309,7 +315,7 @@ function A2main() {
           setHotListShow(false)
         }}
       />
-    </div >
+    </div>
   )
 }
 

+ 6 - 6
scene/src/pages/A3hotList/index.module.scss

@@ -3,7 +3,7 @@
   top: 50%;
   right: 0;
   transform: translate(0, -50%);
-  width: 250px;
+  width: 350px;
   height: 100%;
   z-index: 30001;
   display: flex;
@@ -16,11 +16,11 @@
       align-items: center;
       justify-content: flex-start;
       gap: 10px;
-      width: 250px;
+      width: 350px;
       height: 100%;
       background: url('../../assets/img/hotlist_bg.png') center center;
       background-size: cover;
-      color: #6D4C29;
+      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: #6D4C29;
+        color: #6d4c29;
       }
       .A3item {
         display: flex;
@@ -50,9 +50,9 @@
       .A3close {
         position: fixed;
         bottom: -12px;
-        width: 250px;
+        width: 330px;
         height: 60px;
-        background: url('../../assets/img/hotlist_bg.png') center center;
+        background-color: #dfc297;
         cursor: pointer;
         &:hover {
           opacity: 1;

BIN
scene/src/pages/A4base/image/bg.png


BIN
scene/src/pages/A4base/image/button.png


BIN
scene/src/pages/A4base/image/logo.png


BIN
scene/src/pages/A4base/image/other.png


BIN
scene/src/pages/A4base/image/pic.png


BIN
scene/src/pages/A4base/image/pic_2.png


BIN
scene/src/pages/A4base/image/title.png


BIN
scene/src/pages/A4base/image/title_2.png


+ 22 - 27
scene/src/pages/A4base/index.module.scss

@@ -8,7 +8,7 @@
   height: 100%;
   transition: all 0.5s;
   background: url('./image/bg.png') repeat center center;
-  // background-size: 100% 100%;
+  background-size: 100% 101%;
   > div {
     position: absolute;
     top: 50%;
@@ -21,14 +21,14 @@
   }
   :global {
     .A4base-title3 {
-      transform: translate(-50%, -420px);
-      width: 1728px;
-      height: 50px;
+      transform: translate(-50%, -89%);
+      width: 900px;
+      height: 340px;
     }
     .A4base-logo {
-      transform: translate(-865px, -350px);
-      width: 100px;
-      height: 150px;
+      transform: translate(-233%, -271%);
+      width: 400px;
+      height: 162px;
     }
     .A4base-content {
       width: 1150px;
@@ -37,7 +37,7 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      transform: translate(-90%, -325px);
+      transform: translate(-50%, -280px);
       .A4base-title2 {
         width: 68%;
         height: 100%;
@@ -53,30 +53,25 @@
     }
 
     .A4base-pic1 {
-      transform: translate(-80px, 0px);
-    width: 200px;
+      transform: translate(-178%, 43%);
+      width: 530px;
+      height: 304px;
     }
     .A4base-pic2 {
-      transform: translate(-860px, -430px);
-    width: 150px;
+      transform: translate(48%, -321%);
+      width: 621px;
+      height: 140px;
     }
-     .A4base-pic3 {
-     transform: translate(-230px, -205px);
-    width: 70px;
-    }
-      .A4base-pic4 {
-          transform: translateX(-647px);
-    width: 325px;
-    top: 0;
-    }
-      .A4base-pic5 {
-      transform: translate(-78px, -333px);
-    width: 830px;
+    .A4base-time {
+      transform: translate(207%, 115%);
+      width: 322px;
+      height: 206px;
     }
     .A4base-button {
-      transform: translate(-575px, 250px);
-    width: 175px;
-    cursor: pointer;
+      transform: translate(-50%, 264%);
+      width: 224px;
+      height: 120px;
+      cursor: pointer;
     }
   }
 }

+ 1 - 21
scene/src/pages/A4base/index.tsx

@@ -5,31 +5,11 @@ function A4base({ show, setShow }: { show: boolean; setShow: (show: boolean) =>
   const history = useHistory()
   return (
     <div className={styles.A4base} style={{ display: show ? 'block' : 'none' }}>
-      <div className='A4base-content'>
-        <div className='A4base-title1'>
-          <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/logo.png')} alt='' />
-      </div>
-      <div className="A4base-pic3">
-        <img src={require('./image/title_2.png')} alt='' />
-      </div>
-      <div className="A4base-pic4">
-        <img src={require('./image/pic.png')} alt='' />
-      </div>
-      <div className="A4base-pic5">
-        <img src={require('./image/pic_2.png')} alt='' />
-      </div>
       <div
         className='A4base-button'
         onClick={() => {
           setShow(false)
-          history.push('/home?m=SG-cZhL5llbCLb-09')
+          history.push('/home?m=SG-VJm3IGDI0Hx-15')
           window.location.reload()
         }}
       >

BIN
scene/src/pages/A5Mobile/image/bg.png


BIN
scene/src/pages/A5Mobile/image/button.png


BIN
scene/src/pages/A5Mobile/image/logo.png


BIN
scene/src/pages/A5Mobile/image/other.png


BIN
scene/src/pages/A5Mobile/image/pic.png


BIN
scene/src/pages/A5Mobile/image/pic_2.png


BIN
scene/src/pages/A5Mobile/image/title.png


BIN
scene/src/pages/A5Mobile/image/title_1.png


+ 13 - 26
scene/src/pages/A5Mobile/index.module.scss

@@ -8,7 +8,7 @@
   height: 100%;
   transition: all 0.5s;
   background: url('./image/bg.png') no-repeat center center;
-  background-size: 100% 100%;
+  background-size: 102% 100%;
   > div {
     position: absolute;
     top: 50%;
@@ -21,36 +21,23 @@
   }
   :global {
     .title {
-      transform: translate(-50%, -195%);
-      width: calc(100% - 40px);
+      top: 90px;
+      transform: translateX(-50%);
+      width: 85%;
     }
-    .A4base-pic1 {
-      transform: translateY(-36%);
-      left: 30px;
-      width: 73px;
+    .logo {
+      top: 20px;
+      transform: translateX(-50%);
+      width: 85%;
     }
-    .A4base-pic2 {
-      transform: translate(75%);
-      top: 30px;
-      width: 100px;
-    }
-    .A4base-pic3 {
-      transform: translate(-50%, -140px);
-      width: calc(100% - 50px);
-    }
-    .A4base-pic4 {
-      transform: translateX(-92%);
-      width: 200px;
-      top: 0;
-    }
-    .A4base-pic5 {
-      transform: translate(-50%, -60px);
-      width: calc(100% - 30px);
+    .pic1 {
+      transform: translate(-50%, -20%);
+      width: 85%;
     }
     .button {
       cursor: pointer;
-      transform: translate(-50%, 290px);
-      width: 200px;
+      transform: translate(-50%, 232px);
+      width: 180px;
     }
   }
 }

+ 1 - 19
scene/src/pages/A5Mobile/index.tsx

@@ -5,29 +5,11 @@ function A5Mobile({ show, setShow }: { show: boolean; setShow: (show: boolean) =
   const history = useHistory()
   return (
     <div className={styles.A5Mobile} style={{ display: show ? 'block' : 'none' }}>
-      <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/logo.png')} alt='' />
-      </div>
-      <div className="A4base-pic3">
-        <img src={require('./image/title_1.png')} alt='' />
-      </div>
-      <div className="A4base-pic4">
-        <img src={require('./image/pic.png')} alt='' />
-      </div>
-      <div className="A4base-pic5">
-        <img src={require('./image/pic_2.png')} alt='' />
-      </div>
       <div
         className='button'
         onClick={() => {
           setShow(false)
-          history.push('/home?m=SG-cZhL5llbCLb-09')
+          history.push('/home?m=SG-VJm3IGDI0Hx-15')
           window.location.reload()
         }}
       >