diff --git a/src/common/util.ts b/src/common/util.ts
index b7a7f0c..357e5d9 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -127,7 +127,7 @@ export const throttle = (fn, delay) => {
title = sortCode.shareShortDetail.title
imageUrl = sortCode.shareShortDetail.img
} else {
- path = `/pages/index/index?share=${sortCode.shareShortPage.code}`
+ path = (pageInfo.route === 'pages/user/index')?`/pages/user/index?share=${sortCode.shareShortPage.code}`:`/pages/index/index?share=${sortCode.shareShortPage.code}`
title = sortCode.shareShortPage.title
imageUrl = (pageInfo.route === 'pages/user/index')?formatImgUrl('/mall/share_img_02.png') : sortCode.shareShortPage.img
}
diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx
index daa3065..67c8f61 100644
--- a/src/components/shopCart/index.tsx
+++ b/src/components/shopCart/index.tsx
@@ -23,8 +23,9 @@ type param = {
show?: true|false,
onClose?: () => void,
intoStatus?: 'again'|'shop',
+ default_sale_mode?: number, //面料类型(0:大货, 1:剪版,2:散剪
}
-export default ({show = false, onClose, intoStatus='shop'}: param) => {
+export default ({show = false, onClose, intoStatus='shop', default_sale_mode}: param) => {
const selectList = [
{value:0, title:'大货', unit:'条', eunit:'kg', step:1, digits:0, minNum:1, maxNum:100000, defaultNum:1},
{value:1,title:'剪板', unit:'米', eunit:'m', step:1, digits:2, minNum:0.5, maxNum:9.99, defaultNum:1},
@@ -32,10 +33,13 @@ export default ({show = false, onClose, intoStatus='shop'}: param) => {
]
//切换面料类型
- const [selectIndex, setSelectIndex] = useState(0)
+ const [selectIndex, setSelectIndex] = useState(default_sale_mode||0)
const selectProduct = (index:number) => {
setSelectIndex(index)
}
+ useEffect(() => {
+ setSelectIndex(() => default_sale_mode!)
+ }, [default_sale_mode])
useEffect(() => {
resetList()
@@ -87,7 +91,7 @@ export default ({show = false, onClose, intoStatus='shop'}: param) => {
useEffect(() => {
if(!show) {
setList([])
- setSelectIndex(0)
+ setSelectIndex(default_sale_mode||0)
} else {
setLoading(true)
initStatus.current = true
diff --git a/src/pages/creditLine/index.scss b/src/pages/creditLine/index.scss
index 79772fc..21f24ab 100644
--- a/src/pages/creditLine/index.scss
+++ b/src/pages/creditLine/index.scss
@@ -75,6 +75,9 @@
margin-right: 10px;
color: #007AFF;
}
+ .credit-line-card-bottom-item-title .miconfont{
+ color: #ccc;
+ }
.credit-line-card-bottom-item:nth-child(2) .credit-line-card-bottom-item-title text{
font-size: 28px;
}
diff --git a/src/pages/creditLine/index.tsx b/src/pages/creditLine/index.tsx
index c56062e..52b1d67 100644
--- a/src/pages/creditLine/index.tsx
+++ b/src/pages/creditLine/index.tsx
@@ -146,6 +146,7 @@ export default ()=>{
已用额度
+
¥{Number(data?.credit_quota_used_line[0])?.toLocaleString()}.{data.credit_quota_used_line[1]}
diff --git a/src/pages/order/orderList/index.tsx b/src/pages/order/orderList/index.tsx
index 13c6369..1588961 100644
--- a/src/pages/order/orderList/index.tsx
+++ b/src/pages/order/orderList/index.tsx
@@ -209,7 +209,7 @@ export default () => {
- setShowCart(false)}/>
+ setShowCart(false)} default_sale_mode={callBackOrderInfo?.sale_mode}/>
diff --git a/src/pages/searchList/hightSearchList.module.scss b/src/pages/searchList/hightSearchList.module.scss
index 6b2d2cc..665ece2 100644
--- a/src/pages/searchList/hightSearchList.module.scss
+++ b/src/pages/searchList/hightSearchList.module.scss
@@ -140,11 +140,9 @@
font-size: $font_size_min;
color:$color_font_two;
padding: 10px 38px;
-
- }
- .list_num_shadow {
- box-shadow: 0px 3px 5px #ccc;
+ border-bottom: 1PX solid rgb(233, 233, 233);
}
+
.scroll{
height: 100%;
padding-top: 3px;
diff --git a/src/pages/searchList/searchList.module.scss b/src/pages/searchList/searchList.module.scss
index 85e68e7..c0b0c4c 100644
--- a/src/pages/searchList/searchList.module.scss
+++ b/src/pages/searchList/searchList.module.scss
@@ -123,11 +123,9 @@
font-size: $font_size_min;
color:$color_font_two;
padding: 10px 38px;
-
- }
- .list_num_shadow {
- box-shadow: 0px 3px 5px #ccc;
+ border-bottom: 1PX solid #e9e9e9;
}
+
.scroll{
height: 100%;
padding-top: 3px;
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index e465839..6fd935c 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -294,7 +294,7 @@ const Header = memo((props: any) => {
const Assets = (props: any) => {
return (
<>
- {(props.userInfo.order_access_status == 3) &&
+ {(props?.userInfo?.order_access_status == 3) &&
我的资产