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

be61f948 · GuanHua · df7b29ff · be61f948 · be61f948 · be61f948
Commit be61f948 authored Jan 19, 2021 by GuanHua
9 changed files
--- a/public/static/imgs/Fav.jpg
+++ b/public/static/imgs/Fav.jpg
--- a/src/layouts/BasicLayout.tsx
+++ b/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,6 +152,10 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
    : {}

  return (
+    <>
+      {/* <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'}}
@@ -185,6 +190,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
      >
        {children}
      </ProLayout>
+    </>
  );
 };


--- a/src/layouts/UserLayouts.tsx
+++ b/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,6 +12,10 @@ import { GlobalConfig } from '@/global/config';
 const UserLayouts: React.FC = (props) => {
  console.log(props)
  return (
+    <>
+      {/* <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}>
@@ -18,6 +23,7 @@ const UserLayouts: React.FC = (props) => {
          <BaseFooter />
        </div>
      </div>
+    </>
  )
 }


--- a/src/pages/document.ejs
+++ b/src/pages/document.ejs
@@ -4,7 +4,7 @@
 <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>

--- a/src/pages/lxMall/layouts/LXChannelLayout.tsx
+++ b/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} />

--- a/src/pages/lxMall/layouts/LXIChannelLayout.tsx
+++ b/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} />

--- a/src/pages/lxMall/layouts/LXMallLayout.tsx
+++ b/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} />

--- a/src/pages/lxMall/layouts/LXShopLayout.tsx
+++ b/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} />

--- a/src/pages/lxMall/purchaseOrder/index.tsx
+++ b/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) {