Merge branch 'dev' into test

src/pages/lxMall/commodity/list.tsx

@@ -99,7 +99,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
           {
             commodityList.map((item, index) => (
               <div key={`commodity_list_item_column_${index}`} className={cx(styles.commodity_list_item, styles.column)}>
-                <a href={`/${layoutType === LAYOUT_TYPE.channel ? 'channelmall' : 'shop'}/commodity/detail?id=${item.id}&type=${item.priceType}&shopId=${btoa(JSON.stringify({ shopId: item.storeId, memberId: item.memberId }))}`} target="_blank">
+                <a href={getCommodityDetailLink(item)}  target="_blank">
                   <div className={styles.goods_img}>
                     {
                       item.mainPic ? <img src={item.mainPic} /> : <Skeleton.Image style={{ width: 120, height: 120 }} />

src/pages/lxMall/order/index.tsx

@@ -326,13 +326,13 @@ const Order: React.FC<OrderPropsType> = (props) => {
   const linkToUrl = (path: string) => {
     switch(layoutType) {
       case LAYOUT_TYPE.channel:
-        history.replace(`${GlobalConfig.channelRootRoute}${path}?channelId=${shopUrlParam}`)
+        history.replace(`${GlobalConfig.channelRootRoute}${path}&channelId=${shopUrlParam}`)
         break
       case LAYOUT_TYPE.ichannel:
-        history.replace(`${GlobalConfig.ichannelRootRoute}${path}?channelId=${shopUrlParam}`)
+        history.replace(`${GlobalConfig.ichannelRootRoute}${path}&channelId=${shopUrlParam}`)
         break
       default:
-        history.replace(`${path}?channelId=${shopUrlParam}`)
+        history.replace(`${path}`)
         break
     }
 

src/pages/lxMall/pay/components/credit/index.tsx

@@ -89,7 +89,6 @@ const CreditPayWay: React.FC<CreditPayWayPropsType> = (props) => {
         message.destroy()
         message.success("支付成功")
         linkToUrl(`/pay/result?orderId=${orderId}`, layoutType, shopUrlParam )
-        history.replace(`/pay/result?orderId=${orderId}`)
       } else {
         setConfirmLoading(false)
         message.destroy()

src/pages/lxMall/pay/utils/index.ts

@@ -5,13 +5,13 @@ import { LAYOUT_TYPE } from '@/constants'
 export const linkToUrl = (path: string, layoutType, shopUrlParam) => {
   switch (layoutType) {
     case LAYOUT_TYPE.channel:
-      history.replace(`${GlobalConfig.channelRootRoute}${path}?channelId=${shopUrlParam}`)
+      history.replace(`${GlobalConfig.channelRootRoute}${path}&channelId=${shopUrlParam}`)
       break
     case LAYOUT_TYPE.ichannel:
-      history.replace(`${GlobalConfig.ichannelRootRoute}${path}?channelId=${shopUrlParam}`)
+      history.replace(`${GlobalConfig.ichannelRootRoute}${path}&channelId=${shopUrlParam}`)
       break
     default:
-      history.replace(`${path}?channelId=${shopUrlParam}`)
+      history.replace(`${path}`)
       break
   }
 

src/pages/lxMall/purchaseOrder/index.tsx

@@ -710,7 +710,9 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
                         </div>
                         <div className={cx(styles.order_list_item_item, styles.goods_info)}>
                           <div className={styles.order_list_item_item_imgbox}>
-                            <ImageBox width={80} height={80} imgUrl={childItem.commodityUnitPrice.commodityPic[0]} direction="column" />
+                            {
+                              childItem.commodityUnitPrice.commodityPic && <ImageBox width={80} height={80} imgUrl={childItem.commodityUnitPrice.commodityPic[0]} direction="column" />
+                            }
                           </div>
                           <div>
                             <div className={styles.order_list_item_item_name}>