shaogen1995 пре 2 година
родитељ
комит
ca0ce93db5

+ 16 - 10
src/pages/A3Goods/GoodsInfo/index.module.scss

@@ -103,45 +103,51 @@
 
         .A3IRtit {
           display: flex;
+          justify-content: center;
 
           &>img {
-            width: 180px;
+            width: 140px;
+            height: 44px;
             position: relative;
-            top: -24px;
+            top: -18px;
           }
 
           &>div {
             color: #FBF1AD;
-            font-size: 26px;
+            font-size: 22px;
             font-weight: 700;
-            margin: 0 20px;
-            width: calc(100% - 400px);
+            margin: 0 10px;
+            max-width: calc(100% - 300px);
             text-align: center;
             letter-spacing: 4px;
+            margin-bottom: 15px;
           }
         }
 
         .A3IRtit2 {
           color: #FBF1AD;
-          font-size: 22px;
+          font-size: 18px;
           text-align: center;
           letter-spacing: 4px;
           margin-bottom: 40px;
         }
 
         .A3IRtitRow {
-          padding: 0 0 0 220px;
+          padding: 0 0 0 200px;
           position: relative;
           margin-top: 30px;
           font-size: 18px;
           color: #fff;
           letter-spacing: 2px;
 
+          &>span {
+            font-weight: 700;
+          }
+
           .A3IRtitRowYuan {
             position: absolute;
-            left: 190px;
-            top: 50%;
-            transform: translateY(-50%);
+            left: 165px;
+            top: 5px;
             width: 14px;
             height: 14px;
             border-radius: 50%;

+ 24 - 7
src/pages/A3Goods/GoodsInfo/index.tsx

@@ -138,12 +138,23 @@ function GoodsInfo({ info, colseFu, type }: Props) {
           </div>
           <div className="A3IRtit2">存放于{info.type1}</div>
 
+          {info.name2 ? (
+            <div className="A3IRtitRow">
+              <div className="A3IRtitRowYuan">
+                <div></div>
+              </div>
+              <span>名称:</span>
+              {info.name2}
+            </div>
+          ) : null}
+
           {info.num ? (
             <div className="A3IRtitRow">
               <div className="A3IRtitRowYuan">
                 <div></div>
               </div>
-              编号:{info.num}
+              <span>编号:</span>
+              {info.num}
             </div>
           ) : null}
 
@@ -152,7 +163,8 @@ function GoodsInfo({ info, colseFu, type }: Props) {
               <div className="A3IRtitRowYuan">
                 <div></div>
               </div>
-              类别:{info.type2}
+              <span>类别:</span>
+              {info.type2}
             </div>
           ) : null}
 
@@ -161,7 +173,8 @@ function GoodsInfo({ info, colseFu, type }: Props) {
               <div className="A3IRtitRowYuan">
                 <div></div>
               </div>
-              年代:{info.age}
+              <span>年代:</span>
+              {info.age}
             </div>
           ) : null}
           {info.grain ? (
@@ -169,7 +182,8 @@ function GoodsInfo({ info, colseFu, type }: Props) {
               <div className="A3IRtitRowYuan">
                 <div></div>
               </div>
-              质地:{info.grain}
+              <span>质地:</span>
+              {info.grain}
             </div>
           ) : null}
           {info.size ? (
@@ -177,7 +191,8 @@ function GoodsInfo({ info, colseFu, type }: Props) {
               <div className="A3IRtitRowYuan">
                 <div></div>
               </div>
-              尺寸:{info.size}
+              <span>尺寸:</span>
+              {info.size}
             </div>
           ) : null}
           {info.level ? (
@@ -185,7 +200,8 @@ function GoodsInfo({ info, colseFu, type }: Props) {
               <div className="A3IRtitRowYuan">
                 <div></div>
               </div>
-              级别:{info.level}
+              <span>级别:</span>
+              {info.level}
             </div>
           ) : null}
           {info.state ? (
@@ -193,7 +209,8 @@ function GoodsInfo({ info, colseFu, type }: Props) {
               <div className="A3IRtitRowYuan">
                 <div></div>
               </div>
-              状态:{info.state}
+              <span>状态:</span>
+              {info.state}
             </div>
           ) : null}
         </div>

+ 15 - 16
src/pages/A3GoodsM/GoodsInfoM/index.module.scss

@@ -32,37 +32,33 @@
 
     .A3IRtit {
       display: flex;
+      justify-content: center;
       position: relative;
 
       &>img {
-        width: 100px;
-        position: absolute;
-        top: -10px;
-        left: 0;
-      }
-
-      .A3IRtitimg {
-        left: auto;
-        right: 0px;
+        width: 80px;
+        height: 30px;
+        position: relative;
+        top: -12px;
       }
 
       &>div {
         color: #FBF1AD;
-        font-size: 20px;
+        font-size: 18px;
         font-weight: 700;
-        width: 100%;
         text-align: center;
         letter-spacing: 2px;
-        padding: 0 110px;
+        padding: 0 10px;
+        max-width: calc(100% - 160px);
       }
     }
 
     .A3IRtit2 {
       color: #FBF1AD;
-      font-size: 18px;
+      font-size: 16px;
       text-align: center;
       letter-spacing: 2px;
-      margin-top: 5px;
+      margin-top: 8px;
       margin-bottom: 20px;
     }
 
@@ -147,11 +143,14 @@
       color: var(--themeColor);
       letter-spacing: 2px;
 
+      &>span {
+        font-weight: 700;
+      }
+
       .A3IRtitRowYuan {
         position: absolute;
         left: 30px;
-        top: 50%;
-        transform: translateY(-50%);
+        top: 3px;
         width: 14px;
         height: 14px;
         border-radius: 50%;

+ 25 - 8
src/pages/A3GoodsM/GoodsInfoM/index.tsx

@@ -75,7 +75,7 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
           <img src={name1Img} alt="" />
           <div> {info.name}</div>
 
-          <img className="A3IRtitimg" src={name2Img} alt="" />
+          <img src={name2Img} alt="" />
         </div>
         <div className="A3IRtit2">存放于{info.type1}</div>
 
@@ -141,12 +141,23 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
         </div>
 
         {/* 下面简介 */}
+        {info.name2 ? (
+          <div className="A3IRtitRow">
+            <div className="A3IRtitRowYuan">
+              <div></div>
+            </div>
+            <span>名称:</span>
+            {info.name2}
+          </div>
+        ) : null}
+
         {info.num ? (
           <div className="A3IRtitRow">
             <div className="A3IRtitRowYuan">
               <div></div>
             </div>
-            编号:{info.num}
+            <span>编号:</span>
+            {info.num}
           </div>
         ) : null}
 
@@ -155,7 +166,8 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
             <div className="A3IRtitRowYuan">
               <div></div>
             </div>
-            类别:{info.type2}
+            <span>类别:</span>
+            {info.type2}
           </div>
         ) : null}
 
@@ -164,7 +176,8 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
             <div className="A3IRtitRowYuan">
               <div></div>
             </div>
-            年代:{info.age}
+            <span>年代:</span>
+            {info.age}
           </div>
         ) : null}
         {info.grain ? (
@@ -172,7 +185,8 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
             <div className="A3IRtitRowYuan">
               <div></div>
             </div>
-            质地:{info.grain}
+            <span>质地:</span>
+            {info.grain}
           </div>
         ) : null}
         {info.size ? (
@@ -180,7 +194,8 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
             <div className="A3IRtitRowYuan">
               <div></div>
             </div>
-            尺寸:{info.size}
+            <span>尺寸:</span>
+            {info.size}
           </div>
         ) : null}
         {info.level ? (
@@ -188,7 +203,8 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
             <div className="A3IRtitRowYuan">
               <div></div>
             </div>
-            级别:{info.level}
+            <span>级别:</span>
+            {info.level}
           </div>
         ) : null}
         {info.state ? (
@@ -196,7 +212,8 @@ function GoodsInfoM({ info, colseFu, type }: Props) {
             <div className="A3IRtitRowYuan">
               <div></div>
             </div>
-            状态:{info.state}
+            <span>状态:</span>
+            {info.state}
           </div>
         ) : null}
       </div>

+ 1 - 0
src/types/api/layot.d.ts

@@ -7,6 +7,7 @@ export type LookDomType = {
 export type Goods = {
   id: number;
   name: string;
+  name2:string
   type1: string;
   type2: string;
   num: string;