商城测试版v8

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
       }

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

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;
   }

src/pages/creditLine/index.tsx

@@ -146,6 +146,7 @@ export default ()=>{
             <View className="credit-line-card-bottom-item-title">
               <Text style={style.bottomTitle} className="iconfont icon-tick-pressed"></Text>
               <View>已用额度</View>
+              <Text className="iconfont icon-a-moreback miconfont"></Text>
             </View>
             <View className="credit-line-card-bottom-item-price"><Text>¥</Text>{Number(data?.credit_quota_used_line[0])?.toLocaleString()}<Text>.{data.credit_quota_used_line[1]}</Text></View>
           </Navigator>

src/pages/order/orderList/index.tsx

@@ -209,7 +209,7 @@ export default () => {
           </InfiniteScroll>
       </View>
       <ApplyRefund show={refundShow} onClose={applyRefundClose} orderId={callBackOrderInfo?.id}/>
-      <ShopCart intoStatus="again" show={showCart}  onClose={() => setShowCart(false)}/>
+      <ShopCart intoStatus="again" show={showCart}  onClose={() => setShowCart(false)} default_sale_mode={callBackOrderInfo?.sale_mode}/>
       <ReturnRecord show={returnRecordShow} onClose={closeReturnRecord} id={callBackOrderInfo?.id}/>
       <Payment onSubmitSuccess={onPaySuccess} show={payMentShow} onClose={closePayShow} orderInfo={callBackOrderInfo}/>
     </View>

src/pages/searchList/hightSearchList.module.scss

@@ -140,11 +140,9 @@
             font-size: $font_size_min;
             color:$color_font_two;
             padding: 10px 38px;
-            
+            border-bottom: 1PX solid rgb(233, 233, 233);
-        }
-        .list_num_shadow {
-            box-shadow: 0px 3px 5px #ccc;
         }
+        
         .scroll{
             height: 100%;
             padding-top: 3px;

src/pages/searchList/searchList.module.scss

@@ -123,11 +123,9 @@
             font-size: $font_size_min;
             color:$color_font_two;
             padding: 10px 38px;
-            
+            border-bottom: 1PX solid #e9e9e9;    
-        }
-        .list_num_shadow {
-            box-shadow: 0px 3px 5px #ccc;
         }
+        
         .scroll{
             height: 100%;
             padding-top: 3px;

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) &&<View className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
+			{(props?.userInfo?.order_access_status == 3) &&<View className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
 				<View className={`${styles['assets-title']}`}>我的资产</View>
 				<View className={`${styles['assets-content']}`}>
 					<Navigator hoverClass="none" url="/pages/depositBeforehand/index">