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

src/pages/A9knowlege/components/Panel2/index.module.scss

@@ -29,14 +29,19 @@
   margin-bottom: 15px;
   // white-space: pre-line;
 
-  img {
-    display: block;
-    margin: 0 auto;
-    max-height: 200px;
-  }
   p {
     padding-bottom: 5px;
   }
+  :global {
+    img {
+      position: relative;
+      top: -2px;
+      display: inline-block;
+      margin: 0 2px;
+      height: 13px;
+      object-fit: contain;
+    }
+  }
 }
 
 .panelImg {

src/pages/A9knowlege/components/Panel2/index.tsx

@@ -9,11 +9,13 @@ type Props = {
   onClose?: () => void
 }
 
+const normalizeContent = (content: string) => content.replace(/<\/p>\s*<div\s+class=(?:"|\\")media-wrap image-wrap(?:"|\\")(?:\s*[^>]*)>([\s\S]*?)<\/div>\s*<p(?:\s+[^>]*)?>/gi, '$1')
+
 function Panel({ detail, onClose }: Props) {
   const { myLangue } = useSelector((state: RootState) => state.A0Layout)
   const isEn = myLangue === 'EN'
   const title = detail?.label || ''
-  const content = detail?.content || ''
+  const content = normalizeContent(detail?.content || '')
   const imgs = detail?.imgs || []
 
   return (
@@ -21,12 +23,7 @@ function Panel({ detail, onClose }: Props) {
       <p className={styles.panelLabel}>{title}</p>
 
       <div className={styles.panelWrap}>
-        {content && (
-          <div
-            className={classNames([styles.panelContent, { indent: detail?.needIndent }])}
-            dangerouslySetInnerHTML={{ __html: content }}
-          />
-        )}
+        {content && <div className={classNames([styles.panelContent, { indent: detail?.needIndent }])} dangerouslySetInnerHTML={{ __html: content }} />}
 
         {imgs.map((img: any, idx: number) => (
           <div key={idx} className={styles.panelImg}>