From b2616abab018aa01b1a2bf39bd14681ca24a0d68 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Mon, 12 Dec 2022 17:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E8=A1=A5=E5=85=85=E9=9D=A2?=
 =?UTF-8?q?=E6=96=99=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AE=A2=E6=88=B7=E6=B5=AE?=
 =?UTF-8?q?=E7=AA=97):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.ts      |   4 +-
 src/pages/details/index.tsx | 212 ++++++++++++++++++------------------
 2 files changed, 109 insertions(+), 107 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index a012d5c..63b09c0 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -1,4 +1,4 @@
-// export const BASE_URL = CURRENT_BASE_URL
+export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
@@ -12,7 +12,7 @@
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
+// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
 // export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
 // export const BASE_URL = `http://192.168.1.42:50002/lymarket` //  杰
 
diff --git a/src/pages/details/index.tsx b/src/pages/details/index.tsx
index 1b8459b..1709664 100644
--- a/src/pages/details/index.tsx
+++ b/src/pages/details/index.tsx
@@ -180,130 +180,132 @@ const Details = (props: Params) => {
   const [showPopup, setshowPopup] = useState(false)
 
   return (
-    <View className={styles.main}>
-      <DesSwiper list={productInfo.texture_url ? productInfo.texture_url.toString().split(',') : []} />
-      <View className={styles.product_header}>
-        <View className={styles.title}>
-          {productInfo.code && <View className={styles.name}>{productName}</View>}
-          <View className={styles.des}>{productInfo.describe}</View>
+    <MoveBtn showList={['customer']}>
+      <View className={styles.main}>
+        <DesSwiper list={productInfo.texture_url ? productInfo.texture_url.toString().split(',') : []} />
+        <View className={styles.product_header}>
+          <View className={styles.title}>
+            {productInfo.code && <View className={styles.name}>{productName}</View>}
+            <View className={styles.des}>{productInfo.describe}</View>
+          </View>
+          <View className={styles.collect} onClick={openCollection}>
+            <View
+              className={classnames(
+                `iconfont ${collectStatus ? 'icon-shoucangchenggong' : 'icon-dianjishoucang'}`,
+                styles.miconfont,
+                collectStatus && styles.collected,
+              )}
+            ></View>
+            <View className={styles.text}>收藏</View>
+          </View>
+          <View className={styles.share}>
+            <View className={classnames('iconfont icon-fenxiangshangpin', styles.miconfont)}></View>
+            <View className={styles.text}>分享</View>
+            <Button open-type="share" className={styles.shareBtn}></Button>
+          </View>
         </View>
-        <View className={styles.collect} onClick={openCollection}>
-          <View
-            className={classnames(
-              `iconfont ${collectStatus ? 'icon-shoucangchenggong' : 'icon-dianjishoucang'}`,
-              styles.miconfont,
-              collectStatus && styles.collected,
-            )}
-          ></View>
-          <View className={styles.text}>收藏</View>
-        </View>
-        <View className={styles.share}>
-          <View className={classnames('iconfont icon-fenxiangshangpin', styles.miconfont)}></View>
-          <View className={styles.text}>分享</View>
-          <Button open-type="share" className={styles.shareBtn}></Button>
-        </View>
-      </View>
-      <View className={styles.des_data}>
-        <View className={styles.flexBox}>
-          <View className={styles.title}>商品参数</View>
-          {
-            productInfo.is_instruct && <View className={styles.flexRight} onClick={() => setshowPopup(true)}>{'特色百科 >'}</View>
-          }
-        </View>
-        <View className={styles.con}>
-          {/* <View className={styles.des_text}>
+        <View className={styles.des_data}>
+          <View className={styles.flexBox}>
+            <View className={styles.title}>商品参数</View>
+            {
+              productInfo.is_instruct && <View className={styles.flexRight} onClick={() => setshowPopup(true)}>{'特色百科 >'}</View>
+            }
+          </View>
+          <View className={styles.con}>
+            {/* <View className={styles.des_text}>
             编号：<Text>{productInfo.code}</Text>
           </View> */}
-          <View className={styles.des_text}>
+            <View className={styles.des_text}>
             幅宽：<Text>{productInfo.width}</Text>
-          </View>
-          <View className={styles.des_text}>
+            </View>
+            <View className={styles.des_text}>
             工艺：<Text>{productInfo.craft}</Text>
-          </View>
-          <View className={styles.des_text}>
+            </View>
+            <View className={styles.des_text}>
             空差：<Text>{productInfo.weight_error_discount / 1000}KG</Text>
-          </View>
-          <View className={styles.des_text}>
+            </View>
+            <View className={styles.des_text}>
             克重：<Text>{productInfo.weight_density}</Text>
-          </View>
-          <View className={styles.des_text}>
+            </View>
+            <View className={styles.des_text}>
             成分：<Text>{productInfo.component}</Text>
-          </View>
-          <View className={styles.des_text}>
+            </View>
+            <View className={styles.des_text}>
             纸筒：<Text>{productInfo.tube / 1000}KG</Text>
-          </View>
-          <View className={styles.des_text}>
+            </View>
+            <View className={styles.des_text}>
             出米数：<Text>{productInfo.length_to_weight_rate / 100}</Text>
-          </View>
-          <View className={styles.des_text}>
+            </View>
+            <View className={styles.des_text}>
             开单减空差：<Text>{productInfo.weight_error / 1000}KG</Text>
-          </View>
-        </View>
-      </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}>
-                <View className={styles.item_color}>
-                  <LabAndImg
-                    value={{ lab: item.lab, rgb: item.rgb, texture_url: item.texture_url, title: item.code }}
-                    showStatus
-                    round
-                    name={formatRemoveHashTag(item.code)}
-                  />
-                </View>
-                <View className={styles.item_name}>{item.name}</View>
-                <View className={styles.bulk_price}>{formatPriceDiv(item.bulk_price)}/Kg</View>
-              </View>
-            )
-          })}
-        </View>
-      </View>
-      <View className={styles.product_detail}>
-        <RichText nodes={html}></RichText>
-      </View>
-      <View className={styles.product_buy}>
-        <View className={styles.icon_btn}>
-          <View className={styles.customer_service}>
-            <View className={classnames('iconfont icon-kefu', styles.miconfont)}></View>
-            <View className={styles.text}>
-              询货/咨询
-              <Button
-                className={styles.wxBtn}
-                openType="contact"
-                sendMessageImg={shareImg}
-                sendMessageTitle={productName}
-                showMessageCard
-                sendMessagePath={`/pages/details/index?id=${productInfo.id}`}
-              ></Button>
             </View>
           </View>
-          <View className={styles.buy_cart} onClick={() => setShowCart(true)}>
-            <View className={classnames('iconfont icon-gouwuche', styles.miconfont)}></View>
-            <View className={styles.text}>购物车</View>
-            {commonData.shopCount > 0 && <View className={styles.product_num}>{commonData.shopCount > 99 ? '99+' : commonData.shopCount}</View>}
+        </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}>
+                  <View className={styles.item_color}>
+                    <LabAndImg
+                      value={{ lab: item.lab, rgb: item.rgb, texture_url: item.texture_url, title: item.code }}
+                      showStatus
+                      round
+                      name={formatRemoveHashTag(item.code)}
+                    />
+                  </View>
+                  <View className={styles.item_name}>{item.name}</View>
+                  <View className={styles.bulk_price}>{formatPriceDiv(item.bulk_price)}/Kg</View>
+                </View>
+              )
+            })}
           </View>
         </View>
+        <View className={styles.product_detail}>
+          <RichText nodes={html}></RichText>
+        </View>
+        <View className={styles.product_buy}>
+          <View className={styles.icon_btn}>
+            <View className={styles.customer_service}>
+              <View className={classnames('iconfont icon-kefu', styles.miconfont)}></View>
+              <View className={styles.text}>
+              询货/咨询
+                <Button
+                  className={styles.wxBtn}
+                  openType="contact"
+                  sendMessageImg={shareImg}
+                  sendMessageTitle={productName}
+                  showMessageCard
+                  sendMessagePath={`/pages/details/index?id=${productInfo.id}`}
+                ></Button>
+              </View>
+            </View>
+            <View className={styles.buy_cart} onClick={() => setShowCart(true)}>
+              <View className={classnames('iconfont icon-gouwuche', styles.miconfont)}></View>
+              <View className={styles.text}>购物车</View>
+              {commonData.shopCount > 0 && <View className={styles.product_num}>{commonData.shopCount > 99 ? '99+' : commonData.shopCount}</View>}
+            </View>
+          </View>
 
-        {(!userInfo.adminUserInfo?.is_authorize_phone && (
-          <View className={styles.buy_btn}>
-            <Button className={styles.wxBtn} open-type="getPhoneNumber" onGetPhoneNumber={e => placeOrder('to_phone', e)}></Button>
+          {(!userInfo.adminUserInfo?.is_authorize_phone && (
+            <View className={styles.buy_btn}>
+              <Button className={styles.wxBtn} open-type="getPhoneNumber" onGetPhoneNumber={e => placeOrder('to_phone', e)}></Button>
             选购商品
-          </View>
-        )) || (
-          <View className={styles.buy_btn} onClick={() => placeOrder('to_order')}>
+            </View>
+          )) || (
+            <View className={styles.buy_btn} onClick={() => placeOrder('to_order')}>
             选购商品
-          </View>
-        )}
+            </View>
+          )}
+        </View>
+        <OrderCount show={showOrderCount} is_first_login={productInfo.is_first_login} onClose={() => setShowOrderCount(false)} title={productName} productId={productInfo.id} />
+        <ShopCart show={showCart} onClose={() => setShowCart(false)} />
+        <AddCollection show={collectionShow} onAdd={onAdd} onClose={closeCollection} />
+        <FeaturePopup showPopup={showPopup} closePopup={() => setshowPopup(false)} productName={productName} productIds={Number(params?.id)}></FeaturePopup>
+        <View className="common_safe_area_y"></View>
       </View>
-      <OrderCount show={showOrderCount} is_first_login={productInfo.is_first_login} onClose={() => setShowOrderCount(false)} title={productName} productId={productInfo.id} />
-      <ShopCart show={showCart} onClose={() => setShowCart(false)} />
-      <AddCollection show={collectionShow} onAdd={onAdd} onClose={closeCollection} />
-      <FeaturePopup showPopup={showPopup} closePopup={() => setshowPopup(false)} productName={productName} productIds={Number(params?.id)}></FeaturePopup>
-      <View className="common_safe_area_y"></View>
-    </View>
+    </MoveBtn>
   )
 }