up

public/myData/myDataEN.js

@@ -710,7 +710,7 @@ const myDataTemp2 = {
       }
     ]
   },
-  // 属性之辩
+  // 属性之辨
   shuxing: [
     {
       name: '霍扬碑',

src/components/MenuSider/index.module.scss

@@ -154,6 +154,39 @@
 // 英文页面
 // .menuEn {}
 
-// .menuSiderEn {
-//   :global {}
-// }
+.menuSiderEn {
+  :global {
+    .sider .siderContent {
+      .tab {
+        .bottomLine {
+          bottom: 0px;
+        }
+      }
+
+      .tabAc {
+        .bottomLine {
+          bottom: 20px;
+        }
+      }
+
+      .icon {
+        width: 96%;
+        text-align: center;
+
+        &>div {
+          width: 50%;
+        }
+
+        .paint {
+          position: relative;
+          top: -12px;
+        }
+
+        .knowledge {
+          position: relative;
+          top: -22px;
+        }
+      }
+    }
+  }
+}

src/components/MenuSider/index.tsx

@@ -9,8 +9,7 @@ import { RootState } from '@/store'
  * @param activeTab 0:一碑两面 1:一碑万象 2:无尽未竟
  */
 function MenuSider({ activeTab }: { activeTab: number }) {
-
-  const {myLangue} =useSelector((state:RootState)=>state.A0Layout)
+  const { myLangue, myData } = useSelector((state: RootState) => state.A0Layout)
 
   const [isShowMenu, setIsShowMenu] = useState(false)
 
@@ -26,7 +25,7 @@ function MenuSider({ activeTab }: { activeTab: number }) {
   return (
     <>
       <div
-        className={classNames(myLangue==='EN' ? styles.menuEn : '', styles.menu)}
+        className={classNames(myLangue === 'EN' ? styles.menuEn : '', styles.menu)}
         onClick={() => setIsShowMenu(true)}
       >
         <img src={require('@/assets/img/btn_menu.png')} alt='' />
@@ -35,7 +34,7 @@ function MenuSider({ activeTab }: { activeTab: number }) {
         className={classNames(
           styles.menuSider,
           isShowMenu ? 'show' : '',
-          myLangue==='EN' ? styles.menuSiderEn : ''
+          myLangue === 'EN' ? styles.menuSiderEn : ''
         )}
       >
         <div className='sider'>
@@ -49,7 +48,7 @@ function MenuSider({ activeTab }: { activeTab: number }) {
               className={`tab ${activeTab === 0 ? 'tabAc' : ''}`}
               onClick={() => window.location.replace('#/yblm')}
             >
-              <div className='txt'>初识奇碑</div>
+              <div className='txt'>{myData.baseInfo[0].title}</div>
               <div className={`bottomLine`}>
                 <img
                   src={require(`@/assets/img/menu_item${activeTab === 0 ? '_ac.png' : '.png'}`)}
@@ -61,7 +60,7 @@ function MenuSider({ activeTab }: { activeTab: number }) {
               className={`tab ${activeTab === 1 ? 'tabAc' : ''}`}
               onClick={() => window.location.replace('#/ybwx')}
             >
-              <div className='txt'>融合之光</div>
+              <div className='txt'>{myData.baseInfo[1].title}</div>
               <div className={`bottomLine`}>
                 <img
                   src={require(`@/assets/img/menu_item${activeTab === 1 ? '_ac.png' : '.png'}`)}
@@ -73,7 +72,7 @@ function MenuSider({ activeTab }: { activeTab: number }) {
               className={`tab ${activeTab === 2 ? 'tabAc' : ''}`}
               onClick={() => window.location.replace('#/wjwj')}
             >
-              <div className='txt'>寻踪叩问</div>
+              <div className='txt'>{myData.baseInfo[2].title}</div>
               <div className={`bottomLine`}>
                 <img
                   src={require(`@/assets/img/menu_item${activeTab === 2 ? '_ac.png' : '.png'}`)}
@@ -84,7 +83,9 @@ function MenuSider({ activeTab }: { activeTab: number }) {
             <div className='icon'>
               <div className='paint' onClick={() => byzhClick(activeTab)}>
                 <img src={require('@/assets/img/icon_paint.png')} alt='' />
-                <div className='txt'>碑影智绘</div>
+                <div className='txt'>
+                  {myLangue === 'EN' ? 'Stele Shadow Intelligence Mapping' : '碑影智绘'}
+                </div>
               </div>
               <div className='knowledge'>
                 <img src={require('@/assets/img/icon_knowledge.png')} alt='' />
@@ -96,7 +97,7 @@ function MenuSider({ activeTab }: { activeTab: number }) {
                     })
                   }}
                 >
-                  知识图谱
+                  {myLangue === 'EN' ? 'Exhibition Catalogue' : '展览图谱'}
                 </div>
               </div>
               {/* <div className='poster'>

src/pages/A0base/data.ts

@@ -2,5 +2,10 @@ export const unityDomShow = (val: boolean) => {
   const dom = document.querySelector('#modalIframe') as HTMLIFrameElement
   if (dom) {
     dom.style.display = val ? 'block' : 'none'
+    if(val){
+// 待完善
+    }else {
+
+    }
   }
 }

src/pages/A0base/index.tsx

@@ -61,7 +61,10 @@ function A0base() {
       {/* 互动 */}
       <div className='interact'>
         <div className={`inter_content ${isOpenInteract ? 'inter_content_active' : ''}`}>
-          <div className='inter' onClick={() => window.location.replace('#/byzh')}>
+          <div className='inter' onClick={() => {
+            unityDomShow(false)
+            window.location.replace('#/byzh')
+          }}>
             {myLangue === 'EN' ? 'Stele Shadow Intelligence Mapping' : '碑影智绘'}
           </div>
           <div

src/pages/A1home2/index.tsx

@@ -110,11 +110,11 @@ function A1home() {
       <div className='loadingP' style={{ display: loadOk ? 'none' : 'flex' }}>
         <div
           className='A1baseVideo'
-          style={{ opacity: progress >= 100 ? 1 : 0, zIndex: myLangue === 'EN' ? 4 : 5 }}
+          style={{ opacity: progress >= 100 ? 1 : 0, zIndex: myLangue === 'EN' ? 5 : 4 }}
         ></div>
         <div
           className='A1baseVideo2'
-          style={{ opacity: progress >= 100 ? 1 : 0, zIndex: myLangue === 'ZH' ? 4 : 5 }}
+          style={{ opacity: progress >= 100 ? 1 : 0, zIndex: myLangue === 'ZH' ? 5 : 4 }}
         ></div>
 
         <div className='btn' onClick={() => enter()}>

src/pages/A7wjwj/index.module.scss

@@ -64,12 +64,11 @@
       width: 100%;
       height: 98%;
       position: relative;
-      text-indent: 2em;
-      padding: 80px 50px 0 50px;
+      padding: 100px 50px 0 50px;
       color: rgba(93, 96, 96, 1);
       font-size: 18px;
-      letter-spacing: 2px;
-      line-height: 22px;
+      letter-spacing: 4px;
+      line-height: 30px;
       text-align: justify;
     }
   }

src/pages/A7wjwj/index.tsx

@@ -14,7 +14,7 @@ function A7Wjwj() {
 
   const [currentTab, setCurrentTab] = useState(0)
 
-  // 判断是 返回 属性之辩 上一级 还是说 返回上级页面
+  // 判断是 返回 属性之辨 上一级 还是说 返回上级页面
   const tab2Ref = useRef<any>(null)
   const gotoBack = () => {
     const flag = tab2Ref.current?.sonGetStaFu()
@@ -25,11 +25,10 @@ function A7Wjwj() {
     <div className={classNames(styles.A7Wjwj, isPc ? '' : styles.A7WjwjMo)}>
       {/* 发现之谜 */}
       <Discover style={{ display: currentTab === 0 ? 'flex' : 'none' }} />
-      {/* 属性之辩 */}
+      {/* 属性之辨 */}
       <Shuxing ref={tab2Ref} style={{ display: currentTab === 1 ? 'flex' : 'none' }} />
       {/* 未解之思 */}
-      <div className='weijie' style={{ display: currentTab === 2 ? 'flex' : 'none' }}>
-        {myData.weijie}
+      <div className='weijie' dangerouslySetInnerHTML={{__html:myData.weijie}} style={{ display: currentTab === 2 ? 'flex' : 'none' }}>
       </div>
 
       <div className={classNames('back', isPc ? '' : 'moBack')} onClick={() => gotoBack()}>
@@ -41,7 +40,7 @@ function A7Wjwj() {
           发现之谜
         </div>
         <div className={`tab ${currentTab === 1 ? 'active' : ''}`} onClick={() => setCurrentTab(1)}>
-          属性之辩
+          属性之辨
         </div>
         <div className={`tab ${currentTab === 2 ? 'active' : ''}`} onClick={() => setCurrentTab(2)}>
           未解之思

src/types/declaration.d.ts

@@ -41,7 +41,7 @@ declare const F_Video: any
     txt1Items: { title: string }[]
     search: { title: string; txt: string; from: string }[]
   }
-  // 属性之辩
+  // 属性之辨
   shuxing: {
     name: string
     time: string