From 6eab3ca0b084b72fc0742e574fed3e681d69e4cf Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Tue, 14 Mar 2023 14:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=88=20style(=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=84):=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/index.module.scss |  6 ++--
 src/pages/details/index.tsx         | 54 ++++++++++++++---------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/pages/details/index.module.scss b/src/pages/details/index.module.scss
index d01c6e0..a79be42 100644
--- a/src/pages/details/index.module.scss
+++ b/src/pages/details/index.module.scss
@@ -184,8 +184,9 @@ page {
       margin-bottom: 25xp;
     }
     .scroll_box {
+      margin: 20px;
       padding-top: 30px;
-      width: 100%;
+      // width: 100%;
       border-radius: 16px;
       height: 450px;
       background-color: #fff;
@@ -266,7 +267,8 @@ page {
     .tag_box {
       padding-top: 30px;
       // padding-bottom: 30px;
-      width: 100%;
+      // width: 100%;
+      margin: 20px;
       border-radius: 16px;
       background-color: #fff;
       margin-top: 25px;
diff --git a/src/pages/details/index.tsx b/src/pages/details/index.tsx
index 5cc21a4..1f67ee6 100644
--- a/src/pages/details/index.tsx
+++ b/src/pages/details/index.tsx
@@ -408,33 +408,6 @@ const Details = (props: Params) => {
               </View>
             </View>
           </View>
-
-          {!!productInfo?.product_screw_id
-            && <View style={{ margin: '20rpx' }}>
-              <Recommend onClick={openProduct} data={recommendData} />
-            </View>}
-          <View className={styles.product_color}>
-            <View className={styles.title}>色号信息 ({productInfo?.product_color_list?.length})</View>
-            <View className={styles.list}>
-              {productInfo?.product_color_list?.map((item) => {
-                return (
-                  <View key={item.id} className={styles.item} onClick={() => handleClickProductColor(item)}>
-                    <View className={styles.item_color}>
-                      <LabAndImg
-                        value={{ lab: item.lab, rgb: item.rgb, texture_url: item.texture_url, title: item.code }}
-                        round
-                        name={formatRemoveHashTag(item.code)}
-                      />
-                    </View>
-                    <View className={styles.item_name}>{item.name}</View>
-                    <View className={styles.bulk_price}>{formatPriceDiv(item.bulk_price)}/Kg{
-                      (item!.last_bulk_price && item!.bulk_price !== item!.last_bulk_price) ? (item.bulk_price > item.last_bulk_price) ? <Text style={{ color: 'red', marginLeft: '10rpx' }}>↑</Text> : <Text style={{ color: 'green', marginLeft: '10rpx' }}>↓</Text> : null
-                    }</View>
-                  </View>
-                )
-              })}
-            </View>
-          </View>
           {
             videoList.length > 0 && <View className={styles.scroll_box}>
               <View className={styles.title}>性能测评</View>
@@ -491,6 +464,33 @@ const Details = (props: Params) => {
             </View>
           </View>
           }
+          {!!productInfo?.product_screw_id
+            && <View style={{ margin: '20rpx' }}>
+              <Recommend onClick={openProduct} data={recommendData} />
+            </View>}
+          <View className={styles.product_color}>
+            <View className={styles.title}>色号信息 ({productInfo?.product_color_list?.length})</View>
+            <View className={styles.list}>
+              {productInfo?.product_color_list?.map((item) => {
+                return (
+                  <View key={item.id} className={styles.item} onClick={() => handleClickProductColor(item)}>
+                    <View className={styles.item_color}>
+                      <LabAndImg
+                        value={{ lab: item.lab, rgb: item.rgb, texture_url: item.texture_url, title: item.code }}
+                        round
+                        name={formatRemoveHashTag(item.code)}
+                      />
+                    </View>
+                    <View className={styles.item_name}>{item.name}</View>
+                    <View className={styles.bulk_price}>{formatPriceDiv(item.bulk_price)}/Kg{
+                      (item!.last_bulk_price && item!.bulk_price !== item!.last_bulk_price) ? (item.bulk_price > item.last_bulk_price) ? <Text style={{ color: 'red', marginLeft: '10rpx' }}>↑</Text> : <Text style={{ color: 'green', marginLeft: '10rpx' }}>↓</Text> : null
+                    }</View>
+                  </View>
+                )
+              })}
+            </View>
+          </View>
+
           <View className={styles.product_detail}>
             <RichText nodes={html}></RichText>
           </View>