fix: 1.修改网页小图标;2.渠道商城进货单商品id参数修改

src/layouts/BasicLayout.tsx

@@ -7,8 +7,9 @@ import ProLayout, {
   getPageTitle
 } from '@ant-design/pro-layout';
 import React, { useState, useEffect, useLayoutEffect } from 'react';
-import { Link, useIntl } from 'umi';
+import { Link, useIntl, Helmet } from 'umi';
 import RightContent from './components/RightContent';
+import { GlobalConfig } from '@/global/config';
 // import { ConnectState } from '@/models/connect';
 // import logo from '../assets/logo.svg';
 import logo from '../../mockStatic/logo.png'
@@ -87,7 +88,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   };
 
   const getMenuRouter = (routes: any, pathname: any) => {
-    let list = routes.filter((item: any) => pathname.indexOf(item.key) > -1)
+    const list = routes.filter((item: any) => pathname.indexOf(item.key) > -1)
     return list[0]
   }
 
@@ -151,40 +152,45 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
     : {}
 
   return (
-    <ProLayout
-      pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
-      // contentStyle={{minWidth: '1280px'}}
-      style={prolayoutStyle}
-      logo={logo}
-      formatMessage={formatMessage}
-      menuHeaderRender={(logoDom, titleDom) => (
-        <Link to="/">
-          {logoDom}
-          {titleDom}
-        </Link>
-      )}
-      collapsed={collapsed}
-      collapsedButtonRender={(flag) => (isHome ? null : flag ? <MenuUnfoldOutlined /> : <MenuFoldOutlined/>) }
-      onCollapse={handleMenuCollapse}
-      disableContentMargin={currentRouter?.noMargin !== undefined}
-      breadcrumbRender={(routers = []) => [
-
-      ]}
-      menuRender={() => <MenuSlider
-        currentSelectKey={selectedKeys}
-        openKeys={openKeys}
-        menuData={menuData}
-        pathname={location.pathname}
-        collapseState={collapsed}
-        changeOpenKeys={(keys: string[]) => setOpenKeys(keys)}
-      />}
-      footerRender={() => defaultFooterDom}
-      rightContentRender={() => <RightContent />}
-      {...props}
-      {...settings}
-    >
-      {children}
-    </ProLayout>
+    <>
+      {/* <Helmet>
+        <link rel="icon" type="image/x-icon" href={GlobalConfig.global.siteInfo.logo} />
+      </Helmet> */}
+      <ProLayout
+        pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
+        // contentStyle={{minWidth: '1280px'}}
+        style={prolayoutStyle}
+        logo={logo}
+        formatMessage={formatMessage}
+        menuHeaderRender={(logoDom, titleDom) => (
+          <Link to="/">
+            {logoDom}
+            {titleDom}
+          </Link>
+        )}
+        collapsed={collapsed}
+        collapsedButtonRender={(flag) => (isHome ? null : flag ? <MenuUnfoldOutlined /> : <MenuFoldOutlined/>) }
+        onCollapse={handleMenuCollapse}
+        disableContentMargin={currentRouter?.noMargin !== undefined}
+        breadcrumbRender={(routers = []) => [
+
+        ]}
+        menuRender={() => <MenuSlider
+          currentSelectKey={selectedKeys}
+          openKeys={openKeys}
+          menuData={menuData}
+          pathname={location.pathname}
+          collapseState={collapsed}
+          changeOpenKeys={(keys: string[]) => setOpenKeys(keys)}
+        />}
+        footerRender={() => defaultFooterDom}
+        rightContentRender={() => <RightContent />}
+        {...props}
+        {...settings}
+      >
+        {children}
+      </ProLayout>
+    </>
   );
 };
 

src/layouts/UserLayouts.tsx

 import React from 'react';
 import styles from './styles/UserLayouts.less'
+import { Helmet } from 'umi'
 import UserHeader from './components/UserHeader';
 import BaseFooter from './components/BaseFooter';
 import { GlobalConfig } from '@/global/config';
@@ -11,14 +12,19 @@ import { GlobalConfig } from '@/global/config';
 const UserLayouts: React.FC = (props) => {
   console.log(props)
   return (
-    <div className={styles.lingxiBusinessUserLayout}>
-      <UserHeader logo={GlobalConfig.global.siteInfo.logo} {...props} />
-      <div className={styles.lingxiBusinessUserBg}>
-        {props.children}
-        <BaseFooter />
+    <>
+      {/* <Helmet>
+        <link rel="icon" type="image/x-icon" href={GlobalConfig.global.siteInfo.logo} />
+      </Helmet> */}
+      <div className={styles.lingxiBusinessUserLayout}>
+        <UserHeader logo={GlobalConfig.global.siteInfo.logo} {...props} />
+        <div className={styles.lingxiBusinessUserBg}>
+          {props.children}
+          <BaseFooter />
+        </div>
       </div>
-    </div>
+    </>
   )
 }
 
-export default UserLayouts
+export default UserLayouts
\ No newline at end of file

src/pages/document.ejs

@@ -4,11 +4,11 @@
 <head>
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" /> -->
+  <link rel="icon" type="image/x-icon" href="/static/imgs/Fav.jpg" />
 </head>
 
 <body>
   <div id="root"></div>
 </body>
 
-</html>
+</html>
\ No newline at end of file

src/pages/lxMall/layouts/LXChannelLayout.tsx

@@ -92,6 +92,7 @@ const LXChannelLayout: React.FC<LXChannelLayoutPropsType> = (props) => {
         {
           shopInfo ? <title>{shopInfo.memberName}</title> : null
         }
+        {/* <link rel="icon" type="image/x-icon" href={shopInfo?.logo} /> */}
       </Helmet>
       <div className={styles.lxmall_page}>
         <TopBar langComponent={<SelectLang />} name={shopInfo?.memberName} type={LAYOUT_TYPE.channel} shopUrlParam={channelId} />

src/pages/lxMall/layouts/LXIChannelLayout.tsx

@@ -91,6 +91,7 @@ const LXIChannelLayout: React.FC<LXIChannelLayoutPropsType> = (props) => {
         {
           shopInfo ? <title>{shopInfo.memberName}</title> : null
         }
+        {/* <link rel="icon" type="image/x-icon" href={shopInfo?.logo} /> */}
       </Helmet>
       <div className={styles.lxmall_page}>
         <TopBar langComponent={<SelectLang />} name={shopInfo?.memberName} type={LAYOUT_TYPE.ichannel} shopUrlParam={channelId} />

src/pages/lxMall/layouts/LXMallLayout.tsx

@@ -73,6 +73,7 @@ const LXMallLayout: React.FC<LXMallLayoutPropsType> = (props) => {
         {
           mallInfo ? <title>{mallInfo.name}</title> : null
         }
+        {/* <link rel="icon" type="image/x-icon" href={mallInfo?.logoUrl} /> */}
       </Helmet>
       <div className={styles.lxmall_page}>
         <TopBar langComponent={<SelectLang />} name={mallInfo.name} type={LAYOUT_TYPE.mall} />

src/pages/lxMall/layouts/LXShopLayout.tsx

@@ -109,6 +109,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
         {
           mallInfo ? <title>{mallInfo.name}</title> : null
         }
+        {/* <link rel="icon" type="image/x-icon" href={mallInfo?.logoUrl} /> */}
       </Helmet>
       <div className={styles.lxmall_page}>
         <TopBar langComponent={<SelectLang />} name={mallInfo.name} type={LAYOUT_TYPE.shop} />

src/pages/lxMall/purchaseOrder/index.tsx

@@ -575,7 +575,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
 
       // 如果是渠道商品就添加渠道商品的id（非skuId）
       if(layoutType === LAYOUT_TYPE.channel || layoutType === LAYOUT_TYPE.ichannel) {
-        buyCommodityInfo.channelProductId = item.commodityUnitPrice.commodity.id
+        buyCommodityInfo.channelProductId = item.commodityUnitPrice.commodityUnitPriceAndPicId
       }
 
       if (item.commodityUnitPrice.commodity.isMemberPrice) {