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

public/BigScene/css/edit.css

@@ -6912,7 +6912,7 @@ ul.edit-bg {
   display: inline-block;
   height: 80px;
   margin: 4%;
-  background: rgba(255, 255, 255, 0.8);
+  background: rgba(255, 255, 255, 1);
   border: 3px solid rgba(83, 220, 255, .2);
   width: 92%;
   position: relative;

public/BigScene/css/lzb.css

@@ -944,7 +944,7 @@ ul.MenuOptions li.chosen {
     display: none;
     width: calc(84% - 36px);
     height: calc(100% - 180px);
-    border: 1px dotted rgba(255, 255, 255, 0.8);
+    border: 1px dotted rgba(255, 255, 255, 1);
     left: calc(8% + 18px);
     top: 86px;
 }

public/BigScene/css/main.css

@@ -53,7 +53,7 @@ figure {
   transform: translateX(-50%);
   text-align: center;
   font-size: 14px;
-  color: rgba(255, 255, 255, 0.8);
+  color: rgba(255, 255, 255, 1);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -66,8 +66,8 @@ figure {
 #myCompany span {
   font-size: 16px;
   padding: 5px 0;
-  color: rgba(255, 255, 255, 0.8);
-  border-bottom: 1px solid rgba(255, 255, 255, 0.8);
+  color: rgba(255, 255, 255, 1);
+  border-bottom: 1px solid rgba(255, 255, 255, 1);
 }
 
 .affix,
@@ -4982,7 +4982,7 @@ a.tag-link {
   width: 80%;
   height: 80%;
   border: 0;
-  background-color: rgba(255, 255, 255, 0.8);
+  background-color: rgba(255, 255, 255, 1);
 }
 
 #datLinks {

public/BigScene/hottemp/css/video.css

@@ -217,7 +217,7 @@
 .ui-icon-before:before {
   content: "\f04b";
   font-size: 50px;
-  color: rgba(255, 255, 255, 0.8);
+  color: rgba(255, 255, 255, 1);
   z-index: 2;
   font-size: 60px;
   position: relative;

public/BigScene/showa/index.html

@@ -349,7 +349,7 @@
                 </div>
             </div>
             <div id="myCompany"
-                style="width:100%;position:absolute;bottom:20px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                style="width:100%;position:absolute;bottom:20px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                 四维时代提供技术支持
             </div>
         </div>

public/BigScene/showa/index_cd.html

@@ -292,7 +292,7 @@
                         <div id="progressBar"></div>
                     </div>
                 </div>
-                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                     成都全搜索.成都文明网.四维时代
                 </div>
             </div>

public/BigScene/showa/index_cdmrg.html

@@ -339,7 +339,7 @@
                 </div>
             </div>
             <div id="myCompany"
-                style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                 四维时代提供技术支持
             </div>
         </div>

public/BigScene/showa/index_ceshi.html

@@ -284,7 +284,7 @@
                         <div id="progressBar"></div>
                     </div>
                 </div>
-                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                     四维时代提供技术支持
                 </div>
             </div>

public/BigScene/showa/index_hcy.html

@@ -319,7 +319,7 @@
                 </div>
             </div>
             <!-- <div id="myCompany"
-                style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                 四维时代提供技术支持
             </div> -->
         </div>

public/BigScene/showa/index_nologo.html

@@ -349,7 +349,7 @@
                 </div>
             </div>
             <div id="myCompany"
-                style="width:100%;position:absolute;bottom:20px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                style="width:100%;position:absolute;bottom:20px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                 <!-- 四维时代提供技术支持 -->
             </div>
         </div>

public/BigScene/showa/index_op.html

@@ -319,7 +319,7 @@
                 </div>
             </div>
             <div id="myCompany"
-                style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                 四维时代提供技术支持
             </div>
         </div>

public/BigScene/showa/index_sjbd.html

@@ -292,7 +292,7 @@
                         <div id="progressBar"></div>
                     </div>
                 </div>
-                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                     
                 </div>
             </div>

public/BigScene/showa/sceen.html

@@ -308,7 +308,7 @@
                         <div id="progressBar"></div>
                     </div>
                 </div>
-                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                <div id="myCompany" style="width:100%;position:absolute;bottom:5px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 1);">
                     
                 </div>
             </div>

src/pages/A0base/index.module.scss

@@ -46,9 +46,20 @@
         .btn {
           padding-top: 10px;
           font-size: 14px;
-          font-weight: 600;
           color: rgba(93, 96, 96, 1);
           cursor: pointer;
+          position: relative;
+
+          &::before {
+            content: '';
+            position: absolute;
+            left: 55px;
+            top: 8px;
+            width: 22px;
+            height: 22px;
+            background-image: url('../../assets/sgImg/icon_more.png');
+            background-size: 100% 100%;
+          }
         }
       }
 
@@ -146,14 +157,14 @@
       position: absolute;
       z-index: 1;
       top: 3%;
-      left: 5%;
+      left: 3%;
       cursor: pointer;
       color: rgba(255, 233, 182, 1);
     }
 
     /* 先导片 */
     .guideVideo {
-
+      
       display: none !important;
 
       width: 50px;
@@ -209,12 +220,15 @@
         font-size: 16px;
       }
     }
+
     .A0baseContainner .content {
       width: 68%;
+
       .title {
         width: 160px;
         font-size: 26px;
       }
+
       .text {
         color: black;
         font-size: 18px;
@@ -222,15 +236,24 @@
         letter-spacing: 1px;
         text-align: justify;
       }
+
       .btn {
         font-size: 18px;
         padding-top: 30px;
+
+        &::before {
+          left: 72px;
+          top: 30px;
+       
+        }
       }
     }
 
     .interact {
+      left: 0;
       width: 100px;
       height: 200px;
+
       .inter_content_active {
         .inter {
           margin: 4px 0;

src/pages/A0base/index.tsx

@@ -47,11 +47,13 @@ function A0base() {
 
       {/* 互动 */}
       <div className='interact'>
-        <div className={`inter_content ${isOpenInteract ? 'inter_content_active' : ''}`} onClick={() => setShowIsDev(true)}>
-          <div className='inter' > 碑影智绘</div>
-          <div className='inter'  > 展览图谱</div>
-          <div className='inter'> AI问答</div>
-        </div >
+        <div className={`inter_content ${isOpenInteract ? 'inter_content_active' : ''}`}>
+
+          <div className='inter'>碑影智绘</div>
+          <div className='inter'>展览图谱</div>
+          <div className='inter'>AI问答</div>
+        </div>
+
         <div className='icon' onClick={() => setIsOpenInteract(!isOpenInteract)}>
           <img src={require('@/assets/img/interaction.png')} alt='' />
         </div>

src/pages/A1home/index.module.scss

@@ -45,21 +45,38 @@
       height: 100%;
       z-index: 11;
       background-color: rgba(0, 0, 0, .6);
-      display: flex;
-      justify-content: center;
-      align-items: center;
+
 
       .AlodingT {
-        width: 80%;
-        height: 20px;
-        border: 1px solid #fff;
-        border-radius: 10px;
-        overflow: hidden;
+        position: absolute;
+        bottom: 10%;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 70%;
+        height: 8px;
+        border: 1px solid #6b6355;
+        background-color: #6b6355;
+        border-radius: 4px;
+
 
-        &>div {
+        .AlodingT1 {
           width: 0%;
           height: 100%;
-          background-color: #fff;
+          background-color: #ffe9b6;
+          border-radius: 4px;
+          overflow: hidden;
+        }
+
+        .AlodingT2 {
+          width: 30px;
+          height: 30px;
+          max-height: 999999px;
+          object-fit: contain !important;
+          position: absolute;
+          z-index: 10;
+          top: -30px;
+          left: 0;
+          transform: translateX(-15px);
         }
       }
     }

src/pages/A1home/index.tsx

@@ -57,12 +57,14 @@ function A1home() {
           window.location.replace('#/base')
         }, // 触发播放结束事件
         onSourceEstablished: () => {
-          setVideo2Flag(true)
+          setTimeout(() => {
+            setVideo2Flag(true)
+          }, 500)
         } //有足够的数据可以播放了
       }
       playerRef.current = F_Video('./myData/home.ts', params)
-      const dom = document.querySelector('.A1videoBox')!
-      dom.append(playerRef.current.domElement)
+      const dom = document.querySelector('.A1videoBox')
+      if (dom) dom.append(playerRef.current.domElement)
     }
   }, [baseFlag])
 
@@ -98,7 +100,8 @@ function A1home() {
       {baseFlag ? (
         <div className='Aloding'>
           <div className='AlodingT'>
-            <div style={{ width: `${loding}%` }}></div>
+            <div className='AlodingT1' style={{ width: `${loding}%` }}></div>
+            <img className='AlodingT2' style={{left: `${loding}%`}} src={require('@/assets/sgImg/icon_skip.png')} alt="" />
           </div>
         </div>
       ) : null}

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

@@ -39,7 +39,7 @@
 
       .content {
         width: calc(100% - 40px);
-        color: rgba(255, 255, 255, 0.8);
+        color: rgba(255, 255, 255, 1);
         font-size: 12px;
         font-weight: lighter;
       }

src/pages/A2yblm/components/ModalTxt/data.ts

@@ -0,0 +1,5 @@
+export const modalTxtTab = [
+  { key: 1, name: '造碑人与碑主', sonTxt: '壹' },
+  { key: 2, name: '程哲生平与家族世系', sonTxt: '贰' },
+  { key: 3, name: '颂文', sonTxt: '叄' }
+]

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

@@ -19,12 +19,13 @@
       gap: 10px;
 
       .topBar {
-        width: 100%;
+        padding-left: 20px;
+        width: 90%;
         height: 70px;
         display: flex;
         align-items: center;
         justify-content: space-around;
-        padding-right: 80px;
+        padding-right: 60px;
         position: relative;
         gap: 10px;
         margin-top: 10px;
@@ -72,13 +73,12 @@
           }
 
           .tabNub {
-            font-size: 10px;
-            line-height: 45px;
+            font-size: 18px;
             position: absolute;
-            top: 50%;
+            top: 34%;
             left: 50%;
-            transform: translate(-50%, -53%);
-            color: rgba(94, 52, 34, 1);
+            transform: translate(-55%, -50%);
+             color: rgba(255, 233, 182, 0.6);
           }
 
           .tabNubAc {
@@ -220,8 +220,8 @@
           letter-spacing: 2px;
           color: #504e40;
 
-          & > p {
-          }
+          // & > p {
+          // }
         }
       }
     }

src/pages/A2yblm/components/ModalTxt/index.tsx

@@ -5,15 +5,22 @@ import { isPc, myData } from '@/utils/http'
 import { Tooltip } from 'antd'
 import { callIframeFu, isMobiileFu } from '@/utils/history'
 import classNames from 'classnames'
+import { modalTxtTab } from './data'
 
 function ModalTxt({
   setIsShowTabBar,
-  setIsShowMzmTitle
+  setIsShowMzmTitle,
+  setBottomTxt
 }: {
   setIsShowTabBar: (isShowTabBar: boolean) => void
   setIsShowMzmTitle: (isShowMzmTitle: boolean) => void
+  setBottomTxt: (val: string) => void
 }) {
   const [selectedTab, setSelectedTab] = useState(0)
+  const selectedTabRef = useRef(0)
+  useEffect(() => {
+    selectedTabRef.current = selectedTab
+  }, [selectedTab])
 
   const [activeAId, setActiveAId] = useState<number | null>(null)
   const [showTooltip, setShowTooltip] = useState(-1)
@@ -94,13 +101,12 @@ function ModalTxt({
               <div className='title'>{word}</div>
               <div
                 className='close'
-                onClick={(e) => {
+                onClick={e => {
                   e.preventDefault()
                   e.stopPropagation()
                   setShowTooltip(-1)
                 }}
-
-                onTouchEnd={(e) => {
+                onTouchEnd={e => {
                   e.preventDefault()
                   e.stopPropagation()
                   setShowTooltip(-1)
@@ -109,7 +115,14 @@ function ModalTxt({
                 <img src={require('@/assets/img/close.png')} alt='' draggable='false' />
               </div>
             </div>
-            <div className='content' ref={contentRef} onTouchStart={(e) => handleTouchStart(e, content_touchStartX)} onTouchMove={handleTooltipTouchMove}>{define}</div>
+            <div
+              className='content'
+              ref={contentRef}
+              onTouchStart={e => handleTouchStart(e, content_touchStartX)}
+              onTouchMove={handleTooltipTouchMove}
+            >
+              {define}
+            </div>
           </div>
         }
         getPopupContainer={() => document.body.querySelector('#root') as HTMLElement}
@@ -198,63 +211,59 @@ function ModalTxt({
     callIframeFu('showInscription', 0)
   }
 
-  const handleTabClick = (tabIndex: number) => {
-    setSelectedTab(tabIndex)
-    callIframeFu('showInscription', tabIndex)
+  const handleTabClick = (tabIndex: number, txt: string) => {
+    setBottomTxt(txt)
+
+    let index = tabIndex
+    if (selectedTabRef.current === index) index = 0
+
+    setSelectedTab(index)
+    callIframeFu('showInscription', index === 0 ? -1 : index)
+
+    if (index === 0) setIsShowMzmTitle(false)
   }
 
   return (
     <div className={classNames(styles.modalTxt, isPc ? '' : styles.modalTxtMo)} id='modalTxt'>
       <div className='modalTxtContainner'>
         <div className='topBar'>
-          <div className='beie'>
+          <div className='beie' hidden={selectedTab !== 0}>
             <img src={require('@/assets/img/beie.png')} alt='' />
             <div className='txt' onClick={handleBeie}>
               碑额
             </div>
           </div>
-          <div className='tab ' onClick={() => handleTabClick(1)}>
-            <img
-              src={require(`@/assets/img/btn_ModalTxt_bg${selectedTab === 1 ? '_ac' : ''}.png`)}
-              alt=''
-            />
-            <div className={`tabNub ${selectedTab === 1 ? 'tabNubAc' : ''}`}></div>
-            <div
-              className='txt'
-              style={{ display: selectedTab === 1 || selectedTab === 0 ? 'block' : 'none' }}
-            >
-              造碑人与碑主
-            </div>
-          </div>
-          <div className='tab ' onClick={() => handleTabClick(2)}>
-            <img
-              src={require(`@/assets/img/btn_ModalTxt_bg${selectedTab === 2 ? '_ac' : ''}.png`)}
-              alt=''
-            />
-            <div className={`tabNub ${selectedTab === 2 ? 'tabNubAc' : ''}`}></div>
-            <div
-              className='txt'
-              style={{ display: selectedTab === 2 || selectedTab === 0 ? 'block' : 'none' }}
-            >
-              程哲生平与家族世系
-            </div>
-          </div>
-          <div className='tab ' onClick={() => handleTabClick(3)}>
-            <img
-              src={require(`@/assets/img/btn_ModalTxt_bg${selectedTab === 3 ? '_ac' : ''}.png`)}
-              alt=''
-            />
-            <div className={`tabNub ${selectedTab === 3 ? 'tabNubAc' : ''}`}></div>
-            <div
-              className='txt'
-              style={{ display: selectedTab === 3 || selectedTab === 0 ? 'block' : 'none' }}
-            >
-              颂文
+
+          {modalTxtTab.map(item => (
+            <div key={item.key} className='tab' onClick={() => handleTabClick(item.key, item.name)}>
+              <img
+                src={require(`@/assets/img/btn_ModalTxt_bg${
+                  selectedTab === item.key ? '_ac' : ''
+                }.png`)}
+                alt=''
+              />
+              <div className={`tabNub ${selectedTab === item.key ? 'tabNubAc' : ''}`}>
+                {item.sonTxt}
+              </div>
+              <div
+                className='txt'
+                style={{ opacity: selectedTab === item.key || selectedTab === 0 ? '1' : '0' }}
+              >
+                {item.name}
+              </div>
             </div>
-          </div>
+          ))}
+
+  
         </div>
 
-        <div className='intro' style={{ opacity: selectedTab !== 0 ? '1' : '0' }}>
+        <div
+          className='intro'
+          style={{
+            opacity: selectedTab !== 0 ? '1' : '0',
+            height: selectedTab !== 0 ? '15%' : '5%'
+          }}
+        >
           {selectedTab !== 0 && myData.readDetail[selectedTab - 1].intro}
         </div>
 

src/pages/A2yblm/index.module.scss

@@ -51,7 +51,7 @@
       left: 4%;
       cursor: pointer;
 
-      & > img {
+      &>img {
         height: 100%;
         object-fit: contain;
       }
@@ -67,14 +67,14 @@
       left: 4%;
       cursor: pointer;
 
-      & > img {
+      &>img {
         height: 100%;
         object-fit: contain;
       }
     }
 
     .extra {
-      width: 110px;
+      width: auto;
       height: 25px;
       position: absolute;
       z-index: 1;
@@ -92,7 +92,7 @@
         width: 20px;
         height: 100%;
 
-        & > img {
+        &>img {
           height: 100%;
           object-fit: contain;
         }
@@ -140,7 +140,7 @@
           height: 50px;
           cursor: pointer;
 
-          & > img {
+          &>img {
             height: 100%;
             object-fit: contain;
           }
@@ -155,7 +155,7 @@
         color: rgba(255, 255, 255, 1);
         letter-spacing: 4px;
 
-        & > p {
+        &>p {
           padding-bottom: 15px;
         }
       }
@@ -179,7 +179,7 @@
       z-index: 1;
       top: 50%;
       left: 50%;
-      transform: translate(120%, -50%);
+      transform: translate(140%, -44%);
     }
 
     .sider3 {
@@ -250,7 +250,7 @@
           align-items: center;
           justify-content: center;
 
-          & > img {
+          &>img {
             width: 100%;
             height: 100%;
             object-fit: contain;
@@ -265,7 +265,7 @@
         padding-right: 6px;
         overflow-y: auto;
 
-        & > div {
+        &>div {
           color: #595547;
           width: 100%;
           height: 100%;
@@ -324,7 +324,7 @@
       .content {
         height: 240px;
 
-        & > div {
+        &>div {
           width: 100%;
           height: 100%;
           line-height: 18px;
@@ -335,7 +335,7 @@
     }
 
     .extra {
-      width: 180px;
+      width: auto;
       height: 40px;
 
       .icon {
@@ -365,4 +365,4 @@
       }
     }
   }
-}
+}

src/pages/A2yblm/index.tsx

@@ -10,21 +10,34 @@ import classNames from 'classnames'
 
 function A2yblm() {
   const [currentTab, setCurrentTab] = useState('tab1')
+
+  useEffect(()=>{
+    
+    const urlAll =window.location.href
+
+    if(urlAll.includes('?m=')){
+      const urlTab =urlAll.split('?m=')[1]
+      setCurrentTab(urlTab)
+    }
+  },[])
+
   const [isShowTabBar, setIsShowTabBar] = useState(true)
   const [isShowMzmTitle, setIsShowMzmTitle] = useState(false)
+
+
   const [isOpenMzm, setIsOpenMzm] = useState(false)
   const [currentTagIndex, setCurrentTagIndex] = useState(1)
   const [isShowTag, setIsShowTag] = useState(false)
 
   const gotoQuanwenOrWenwu = useCallback(() => {
-    if (currentTab === 'tab3') window.location.replace('#/quanwen')
-    else window.location.replace('#/wenwu')
+    if (currentTab === 'tab3') window.location.replace(`#/quanwen?m=${currentTab}`)
+    else window.location.replace(`#/wenwu?m=${currentTab}`)
   }, [currentTab])
 
-  const gotoBack = () => {
-    if (currentTab === 'tab3') setCurrentTab('tab1')
-    else window.location.replace('#/base')
-  }
+  // const gotoBack = () => {
+  //   if (currentTab === 'tab3') setCurrentTab('tab1')
+  //   else window.location.replace('#/base')
+  // }
 
   // 退出图像赏析时调用showHotspot(-1) 退出碑文解读时调用showInscription(-1)
   useEffect(() => {
@@ -42,6 +55,11 @@ function A2yblm() {
     }
     callIframeFu('changePanel', currentTab === 'tab1' ? 1 : currentTab === 'tab2' ? 2 : 3)
   }, [currentTab])
+
+
+  // 底部文字
+  const [bottomTxt,setBottomTxt] =useState('')
+
   return (
     <div className={classNames(isPc ? '' : styles.A2yblmMo, styles.A2yblm)}>
       {/* 左侧边 */}
@@ -73,7 +91,7 @@ function A2yblm() {
       </div>
 
       {/* 返回，文物鉴赏，全文鉴赏 */}
-      <div className='back' onClick={gotoBack}>
+      <div className='back' onClick={()=> window.location.replace('#/base')}>
         <img src={require('@/assets/img/btn_back.png')} alt='' />
       </div>
       <div className='wenwu' onClick={gotoQuanwenOrWenwu}>
@@ -89,7 +107,7 @@ function A2yblm() {
           <div className='icon'>
             <img src={require('@/assets/img/tip.png')} alt='' />
           </div>
-          <div className='txt'>墓志铭体制之变例</div>
+          <div className='txt'>{bottomTxt}</div>
         </div>
       )}
 
@@ -137,7 +155,7 @@ function A2yblm() {
         </div>
       )}
       {currentTab === 'tab3' && (
-        <ModalTxt setIsShowTabBar={setIsShowTabBar} setIsShowMzmTitle={setIsShowMzmTitle} />
+        <ModalTxt setBottomTxt={(val)=>setBottomTxt(val)} setIsShowTabBar={setIsShowTabBar} setIsShowMzmTitle={setIsShowMzmTitle} />
       )}
 
       {/* menu界面 */}

src/pages/A3beie/index.tsx

@@ -7,12 +7,12 @@ import MenuSider from '@/components/MenuSider'
 
 function A3beie() {
   const handleBack = () => {
-    backPageFu('#/yblm')
+    backPageFu('#/yblm?m=tab3')
     callIframeFu('showInscription', -1)
   }
 
   const gotoQuanwen = () => {
-    window.location.replace('#/quanwen')
+    window.location.replace('#/quanwen?m=tab3')
     callIframeFu('showInscription', 10)
   }
 

src/pages/A4quanwen/index.tsx

@@ -1,12 +1,11 @@
-import React, { useState, useEffect, useCallback } from "react";
-import styles from "./index.module.scss";
-import { backPageFu, callIframeFu } from "@/utils/history";
-import { isPc, myData } from "@/utils/http";
+import React, { useState, useEffect, useCallback } from 'react'
+import styles from './index.module.scss'
+import { backPageFu, callIframeFu } from '@/utils/history'
+import { isPc, myData } from '@/utils/http'
 import classNames from 'classnames'
 
-
 function A4quanwen() {
-  const [isHighlight, setIsHighlight] = useState(true);
+  const [isHighlight, setIsHighlight] = useState(true)
   useEffect(() => {
     callIframeFu('showInscription', 10)
     callIframeFu('openHightlight', isHighlight ? 1 : 0)
@@ -19,36 +18,48 @@ function A4quanwen() {
   }, [isHighlight])
 
   const gotoBack = () => {
-    backPageFu('#/yblm')
-    callIframeFu('openHightlight', 1)
-  }
+    const urlAll = window.location.href
+    if (urlAll.includes('?m=')) {
+      const tabNum = urlAll.split('?m=')[1]
 
+      backPageFu(`#/yblm?m=${tabNum}`)
+    } else {
+      backPageFu('#/yblm')
+      callIframeFu('openHightlight', 1)
+    }
+  }
 
   return (
-    <div className={classNames(styles.A4quanwen,isPc?'':styles.A4quanwenMo)}>
+    <div className={classNames(styles.A4quanwen, isPc ? '' : styles.A4quanwenMo)}>
       <div className='back' onClick={() => gotoBack()}>
         <img src={require('@/assets/img/btn_back.png')} alt='' />
       </div>
 
       <div className={`highlight`} onClick={() => handleHighlight()}>
-        <img src={require(`@/assets/img/${isHighlight ? 'highlight_ac.png' : 'highlight.png'}`)} alt='' />
+        <img
+          src={require(`@/assets/img/${isHighlight ? 'highlight_ac.png' : 'highlight.png'}`)}
+          alt=''
+        />
       </div>
 
       {/* 文字内容 */}
-      <div className="txtContent">
+      <div className='txtContent'>
         {myData.allTxt.map((item, index) => (
-          <div className="item" key={index}>
-            <div className="left">
-              <div className="icon"><img src={require('@/assets/img/icon_dot1.png')} alt="" /></div>
-              <div className="line"></div>
+          <div className='item' key={index}>
+            <div className='left'>
+              <div className='icon'>
+                <img src={require('@/assets/img/icon_dot1.png')} alt='' />
+              </div>
+              <div className='line'></div>
             </div>
-            <div className="right">{item.title}</div>
-          </div>))}
+            <div className='right'>{item.title}</div>
+          </div>
+        ))}
       </div>
     </div>
   )
 }
 
-const MemoA4quanwen = React.memo(A4quanwen);
+const MemoA4quanwen = React.memo(A4quanwen)
 
-export default MemoA4quanwen;
+export default MemoA4quanwen

src/pages/A5wenwu/index.tsx

@@ -52,8 +52,15 @@ function A5wenwu() {
   }
 
   const gotoBack = () => {
-    backPageFu('#/yblm')
-    callIframeFu('hideSize', undefined)
+    const urlAll = window.location.href
+    if (urlAll.includes('?m=')) {
+      const tabNum =urlAll.split('?m=')[1]
+
+      backPageFu(`#/yblm?m=${tabNum}`)
+    } else {
+      backPageFu('#/yblm')
+      callIframeFu('hideSize', undefined)
+    }
   }
 
   window.hideGesture = () => {