lanxin 3 settimane fa
parent
commit
f1783b6ccb

File diff suppressed because it is too large
+ 11 - 11
public/myData/myData.js


+ 3 - 3
src/pages/A6ybwx/A6_2_zxzgh/components/Bwzzq/index.module.scss

@@ -121,9 +121,6 @@
                 margin-top: 6px;
                 line-height: 22px;
               }
-              .from {
-                font-size: 13px;
-              }
             }
             .dotRight {
               width: 180px;
@@ -196,6 +193,9 @@
                 width: 0px;
                 height: 0px;
               }
+              & > span {
+                color: rgb(169, 135, 99);
+              }
             }
           }
         }

+ 2 - 2
src/pages/A6ybwx/A6_2_zxzgh/components/Bwzzq/index.tsx

@@ -40,7 +40,7 @@ function Bwzzq({ sItem, selectedTime, index, isShowLine, setIsShowLine }: yearTy
             <div className='lInfo'>
               <div className='item' key={index}>
                 <div className='lTitle songFont'>{sItem.items[0].title}</div>
-                <div className='lText'>{sItem.items[0].txt}</div>
+                <div className='lText' dangerouslySetInnerHTML={{ __html: sItem.items[0].txt }}></div>
               </div>
             </div>
             <div className='lImgBox'>
@@ -109,7 +109,7 @@ function Bwzzq({ sItem, selectedTime, index, isShowLine, setIsShowLine }: yearTy
           <div className='lInfo'>
             <div className='item' key={index}>
               <div className='lTitle songFont'>{sItem.items[1].title}</div>
-              <div className='lText'>{sItem.items[1].txt}</div>
+              <div className='lText' dangerouslySetInnerHTML={{ __html: sItem.items[1].txt }}></div>
             </div>
           </div>
         </div>

+ 2 - 2
src/pages/A6ybwx/A6_2_zxzgh/components/InfoCard/index.module.scss

@@ -54,7 +54,7 @@
       }
       .location {
         color: rgba(175, 135, 100, 1);
-        font-weight: 500;
+        font-weight: 600;
       }
       .Cardtext {
         text-align: justify;
@@ -69,7 +69,7 @@
         }
       }
       .from {
-        font-size: 13px;
+        font-size: 11px;
         color: rgba(151, 151, 151, 1);
       }
     }

+ 19 - 6
src/pages/A6ybwx/Sangzang/components/Policy/index.tsx

@@ -10,6 +10,7 @@ function Policy({ setShowTab }: { setShowTab: (tab: number) => void }) {
 
   const originRef = useRef<HTMLDivElement>(null)
   const itemRef = useRef<HTMLDivElement>(null)
+
   const { myData } = useSelector((state: RootState) => state.A0Layout)
   const [isOriStates, setIsOriStates] = useState(
     myData.policy[0].part2.map(item => (item.img ? true : false))
@@ -54,12 +55,25 @@ function Policy({ setShowTab }: { setShowTab: (tab: number) => void }) {
     return isOriStates[part2Index] ? part2Item?.img?.[0] || '' : part2Item?.img_ac?.[0] || ''
   }
 
+  useEffect(() => {
+    const part1TXT = document.querySelectorAll('#part1TXT')
+    part1TXT.forEach((v: any) => {
+      v.addEventListener('wheel', (e: any) => {
+        e.preventDefault()
+        e.stopPropagation()
+        console.log('part1TXT', v.scrollTop += e.deltaY)
+
+      })
+    })
+
+  }, [currentItem])
+
   return (
     <div className={styles.Policy}>
       <Zback clickFu={() => setShowTab(0)} />
 
-      <div className='containner' ref={originRef} onWheel={handleWheel}>
-        <div className='containner2'>
+      <div className='containner'  >
+        <div className='containner2' ref={originRef} onWheel={handleWheel}>
           {myData.policy.map((item, index) => (
             <div className='tabItem' ref={itemRef} key={item.title}>
               <div className={`history1`} onClick={() => handleItemClick(index + 1)}>
@@ -71,7 +85,7 @@ function Policy({ setShowTab }: { setShowTab: (tab: number) => void }) {
               <div className={`historyDetail ${currentItem !== 0 ? '' : 'historyDetail_hide'}`}>
                 <>
                   <div className='part1' style={partChangeCss(index)}>
-                    <div className='part1Box'>
+                    <div className='part1Box' id={`part1TXT`}>
                       <div className='part1txt'>{item.part1.txt} </div>
                       <div className='from'>
                         <div className='fromtxt'>{item.part1.from} </div>
@@ -132,9 +146,8 @@ function Policy({ setShowTab }: { setShowTab: (tab: number) => void }) {
               {item.title}
             </div>
             <img
-              src={require(`@/assets/img/A7base3_icon${
-                currentItem - 1 === index ? 'A' : '_n'
-              }.png`)}
+              src={require(`@/assets/img/A7base3_icon${currentItem - 1 === index ? 'A' : '_n'
+                }.png`)}
               alt=''
             />
           </div>