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

src/components/MenuSider/index.module.scss

@@ -84,6 +84,7 @@
           cursor: pointer;
           display: flex;
           flex-direction: column;
+          margin-bottom: 10px;
 
           .bottomLine {
             position: relative;
@@ -174,7 +175,8 @@
             }
 
             .txt {
-              font-size: 12px;
+              font-size: 14px;
+              font-weight: 700;
             }
           }
         }

src/pages/A0base/index.module.scss

@@ -208,7 +208,7 @@
       }
     }
     .A0baseContainner .content{
-      width: 64%;
+      width: 68%;
       .title{
         width: 160px;
         font-size: 26px;
@@ -216,7 +216,7 @@
       .text{
         color: black;
         font-size: 18px;
-        line-height: 22px;
+        line-height: 24px;
         letter-spacing: 2px;
         text-align: justify;
       }
@@ -225,6 +225,20 @@
         padding-top: 30px;
       }
     }
+
+
+
+    .interact {
+      width: 100px;
+      height: 200px;
+      .inter_content_active{
+      .inter{
+        margin: 4px 0;
+        height: 24px;
+        font-size: 16px;
+      }
+    }
+    }
   }
 
 }

src/pages/A2yblm/components/ModalTxt/index.module.scss

@@ -92,6 +92,8 @@
             font-weight: lighter;
             color: rgba(255, 255, 255, 1);
             width: 200%;
+            font-weight: 700;
+
           }
         }
 
@@ -110,7 +112,7 @@
         color: rgba(255, 255, 255, 1);
         text-align: justify;
         overflow-y: auto;
-        color: #777463;
+        color: black;
       }
 
       .detailTxt {
@@ -212,7 +214,7 @@
         }
 
         .text {
-          width: 300px;
+          width: 400px;
           line-height: 15px;
           font-size: 9px;
           text-align: justify;
@@ -220,9 +222,7 @@
           color: #504e40;
 
 
-          &>p {
-            
-          }
+          &>p {}
         }
       }
     }
@@ -256,7 +256,7 @@
           }
 
           .txt {
-            font-size: 16px;
+            font-size: 14px;
           }
         }
 
@@ -270,30 +270,33 @@
         }
 
         .text {
-          line-height: 18px;
-          font-size: 18px;
+          line-height: 20px;
+          font-size: 16px;
+          line-height: 24px;
         }
       }
 
 
-      .intro{
+      .intro {
         font-size: 16px;
         line-height: 18px;
-      
+
       }
 
 
 
-      .detailTxt{
-        .title{
-          font-size: 20px !important;
-        }
-        .txt{
+      .detailTxt {
+        .title {
           font-size: 18px !important;
-          line-height: 24px !important;
+        }
+
+        .txt {
+          font-size: 16px !important;
+          line-height: 22px !important;
           letter-spacing: 2px;
+
           a::after {
-            bottom:-2px !important;
+            bottom: -2px !important;
             height: 2px !important;
           }
         }

src/pages/A2yblm/index.module.scss

@@ -148,10 +148,12 @@
       }
 
       .content {
+        padding-top: 40px;
         font-size: 10px;
         line-height: 15px;
         font-weight: lighter;
         color: rgba(255, 255, 255, 1);
+        letter-spacing: 4px;
 
         &>p {
           padding-bottom: 15px;
@@ -258,19 +260,20 @@
 
       .content {
         margin-top: 15px;
-        width: 60%;
+        width: 70%;
         height: 110px;
         padding-right: 6px;
         overflow-y: auto;
-        
+
+
         &>div {
-          color:#595547;
+          color: #595547;
           width: 100%;
           height: 100%;
 
           font-size: 10px;
           line-height: 15px;
-          
+
           letter-spacing: 2px;
           text-align: justify;
         }
@@ -321,15 +324,14 @@
       }
 
       .content {
-        width: 80%;
         height: 240px;
 
         &>div {
           width: 100%;
           height: 100%;
-          line-height: 20px;
+          line-height: 18px;
 
-          font-size: 18px;
+          font-size: 16px;
 
         }
 
@@ -337,15 +339,37 @@
     }
 
 
-    .extra{
+    .extra {
       width: 180px;
       height: 40px;
-      .icon{
+
+      .icon {
         width: 30px;
       }
-      .txt{
+
+      .txt {
         font-size: 16px;
       }
     }
+
+    .mzm {
+      .top {
+        .title {
+          font-size: 18px;
+        }
+
+        .close {
+          width: 80px;
+          height: 80px;
+        }
+
+      }
+
+      .content {
+        font-size: 18px;
+        line-height: 24px;
+       
+      }
+    }
   }
 }

src/pages/A2yblm/index.tsx

@@ -159,9 +159,9 @@ function A2yblm() {
           </div>
         </div>
         <div className='content'>
-          <div>{currentTagIndex >= myData.detail_modal.top.length
+          <div dangerouslySetInnerHTML={{__html:currentTagIndex >= myData.detail_modal.top.length
             ? myData.detail_modal.bottom[currentTagIndex - myData.detail_modal.top.length].txt
-            : myData.detail_modal.top[currentTagIndex].txt}</div>
+            : myData.detail_modal.top[currentTagIndex].txt}}></div>
         </div>
       </div>
     </div>

src/pages/A3beie/index.module.scss

@@ -102,6 +102,16 @@
 // ----------------移动端
 .A3beieMo {
   :global {
+
+    .back {
+      width: 80px;
+      height: 40px;
+
+      img {
+        object-fit: fill !important;
+      }
+    }
+
     .container .content {
       .title {
         font-size: 24px;
@@ -110,7 +120,7 @@
 
       .text {
         font-size: 18px;
-        line-height: 22px;
+        line-height: 30px;
         letter-spacing: 2px;
       }
     }

src/pages/A4quanwen/index.module.scss

@@ -132,7 +132,7 @@
         }
       }
       .right{
-        font-size: 18px;
+        font-size: 16px;
         line-height: 22px;
       }
     }

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

@@ -4,6 +4,7 @@
   height: 100%;
   background: url('../../../assets/img/A6_ffhy_bg.png') no-repeat center center;
   background-size: 100% 100%;
+
   :global {
     .back {
       width: 60px;
@@ -12,11 +13,13 @@
       top: 3%;
       left: 4%;
       cursor: pointer;
-      & > img {
+
+      &>img {
         height: 100%;
         object-fit: contain;
       }
     }
+
     .ffhyTitle,
     .ffhybtn1,
     .ffhybtn2 {
@@ -24,22 +27,26 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      & > img {
+
+      &>img {
         height: 100%;
         object-fit: contain;
       }
     }
+
     .ffhyTitle {
       height: 80%;
       width: 100px;
       transform: translate(-255%, -47%);
     }
+
     .ffhybtn1 {
       cursor: pointer;
       height: 40px;
       width: 265px;
       transform: translate(29%, -167%);
     }
+
     .ffhybtn2 {
       cursor: pointer;
       height: 40px;
@@ -48,3 +55,31 @@
     }
   }
 }
+
+
+// ------------移动端
+.StatueArtMo {
+  :global {
+    .ffhyTitle{
+      height: 90%;
+      width: 120px;
+    }
+    .back {
+      width: 80px;
+      height: 40px;
+
+      img {
+        object-fit: fill !important;
+      }
+    }
+
+    .ffhybtn1,.ffhybtn2{
+      left: 40%;
+      width: 323px;
+      height: 50px;
+      &>img{
+        object-fit: cover !important;
+      }
+    }
+  }
+}

src/pages/A6ybwx/StatueArt/index.tsx

@@ -1,18 +1,27 @@
-import React from "react";
-import styles from "./index.module.scss";
+import React from 'react'
+import styles from './index.module.scss'
+import classNames from 'classnames'
+import { isPc } from '@/utils/http'
+
 function StatueArt({ setGotoTab }: { setGotoTab: (tab: number) => void }) {
   return (
-    <div className={styles.StatueArt}>
+    <div className={classNames(styles.StatueArt, isPc ? '' : styles.StatueArtMo)}>
       <div className='back' onClick={() => setGotoTab(0)}>
         <img src={require('@/assets/img/btn_back.png')} alt='' />
       </div>
-      <div className="ffhyTitle"><img src={require('@/assets/img/A6_ffhy_title.png')} draggable={false} alt="" /></div>
-      <div className="ffhybtn1" onClick={() => window.location.replace('#/zxys')}><img src={require('@/assets/img/A6_ffhy_btn1.png')} draggable={false} alt="" /></div>
-      <div className="ffhybtn2" onClick={() => window.location.replace('#/sinicize')}><img src={require('@/assets/img/A6_ffhy_btn2.png')} draggable={false} alt="" /></div>
+      <div className='ffhyTitle'>
+        <img src={require('@/assets/img/A6_ffhy_title.png')} draggable={false} alt='' />
+      </div>
+      <div className='ffhybtn1' onClick={() => window.location.replace('#/zxys')}>
+        <img src={require('@/assets/img/A6_ffhy_btn1.png')} draggable={false} alt='' />
+      </div>
+      <div className='ffhybtn2' onClick={() => window.location.replace('#/sinicize')}>
+        <img src={require('@/assets/img/A6_ffhy_btn2.png')} draggable={false} alt='' />
+      </div>
     </div>
   )
 }
 
-const MemoStatueArt = React.memo(StatueArt);
+const MemoStatueArt = React.memo(StatueArt)
 
-export default MemoStatueArt;
+export default MemoStatueArt

src/pages/A6ybwx/index.module.scss

@@ -3,11 +3,13 @@
   height: 100%;
   position: relative;
   z-index: 1;
+
   :global {
     .videoBox {
       width: 100%;
       height: 100%;
       position: relative;
+
       .back {
         width: 60px;
         height: 30px;
@@ -16,15 +18,18 @@
         top: 3%;
         left: 4%;
         cursor: pointer;
-        & > img {
+
+        &>img {
           height: 100%;
           object-fit: contain;
         }
       }
+
       .A6video {
         width: 100%;
         height: 100%;
       }
+
       .enterBtn {
         position: absolute;
         bottom: 0;
@@ -34,6 +39,7 @@
         height: 35px;
         cursor: pointer;
       }
+
       iframe {
         position: absolute;
         z-index: -1;
@@ -56,6 +62,7 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+
         .tab {
           width: 48%;
           height: 100%;
@@ -72,3 +79,30 @@
     }
   }
 }
+
+
+// --------移动端
+.A6ybwxMo {
+  :global {
+    .videoBox {
+      .back {
+        width: 80px;
+        height: 40px;
+
+        img {
+          object-fit: fill !important;
+        }
+      }
+      .tabBar {
+        width: 340px;
+        height: 45px;
+        .tab{
+          width: 46%;
+          font-size: 18px;
+          font-weight: 700;
+        }
+      }
+    }
+
+  }
+}

src/pages/A6ybwx/index.tsx

@@ -2,9 +2,11 @@ import React, { useState, useEffect, useRef } from "react";
 import styles from "./index.module.scss";
 import StatueArt from "./StatueArt";
 import Genealogy from "./Genealogy";
+import classNames from 'classnames'
+import { isPc } from "@/utils/http";
 
 function A6ybwx() {
-  const [isEnter, setIsEnter] = useState(false)
+  const [isEnter, setIsEnter] = useState(true)
   const [videoOk, setVideoOk] = useState(false)
   const [gotoTab, setGotoTab] = useState(0)
 
@@ -53,7 +55,7 @@ function A6ybwx() {
   }, [isEnter, videoOk])
 
   return (
-    <div className={styles.A6ybwx}>
+    <div className={classNames(styles.A6ybwx,isPc?'':styles.A6ybwxMo)}>
       {gotoTab === 0 && <div className="videoBox">
         <div className='back' onClick={() => window.location.replace('#/base')}>
           <img src={require('@/assets/img/btn_back.png')} alt='' />