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) => {
{item.weight_density}
- 染色;67.19%棉 28%涤纶 染色;67.19%棉 28%涤纶
+ {item.component}
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) => {
{item.product_color_count}色
- {item.is_favorite && }
- {formatRemoveHashTag(item.code)}{item.name}
+ {formatHashTag(item.code, '')}{item.name}
{item.is_favorite && }
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 (
@@ -206,7 +215,7 @@ export default () => {
-
+
{materialList.list?.map((item) => {
return (