From 97a5f22c2bcfb1ff5482915007c8617119e10aa3 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Thu, 2 Mar 2023 17:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001426):=20=E3=80=90?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=95=86=E5=9F=8E=E3=80=91-=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD{=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD}=EF=BC=9A?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【电子商城】&#45;功能{标签功能}：标签缺失】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001426
---
 src/common/constant.ts                              |  4 ++--
 src/components/product/index.module.scss            |  1 +
 src/components/product/index.tsx                    |  2 +-
 src/pages/index/components/guessULikeList/index.tsx |  3 +--
 src/pages/searchList/searchList.tsx                 | 13 +++++++++++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index 6223306..5d8465b 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -1,11 +1,11 @@
-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`
 // export const BASE_URL = `http://192.168.0.89:40001/lymarket`
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境
-// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
+export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
diff --git a/src/components/product/index.module.scss b/src/components/product/index.module.scss
index a68a105..99d94e0 100644
--- a/src/components/product/index.module.scss
+++ b/src/components/product/index.module.scss
@@ -54,6 +54,7 @@
       font-size: $font_size;
       color: #707070;
       @include common_ellipsis;
+      font-weight: 400;
       text {
         color: $color_font_one;
         font-weight: 500;
diff --git a/src/components/product/index.tsx b/src/components/product/index.tsx
index 53ed226..1324682 100644
--- a/src/components/product/index.tsx
+++ b/src/components/product/index.tsx
@@ -40,7 +40,7 @@ const Product = ({ desStatus = true, productList = [] }: Params) => {
                 <Tag customClassName={styles.tag_g} type="primary" size="small" circle>{item.weight_density}</Tag>
               </View>
               <View className={styles.des}>
-                染色；67.19%棉 28%涤纶 染色；67.19%棉 28%涤纶
+                {item.component}
               </View>
               <View className={styles.bottom}>
                 <View className={styles.header_con}>
diff --git a/src/pages/index/components/guessULikeList/index.tsx b/src/pages/index/components/guessULikeList/index.tsx
index 9c33807..8066ee7 100644
--- a/src/pages/index/components/guessULikeList/index.tsx
+++ b/src/pages/index/components/guessULikeList/index.tsx
@@ -27,12 +27,11 @@ const GuessULikeList = (props: PropsType) => {
             <View className={styles.item_img}>
               <LabAndImg value={labAndImgObj(item)} />
               <View className={styles.num}>{item.product_color_count}色</View>
-              {item.is_favorite && <IconFont customClassName={styles.collection_icon} name="icon-shoucang1" size={40} />}
             </View>
             <View className={styles.item_con}>
               <View className={styles.title}>
                 <View className={styles.title_text}>
-                  <Text className={styles.title_text_code}>{formatRemoveHashTag(item.code)}</Text>{item.name}
+                  <Text className={styles.title_text_code}>{formatHashTag(item.code, '')}</Text>{item.name}
                 </View>
                 <View className={styles.favorite}>
                   {item.is_favorite && <IconFont customClassName={styles.collection_icon} name="icon-shoucang1" size={40} />}
diff --git a/src/pages/searchList/searchList.tsx b/src/pages/searchList/searchList.tsx
index 8e7bbbf..c5a846c 100644
--- a/src/pages/searchList/searchList.tsx
+++ b/src/pages/searchList/searchList.tsx
@@ -73,7 +73,7 @@ export default () => {
     if (materialList.list.length < materialList.total) {
       pageNum.current.page++
       const size = pageNum.current.size * pageNum.current.page
-      setSearchField({ ...searchField, size })
+      setSearchField(prev => ({ ...prev, size }))
     }
   }
 
@@ -175,6 +175,15 @@ export default () => {
     }))
   }
 
+  // 列表下拉刷新
+  const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
+  const getRefresherRefresh = async() => {
+    pageNum.current.page = 1
+    pageNum.current.size = 10
+    setRefresherTriggeredStatus(true)
+    setSearchField(val => ({ ...val, size: 10 }))
+  }
+
   return (
     <View className={styles.main}>
       <View className={styles.search}>
@@ -206,7 +215,7 @@ export default () => {
       </View>
       <View className={styles.list}>
         <View className={styles.scroll}>
-          <InfiniteScroll safeAreaInsetBottom={false} selfonScrollToLower={getScrolltolower} statusMore={statusMore}>
+          <InfiniteScroll refresherEnabled selfOnRefresherRefresh={getRefresherRefresh} refresherTriggered={refresherTriggeredStatus} safeAreaInsetBottom={false} selfonScrollToLower={getScrolltolower} statusMore={statusMore}>
             <View className={styles.product_list}>
               {materialList.list?.map((item) => {
                 return (