gx

public/myData/myData.js

@@ -793,7 +793,24 @@ const myDataTemp = {
       },
       {
         title: '论文研究',
-        txt: '周桂香、郭志成《试论程哲碑及其历史艺术价值》，《文物季刊》1997年9月<br/>张洁《东魏<赠代郡太守程哲碑>考》，《炎黄地理》2022年11月<br/>武夏、冯鹏锦《东魏赠代郡太守程哲碑研究》，《形象史学》2024年秋之卷<br/>徐晓娜、王炜《寄刊玄石：程哲碑研究的综述与思考》，《收藏家》2024年第11期<br/>'
+        txt2: [
+          {
+            name: '周桂香、郭志成',
+            text: '《试论程哲碑及其历史艺术价值》,《文物季刊》1997年9月'
+          },
+          {
+            name: '张洁',
+            text: '《东魏<赠代郡太守程哲碑>考》,《炎黄地理》2022年11月'
+          },
+          {
+            name: '武夏、冯鹏锦',
+            text: '《东魏赠代郡太守程哲碑研究》,《形象史学》2024年秋之卷'
+          },
+          {
+            name: '徐晓娜、王炜',
+            text: '《寄刊玄石：程哲碑研究的综述与思考》,《收藏家》2024年第11期'
+          }
+        ]
       }
     ]
   },

src/assets/styles/base.css

@@ -79,6 +79,7 @@ body #A7Back > img {
   object-fit: contain;
 }
 .ant-image-preview-img-wrapper .previewImage .Ori > .ant-image-preview-img {
+  padding: 20px;
   width: 100%;
   height: 100%;
   max-width: 100%;
@@ -262,7 +263,7 @@ textarea {
     height: 74%;
   }
   .ant-image-preview-img-wrapper .previewImage .Ori .ant-image-preview-img {
-    transform: rotate(90deg) !important;
+    transform: rotate(90deg) scale(0.65) !important;
   }
   .ant-image-preview-img-wrapper .previewImage .ImgFromTxt {
     position: absolute;

src/assets/styles/base.less

@@ -98,6 +98,7 @@ body #A7Back {
       width: 100%;
       object-fit: contain;
       & > .ant-image-preview-img {
+        padding: 20px;
         width: 100%;
         height: 100%;
         max-width: 100%;
@@ -334,7 +335,7 @@ textarea {
         width: 80%;
         height: 74%;
         .ant-image-preview-img {
-          transform: rotate(90deg) !important;
+          transform: rotate(90deg) scale(0.65) !important;
         }
       }
       .ImgFromTxt {

src/components/TouchContainer/index.tsx

@@ -73,7 +73,7 @@ function TouchContainer(props: TCProps) {
       // 计算当前两指之间的距离
       const distance = Math.hypot(touch2.clientX - touch.clientX, touch2.clientY - touch.clientY)
       // 根据距离调整缩放比例
-      const newZoom = Math.max(0.8, Math.min(4, distance / touchDataRef.current.initialDistance * touchDataRef.current.initialZoom))
+      const newZoom = Math.max(0.8, Math.min(10, distance / touchDataRef.current.initialDistance * touchDataRef.current.initialZoom))
       setZoom(newZoom)
       // setOffsetX(prev => {
       //   const deltaMidX = (touch2.clientX + touch.clientX) / 2 - touchDataRef.current.midX

src/pages/A5wenwu/index.module.scss

@@ -4,7 +4,6 @@
   position: relative;
 
   :global {
-
     .gesture {
       width: 140px;
       height: 70px;
@@ -19,12 +18,12 @@
       flex-direction: column;
 
       &.state1 {
-        &>img {
+        & > img {
           animation: gestureState1 2s linear;
         }
       }
 
-      &>img {
+      & > img {
         transform: translateX(0);
         width: 100%;
         object-fit: contain;
@@ -43,10 +42,11 @@
 
     .A5_tabBar {
       width: 50px;
-      height: 200px;
+      height: 86%;
       display: flex;
       align-items: center;
       flex-direction: column;
+      justify-content: end;
       position: absolute;
       z-index: 1;
       top: 46%;
@@ -59,12 +59,12 @@
         align-items: center;
         justify-content: center;
         flex-direction: column;
-        width: 60px;
-        height: 60px;
+        width: 45px;
+        height: 45px;
         margin: 7px 0;
         cursor: pointer;
 
-        &>img {
+        & > img {
           width: 100%;
           object-fit: contain;
         }
@@ -105,7 +105,7 @@
         height: 65px;
         margin: 8px 0;
 
-        &>img {
+        & > img {
           width: 100%;
           object-fit: contain;
         }
@@ -139,7 +139,6 @@
   justify-content: center;
 
   :global {
-
     .TContainner {
       position: relative;
       width: 100%;
@@ -149,7 +148,6 @@
       justify-content: center;
       padding: 7% 5% 2%;
     }
-
   }
 }
 
@@ -164,4 +162,4 @@
       width: auto;
     }
   }
-}
+}

src/pages/A5wenwu/index.tsx

@@ -43,7 +43,7 @@ function A5wenwu() {
   const handleTapian = () => {
     store.dispatch({
       type: 'layout/lookBigImg',
-      payload: { url: require('@/assets/sgImg/img_tapian.png'), show: true, fromTxt: '', zoom: isMobiileFu() ? 2 : 1 }
+      payload: { url: require('@/assets/sgImg/img_tapian.png'), show: true, fromTxt: '', zoom: isMobiileFu() ? 4 : 1 }
     })
     console.log('showTapian')
   }
@@ -51,11 +51,19 @@ function A5wenwu() {
   const handleLine = () => {
     store.dispatch({
       type: 'layout/lookBigImg',
-      payload: { url: require('@/assets/sgImg/img_xiantu.png'), show: true, fromTxt: '', zoom: isMobiileFu() ? 2 : 1 }
+      payload: { url: require('@/assets/sgImg/img_xiantu.png'), show: true, fromTxt: '', zoom: isMobiileFu() ? 4 : 1 }
     })
     console.log('showLine')
   }
 
+  const handleBeiwen = () => {
+    store.dispatch({
+      type: 'layout/lookBigImg',
+      payload: { url: require('@/assets/sgImg/img_beiwen.png'), show: true, fromTxt: '', zoom: isMobiileFu() ? 1.2 : 1 }
+    })
+    console.log('showBeiwen')
+  }
+
   const handleZoomIn = (value: number) => {
     callIframeFu('addModelScale', value)
   }
@@ -115,6 +123,14 @@ function A5wenwu() {
           />
           <div className='txt'>{myLangue === 'EN' ? 'graph' : '线图'}</div>
         </div>
+        {/* 碑文 */}
+        <div className={`tab`} onClick={handleBeiwen}>
+          <img
+            src={require(`@/assets/img/A5_beiwen${currentTab === 'tab3' ? 'Ac' : ''}.png`)}
+            alt=''
+          />
+          <div className='txt'>{myLangue === 'EN' ? 'graph' : '碑文'}</div>
+        </div>
       </div>
 
       {/* 右边 */}

src/pages/A7wjwj/conponents/Discover/index.module.scss

@@ -339,6 +339,10 @@
           line-height: 18px;
           position: relative;
 
+          a {
+            color: rgba(175, 135, 100, 1);
+          }
+
           .textBj {
             position: absolute;
             top: -0%;
@@ -349,6 +353,20 @@
             max-height: 99999px;
             object-fit: fill !important;
           }
+          .txt2_item {
+            width: 100%;
+            height: fit-content;
+            display: flex;
+            flex-direction: column;
+            gap: 5px;
+            color: rgba(93, 96, 96, 1);
+            margin-bottom: 20px;
+            .text_name {
+              font-weight: bold;
+            }
+            .text_txt {
+            }
+          }
         }
 
         .from {
@@ -368,6 +386,7 @@
       position: absolute;
       left: 2%;
       bottom: 2%;
+      z-index: 10;
       cursor: pointer;
 
       & > img {
@@ -508,6 +527,19 @@
       }
     }
 
+    .right {
+      .scroll {
+        .item {
+          .text {
+            width: 90%;
+            .text_txt {
+              width: 90%;
+            }
+          }
+        }
+      }
+    }
+
     .direct {
       left: 1%;
       bottom: 1%;

src/pages/A7wjwj/conponents/Discover/index.tsx

@@ -144,6 +144,14 @@ function Discover(props: { style?: React.CSSProperties }) {
                 {index === 0 ? (
                   <img className='textBj' src={require('@/assets/sgImg/thrrTxtBg.png')} alt='' />
                 ) : null}
+                {
+                  item.txt2?.map((item2, index2) => (
+                    <div className='txt2_item' key={index2}>
+                      <div className='text_name'>{item2.name}</div>
+                      <div className='text_txt'>{item2.text}</div>
+                    </div>
+                  ))
+                }
                 <div id={`txt${index}`} dangerouslySetInnerHTML={{ __html: item.txt }}></div>
               </div>
               <div className='from'>{item.from}</div>
@@ -152,7 +160,7 @@ function Discover(props: { style?: React.CSSProperties }) {
         </div>
       </div>
       <div className='direct' >
-        <img src={require('@/assets/img/A7_direct.png')} alt='' draggable={false} />
+        <img src={require(`@/assets/img/A7_direct${move ? '1' : ''}.png`)} alt='' draggable={false} />
       </div>
     </div>
   )

src/types/declaration.d.ts

@@ -47,7 +47,7 @@ type MyDataType = {
   discover: {
     txt1Items: { title: string }[]
     txt2Items: { title: string }[]
-    search: { title: string; txt: string; from: string }[]
+    search: { title: string; txt: string; from: string; txt2?: { name: string; text: string }[] }[]
   }
   // 属性之辨
   shuxing: {