Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

.npmrc

-registry = "http://10.0.0.21:8081/repository/node-group/"
+registry = "http://10.0.0.19:7001"
 # registry = "https://registry.npmjs.org/"

src/app.tsx

@@ -97,6 +97,10 @@ const whiteLists = [
   '/noAuth'
 ]
 
+// 登录后的路由白名单
+const loginWhiteList = [
+  '/memberCenter/home'
+]
 /**
  * @description 配置函数，对已配置的路由做修改， 一般与render函数一起结合可根据接口动态配置路由， 直接修改routes即可
  * @author xjm
@@ -179,6 +183,7 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
   if (whiteLists.includes(location.pathname)) {
     return
   }
+
   const authInfo = getAuth()
   // 是否登录
   if (authInfo) {
@@ -197,18 +202,10 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
       return;
     }
 
-    // 去掉page_type参数校验, 无需根据query参数判断权限
-
-    // // 固定配置， 出现此参数说明需携带参数校验权限路由
-    // if (query.page_type && routeAuthUrls.find(authPath => {
-    //   const parseUrl = queryString.parseUrl(authPath)
-    //   const { query: selfQuery, url } = parseUrl
-    //   // 当页面出现参数page_type时， 需进入深度校验， 即对应的参数和路径匹配
-    //   return url === pathname && selfQuery.page_type === query.page_type
-    // })) {
-    //   // 深度匹配成功, 可正常访问
-    //   return;
-    // }
+    // 登录之后 能力中心的首页应该变为可以访问， 无论是否在权限中
+    if (loginWhiteList.includes(location.pathname)) {
+      return
+    }
     // 是否在路由权限列表里
     if (routeAuthUrls.includes(pathname)) {
       return;

src/pages/channel/channelTemplate/index.tsx

@@ -4,19 +4,19 @@ import { history } from 'umi'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import TemplateItem from '../components/templateItem'
 import { PublicApi } from '@/services/api'
-import { GetTemplateShopFindAllShelfShopTemplateResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindAllShelfChannelTemplateResponse } from '@/services/TemplateApi'
 import styles from './index.less'
 
 const ShopTemplate: React.FC = () => {
 
-  const [templateList, setTemplateList] = useState<GetTemplateShopFindAllShelfShopTemplateResponse>([])
+  const [templateList, setTemplateList] = useState<GetTemplateWebPageTemplateWebFindAllShelfChannelTemplateResponse>([])
 
   useEffect(() => {
     fetchAllShelfShopTemplate()
   }, [])
 
   const fetchAllShelfShopTemplate = () => {
-    PublicApi.getTemplateChannelFindAllShelfChannelTemplate().then(res => {
+    PublicApi.getTemplateWebPageTemplateWebFindAllShelfChannelTemplate().then(res => {
       if (res.code === 1000) {
         setTemplateList(res.data)
       } else if (res.code === 47001) {

src/pages/channel/templateDetail/index.tsx

@@ -6,7 +6,7 @@ import DetailPage from '@/components/DetailPage'
 import UseModal from '../components/useModal'
 import { PublicApi } from '@/services/api'
 import { Environment_Status } from '@/constants'
-import { GetTemplateShopFindShopTemplateDetailsResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindChannelTemplateDetailsResponse } from '@/services/TemplateApi'
 import default_img from '@/assets/imgs/template_default_img.png'
 import styles from './index.less'
 
@@ -21,7 +21,7 @@ interface TemplateDetailPropsType {
 
 const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   const { query: { type, id } } = props.location
-  const [detailInfo, setDetailInfo] = useState<GetTemplateShopFindShopTemplateDetailsResponse>()
+  const [detailInfo, setDetailInfo] = useState<GetTemplateWebPageTemplateWebFindChannelTemplateDetailsResponse>()
   const [useModalVisible, setUseModalVisible] = useState<boolean>(false)
   const [confirmLoading, setConfirmLoading] = useState(false)
 
@@ -30,8 +30,10 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   }, [])
 
   const fetchDetail = () => {
-    //@ts-ignore
-    PublicApi.getTemplateChannelFindChannelTemplateDetails({ id }).then(res => {
+    const param: any = {
+      id
+    }
+    PublicApi.getTemplateWebPageTemplateWebFindChannelTemplateDetails(param).then(res => {
       if (res.code === 1000) {
         setDetailInfo(res.data)
       }
@@ -43,8 +45,7 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
    */
   const handleConfirmUse = () => {
     setConfirmLoading(true)
-    //@ts-ignore
-    PublicApi.postTemplateChannelUseChannelTemplate({ id }).then(res => {
+    PublicApi.postTemplateWebPageTemplateWebUseChannelTemplate({ id }).then(res => {
       if (res.code === 1000) {
         setUseModalVisible(false)
         fetchDetail()

src/pages/commodity/goods/addGoods.tsx

@@ -224,7 +224,7 @@ const AddGoods = () => {
               options={customerCategoryTree}
               fieldNames={{ label: 'title', value: 'id', children: 'children' }}
               placeholder="请选择品类"
-              notFoundContent={<Spin size="small" />}
+              // notFoundContent={<Spin size="small" />}
             />
           </Form.Item>
           <Form.Item

src/pages/lxMall/order/index.tsx

@@ -486,7 +486,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
                   }} />
                 )
               }
-              <PayWay supplyMembersId={orderInfo.supplyMembersId} supplyMembersRoleId={orderInfo.supplyMembersRoleId}  selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} />
+              <PayWay supplyMembersId={orderInfo.supplyMembersId} deliveryType={orderInfo.logistics.deliveryType} supplyMembersRoleId={orderInfo.supplyMembersRoleId}  selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} />
               {/* <Delivery /> */}
               {
                 orderInfo.isInvoice && <Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} />

src/pages/lxMall/order/payway/index.tsx

@@ -14,15 +14,16 @@ interface PayWayProps {
   selectItem: any;
   supplyMembersId: number;
   supplyMembersRoleId: number;
+  deliveryType?: number;
 }
 
 const PayWay: React.FC<PayWayProps> = (props) => {
-  const { payWayList = [], onChange, selectItem = {}, supplyMembersId, supplyMembersRoleId } = props
+  const { payWayList = [], onChange, selectItem = {}, supplyMembersId, deliveryType = 1, supplyMembersRoleId } = props
   const [expand, setExpand] = useState<boolean>(false)
   const [creditInfo, setCreditInfo] = useState<GetPayCreditGetCreditResponse>()
 
   const handleSelectWay = (item) => {
-    if (item.payType === 3) {
+    if (item.payType === 3 || item.payType === 4) {
       if (!getCreditState(item)) {
         return
       }
@@ -41,11 +42,11 @@ const PayWay: React.FC<PayWayProps> = (props) => {
   }, [payWayList])
 
   const fetchCreditInfo = () => {
-    let param = {
+    const param: any = {
       parentMemberId: supplyMembersId,
       parentMemberRoleId: supplyMembersRoleId
     }
-    //@ts-ignore
+
     PublicApi.getPayCreditGetCredit(param).then(res => {
       if(res.code === 1000) {
         setCreditInfo(res.data)
@@ -62,6 +63,12 @@ const PayWay: React.FC<PayWayProps> = (props) => {
       } else if (creditInfo.isUsable === 0) {
         result = false
       }
+    } else if(info.payType === 4) {
+      if(deliveryType !==  1) {
+        result = false
+      } else {
+        result = true
+      }
     }
     return result
   }

src/pages/shop/shopTemplate/index.tsx

@@ -4,19 +4,19 @@ import { history } from 'umi'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import TemplateItem from '../components/templateItem'
 import { PublicApi } from '@/services/api'
-import { GetTemplateShopFindAllShelfShopTemplateResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindAllShelfShopTemplateResponse } from '@/services/TemplateApi'
 import styles from './index.less'
 
 const ShopTemplate: React.FC = () => {
 
-  const [templateList, setTemplateList] = useState<GetTemplateShopFindAllShelfShopTemplateResponse>([])
+  const [templateList, setTemplateList] = useState<GetTemplateWebPageTemplateWebFindAllShelfShopTemplateResponse>([])
 
   useEffect(() => {
     fetchAllShelfShopTemplate()
   }, [])
 
   const fetchAllShelfShopTemplate = () => {
-    PublicApi.getTemplateShopFindAllShelfShopTemplate().then(res => {
+    PublicApi.getTemplateWebPageTemplateWebFindAllShelfShopTemplate().then(res => {
       if (res.code === 1000) {
         setTemplateList(res.data)
       } else if (res.code === 47001) {

src/pages/shop/templateDetail/index.tsx

@@ -5,7 +5,7 @@ import DetailPage from '@/components/DetailPage'
 import UseModal from '../components/useModal'
 import { PublicApi } from '@/services/api'
 import { Environment_Status } from '@/constants'
-import { GetTemplateShopFindShopTemplateDetailsResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindShopTemplateDetailsResponse } from '@/services/TemplateApi'
 import default_img from '@/assets/imgs/template_default_img.png'
 import styles from './index.less'
 
@@ -20,7 +20,7 @@ interface TemplateDetailPropsType {
 
 const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   const { query: { type, id } } = props.location
-  const [detailInfo, setDetailInfo] = useState<GetTemplateShopFindShopTemplateDetailsResponse>()
+  const [detailInfo, setDetailInfo] = useState<GetTemplateWebPageTemplateWebFindShopTemplateDetailsResponse>()
   const [useModalVisible, setUseModalVisible] = useState<boolean>(false)
   const [confirmLoading, setConfirmLoading] = useState(false)
 
@@ -30,8 +30,10 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   }, [])
 
   const fetchDetail = () => {
-    //@ts-ignore
-    PublicApi.getTemplateShopFindShopTemplateDetails({ id }).then(res => {
+    const param: any = {
+      id
+    }
+    PublicApi.getTemplateWebPageTemplateWebFindShopTemplateDetails(param).then(res => {
       if (res.code === 1000) {
         setDetailInfo(res.data)
       }
@@ -43,8 +45,8 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
    */
   const handleConfirmUse = () => {
     setConfirmLoading(true)
-    //@ts-ignore
-    PublicApi.postTemplateShopUseShopTemplate({ id }).then(res => {
+
+    PublicApi.postTemplateWebPageTemplateWebUseShopTemplate({ id }).then(res => {
       if (res.code === 1000) {
         setUseModalVisible(false)
         fetchDetail()

src/pages/transaction/_public/order/constant.ts

@@ -7,9 +7,9 @@ export const orderTypeLabel = ['',
   '需求采购',
   '现货采购',
   '集采',
-  '积分兑换',
   '渠道直采',
   '渠道现货',
+  '积分兑换',
   '渠道积分兑换',
 ]
 

src/pages/transaction/components/orderPayTabs/index.tsx

@@ -14,7 +14,7 @@ const TabHeader = ({dataSource}) => {
     <Col>
       <div className={style.fontGray}>支付比例</div>
       <div className={style.bignumber}>{dataSource.payRatio}%</div>
-      <div className={style.smallnumber}>￥{dataSource.payPrice || 0}</div>
+      <div className={style.smallnumber}>{dataSource.channel !== 0 && '￥'}{dataSource.payPrice || 0}</div>
     </Col>
     <Col>
       <StatusColors status={dataSource.externalState} type='payOut'/>
@@ -24,7 +24,7 @@ const TabHeader = ({dataSource}) => {
 
 // 支付信息
 
-const payTextList = ["",
+const payTextList = ["积分支付",
   '线上支付',
   '线下支付',
   '授信支付',
@@ -63,7 +63,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
             </Row>
             <Row>
               <Col className={style.fontGray} span={4}>支付渠道: </Col>
-              <Col>{payList.find(j => j.id === v.channel)?.way}</Col>
+              <Col>{payList.find(j => j.id === v.channel)?.way || (v.channel === 0 && '积分支付')}</Col>
             </Row>
         </TabPane>) }
       </Tabs>

src/pages/transaction/components/orderSaleRecord/index.tsx

@@ -314,7 +314,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       onOk() {
         PublicApi.postOrderReceiptOrderContinueShipping({orderId: data.id}).then(res => {
           if(res.code === 1000) {
+            setTimeout(() => {
               history.goBack()
+            }, 1000)
           }
         })
       },

src/pages/transaction/saleOrder/addSaleDelevedOrder/model/useSelfTable.tsx

@@ -67,8 +67,8 @@ export const useSelfTable = () => {
     {
       title: '发货单号',
       align: 'center',
-      dataIndex: 'invoiceNumber',
-      key: 'invoiceNumber',
+      dataIndex: 'deliverNo',
+      key: 'deliverNo',
       render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
      },
     // { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) =>  text},

src/pages/transaction/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx

@@ -57,8 +57,8 @@ export const useSelfTable = () => {
     {
       title: '发货单号',
       align: 'center',
-      dataIndex: 'invoiceNumber',
-      key: 'invoiceNumber',
+      dataIndex: 'deliverNo',
+      key: 'deliverNo',
       render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
     },
     // { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) =>  text},

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx

@@ -67,8 +67,8 @@ export const useSelfTable = () => {
     {
       title: '发货单号',
       align: 'center',
-      dataIndex: 'invoiceNumber',
-      key: 'invoiceNumber',
+      dataIndex: 'deliverNo',
+      key: 'deliverNo',
       render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
     },
     {

src/pages/transaction/saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx

@@ -67,8 +67,8 @@ export const useSelfTable = () => {
     {
       title: '发货单号',
       align: 'center',
-      dataIndex: 'invoiceNumber',
-      key: 'invoiceNumber',
+      dataIndex: 'deliverNo',
+      key: 'deliverNo',
       render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
     },
     {

src/store/site/index.ts

@@ -49,7 +49,7 @@ class SiteStore implements ISiteModule {
     const param: any = {
       siteId: this.siteId
     }
-    const res = await PublicApi.getTemplateGoodsFindUseGoodsTemplate(param)
+    const res = await PublicApi.getTemplateWebPageTemplateWebFindGoodsDescribeTemplate(param)
     runInAction(() => {
       if(res.code === 1000) {
         this.commodityTemplateInfo = res.data