Merge branch 'master' of http://192.168.0.115:3000/lanxin/Chengzhebei into master

src/pages/A0base/index.module.scss

@@ -187,7 +187,7 @@
       align-items: center;
       justify-content: center;
       flex-direction: column;
-      color: #B1967B;
+      color: #b1967b;
       cursor: pointer;
 
       & > img {

src/pages/A0base/index.tsx

@@ -11,9 +11,9 @@ function A0base() {
   const [loding, setLoding] = useState(false)
 
   useEffect(() => {
-      // 切换场景
-      cutUnityFu('TombstoneView',()=>setLoding(true))
-      
+    // 切换场景
+    cutUnityFu('TombstoneView', () => setLoding(true))
+
   }, [])
 
   const { myData, myLangue } = useSelector((state: RootState) => state.A0Layout)
@@ -65,10 +65,10 @@ function A0base() {
       </div>
 
       {/* 互动 */}
-      <div className='interact'>
+      <div className='interact '>
         <div className={`inter_content ${isOpenInteract ? 'inter_content_active' : ''}`}>
           <div
-            className='inter'
+            className='inter songFontc'
             onClick={() => {
               unityShow(false)
               window.location.replace('#/byzh')
@@ -77,7 +77,7 @@ function A0base() {
             {myLangue === 'EN' ? 'Stele Shadow Intelligence Mapping' : '碑影智绘'}
           </div>
           <div
-            className='inter'
+            className='inter songFontc'
             onClick={() => {
               Toast.show({
                 content: '正在开发中'

src/pages/A6ybwx/A6_1_zxys/index.module.scss

@@ -1,7 +1,10 @@
 .Zaoxiang {
   width: 100%;
   height: 100%;
-  position: relative;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
   z-index: 1;
   background: url('../../../assets/img/A6_zaoxiang_bg.png') no-repeat center center;
   background-size: 100% 100%;

src/pages/A6ybwx/A6_1_zxys/index.tsx

@@ -29,7 +29,7 @@ function Zaoxiang({ setGotopage }: { setGotopage: (page: number) => void }) {
         <img src={require('@/assets/img/A6_zaoxiang_title.png')} draggable='false' alt='' />
       </div>
       <div className='zaoxiang_text'>
-        <div className='t1'>东西方石刻技艺相融结合的完美范例之一</div>
+        <div className='t1 songFont'>东西方石刻技艺相融结合的完美范例之一</div>
         <div className='line1'>
           <img src={require('@/assets/img/A6_zaoxiang_line1.png')} draggable='false' alt='' />
         </div>
@@ -60,12 +60,12 @@ function Zaoxiang({ setGotopage }: { setGotopage: (page: number) => void }) {
               <img src={require('@/assets/img/btn_back.png')} alt='' />
             </div>
             <div className='detailTitle'>
-              <div className='name'>{currentItem?.name}</div>
+              <div className='name songFont'>{currentItem?.name}</div>
               <div className='dtxt'>
                 <div className='icon1'>
                   <img src={require('@/assets/img/A6_zaoxiang_icon1.png')} draggable='false' alt='' />
                 </div>
-                <div className='dtext'>{currentItem?.type}</div>
+                <div className='dtext songFont'>{currentItem?.type}</div>
                 <div className='icon2'>
                   <img src={require('@/assets/img/A6_zaoxiang_icon2.png')} draggable='false' alt='' />
                 </div>

src/pages/A6ybwx/A6_2_zxzgh/index.module.scss

@@ -1,7 +1,10 @@
 .Sinicize {
   width: 100%;
   height: 100%;
-  position: relative;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
   z-index: 1;
   overflow-x: auto;
   transition: all 0.3s ease-in-out;

src/pages/A6ybwx/Genealogy/index.module.scss

@@ -144,18 +144,17 @@
       }
     }
     .content {
-      width: 70%;
+      width: 80%;
       height: 45%;
       font-size: 16px;
       color: rgba(209, 201, 178, 1);
       text-align: center;
       line-height: 26px;
-      text-align: justify;
     }
     .close {
       cursor: pointer;
-      width: 70px;
-      height: 70px;
+      width: 80px;
+      height: 40px;
       & > img {
         height: 100%;
         object-fit: contain;

src/pages/A6ybwx/Genealogy/index.tsx

@@ -58,15 +58,14 @@ function Genealogy({ setGotoTab }: { setGotoTab: (tab: number) => void }) {
       {isShowIntro && (
         <div className={styles.intro}>
           <div className='title'>
-            <div className='big'>{myData?.genealogyIntro?.bigTitle}</div>
+            <div className='big songFont'>{myData?.genealogyIntro?.bigTitle}</div>
             <div className='small'>{myData?.genealogyIntro?.smallTitle}</div>
             <div className='sun'></div>
           </div>
           <div className='line'>
             <img src={require('@/assets/img/A6_gen_introline.png')} draggable='false' alt='' />
           </div>
-          <div className='content'>
-            {myData?.genealogyIntro?.content}
+          <div className='content' dangerouslySetInnerHTML={{ __html: myData?.genealogyIntro?.content }}>
           </div>
           <div className='close' onClick={() => setIsShowIntro(false)}>
             <img src={require('@/assets/img/closeWithTxt.png')} draggable='false' alt='' />

src/pages/A6ybwx/StatueArt/index.module.scss

@@ -39,14 +39,15 @@
       }
     }
 
-    .text {
-      width: 210px;
+    .Stext {
+      width: 176px;
       height: 95%;
-      font-size: 16px;
+      font-size: 14px;
+      letter-spacing: 0px;
       line-height: 24px;
-      color: rgba(91, 71, 46, 1);
+      color: rgb(91, 71, 46);
       font-weight: 300;
-      transform: translate(-123%, -28%);
+      transform: translate(103%, 20%);
       text-align: justify;
     }
 

src/pages/A6ybwx/StatueArt/index.tsx

@@ -16,7 +16,7 @@ function StatueArt({ setGotoTab }: { setGotoTab: (tab: number) => void }) {
       {/* <div className='ffhyTitle'>
         <img src={require('@/assets/img/A6_ffhy_title.png')} draggable={false} alt='' />
       </div> */}
-      <div className="text">
+      <div className="Stext">
         两汉之际，佛教传入中原，开始出现以金铜、石刻佛像形式宣传佛教神祇和经典的活动。魏晋南北朝时期，随着佛教的发展，佛教造像行为达到顶峰，皇家石窟如云冈石窟、龙门石窟相继开凿，石塔、造像碑、单体造像、背屏式造像等石刻表现形式多样，并随着社会发展呈现出不同的社会物质面貌。
       </div>
       <div className='ffhybtn1' onClick={() => setGotopage(1)}>

src/pages/A6ybwx/index.module.scss

@@ -5,7 +5,6 @@
   background-color: black;
 
   :global {
-
     .back {
       width: 60px;
       height: 30px;
@@ -16,7 +15,7 @@
       cursor: pointer;
       z-index: 1;
 
-      &>img {
+      & > img {
         height: 100%;
         object-fit: contain;
       }
@@ -38,8 +37,8 @@
       .tab1,
       .tab2,
       .tab3 {
-        width: 55px;
-        height: 55px;
+        width: 60px;
+        height: 60px;
         line-height: 35px;
         display: flex;
         justify-content: center;
@@ -64,7 +63,6 @@
       }
     }
 
-
     .videoBox {
       width: 100%;
       height: 100%;
@@ -72,9 +70,6 @@
       z-index: 4;
       background-color: black;
 
-
-
-
       .A6video {
         width: 100%;
         height: 100%;
@@ -85,14 +80,7 @@
           height: 100%;
         }
       }
-
-
-
-
-
-
     }
-
   }
 }
 
@@ -119,4 +107,4 @@
       }
     }
   }
-}
+}

src/pages/A6ybwx/index.tsx

@@ -79,7 +79,7 @@ function A6ybwx() {
         domDelOwnFu('.videoBox')
       }, 100)
       // 切换场景
-      cutUnityFu('RoomScene', () => {})
+      cutUnityFu('RoomScene', () => { })
     }
   }, [isEnter])
 
@@ -137,7 +137,7 @@ function A6ybwx() {
       {gotoTab === 3 && <SangzangHome setGotoTab={setGotoTab} />}
 
       {/* 进度条 */}
-      <Zloding isShow={isEnter&&lodingScene} bacNum={2} />
+      <Zloding isShow={isEnter && lodingScene} bacNum={2} />
     </div>
   )
 }