fix: change

src/pages/channel/templateDetail/index.tsx

@@ -6,6 +6,7 @@ import DetailPage from '@/components/DetailPage'
 import UseModal from '../components/useModal'
 import { PublicApi } from '@/services/api'
 import { Environment_Status } from '@/constants'
+import { GlobalConfig } from '@/global/config'
 import { GetTemplateWebPageTemplateWebFindChannelTemplateDetailsResponse } from '@/services/TemplateApi'
 import styles from './index.less'
 
@@ -19,21 +20,28 @@ interface TemplateDetailPropsType {
 }
 
 const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
-  const { query: { type, id } } = props.location
+  const { query: { id } } = props.location
   const [detailInfo, setDetailInfo] = useState<GetTemplateWebPageTemplateWebFindChannelTemplateDetailsResponse>()
   const [useModalVisible, setUseModalVisible] = useState<boolean>(false)
   const [confirmLoading, setConfirmLoading] = useState(false)
+  const [shopType, setShopType] = useState<number>()
 
   useEffect(() => {
     fetchDetail()
   }, [])
 
+  const getType = (info: GetTemplateWebPageTemplateWebFindChannelTemplateDetailsResponse): number => {
+    const mallInfo = GlobalConfig.web.shopInfo.filter((item) => item.id === info.shopId)[0]
+    return mallInfo.type
+  }
+
   const fetchDetail = () => {
     const param: any = {
       id
     }
     PublicApi.getTemplateWebPageTemplateWebFindChannelTemplateDetails(param).then(res => {
       if (res.code === 1000) {
+        setShopType(getType(res.data))
         setDetailInfo(res.data)
       }
     })
@@ -58,10 +66,10 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   const handleLinkEdit = () => {
     if(detailInfo?.environment === 1) {
       // web店铺装修
-      window.location.href =  `/memberCenter/channelAbility/template/edit?id=${detailInfo.id}&template=${detailInfo.fileName}`
+      window.location.href =  `/memberCenter/channelAbility/template/edit?id=${detailInfo.id}&template=${detailInfo.fileName}&type=${shopType}`
     } else if(detailInfo?.environment === 4) {
       // app店铺装修
-      window.location.href = `/memberCenter/channelAbility/template/mobile/edit?id=${detailInfo.id}&template=${detailInfo.fileName}`
+      window.location.href = `/memberCenter/channelAbility/template/mobile/edit?id=${detailInfo.id}&template=${detailInfo.fileName}&type=${shopType}`
     } else {
       message.info("暂不支持该类型模板装修")
     }
@@ -69,9 +77,9 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
 
   const handleLinkPreview = () => {
     if(detailInfo?.environment === 1) {
-      window.location.href = `/memberCenter/channelAbility/template/preview?id=${detailInfo.id}&template=${detailInfo.fileName}`
+      window.location.href = `/memberCenter/channelAbility/template/preview?id=${detailInfo.id}&template=${detailInfo.fileName}&type=${shopType}`
     } else if(detailInfo?.environment === 4) {
-      window.location.href = `/memberCenter/channelAbility/template/mobile/preview?id=${detailInfo.id}&template=${detailInfo.fileName}`
+      window.location.href = `/memberCenter/channelAbility/template/mobile/preview?id=${detailInfo.id}&template=${detailInfo.fileName}&type=${shopType}`
     } else {
       message.info("暂不支持该类型模板预览")
     }

src/pages/logistics/addLogistics/index.tsx

@@ -178,6 +178,7 @@ const AddLogistics: React.FC<{}> = () => {
         }
       })
     }).then(res => {
+      console.log(res, 10078)
       setListShipperAddress(res)
     }).catch(error => console.log(error));
     switch (Number(createType)) {
@@ -363,6 +364,9 @@ const AddLogistics: React.FC<{}> = () => {
     const obj = { ...query };
     obj.shipperAddressId = option.value;
     obj.shipperFullAddress = option.children;
+    obj.shipperName = option.shipperName
+    obj.shipperPhone = option.shipperPhone
+
     setQuery(obj)
   }
 
@@ -509,12 +513,17 @@ const AddLogistics: React.FC<{}> = () => {
       const selectRow = shippingRowCtl.selectRow[0]
       data.shipmentOrderId = selectRow.id
       data.shipmentOrderCode = selectRow.invoicesNo;//发货单号
+
+      data.receiverMemberName = selectRow.memberName;
       data.receiverPhone = selectRow.phone;
       data.receiverName = selectRow.receiverName;//收货方名称
       data.receiverFullAddress = selectRow.fullAddress;
-      data.receiverMemberName = selectRow.memberName;
+      data.relevanceOrderId = selectRow.relevanceInvoicesId
+      data.relevanceOrderCode = selectRow.relevanceInvoicesNo
+
       form.setFieldsValue({
-        shipmentOrderCode: selectRow.invoicesNo
+        shipmentOrderCode: selectRow.relevanceInvoicesId,
+        relevanceOrderCode: selectRow.relevanceInvoicesId
       })
       setQuery({ ...data })
       setId(selectRow.id)
@@ -535,6 +544,7 @@ const AddLogistics: React.FC<{}> = () => {
     }
     data.relevanceOrderId = selectRow.applyId
     data.relevanceOrderCode = selectRow.applyNo
+
     form.setFieldsValue({
       relevanceOrderCode: selectRow.applyNo
     })
@@ -560,7 +570,12 @@ const AddLogistics: React.FC<{}> = () => {
           }
           data.relevanceOrderId = selectRow.id
           data.relevanceOrderCode = selectRow.orderNo
+
+          data.shipmentOrderId = ''
+          data.shipmentOrderCode = '';//发货单号
+
           form.setFieldsValue({
+            shipmentOrderCode: undefined,
             relevanceOrderCode: selectRow.orderNo
           })
           setQuery({ ...data });
@@ -755,10 +770,10 @@ const AddLogistics: React.FC<{}> = () => {
                 <div>{query.receiverFullAddress}</div>
               </Form.Item>
               <Form.Item label="发货地址" name="shipperAddressId" rules={[{ required: true, message: '请选择发货地址' }]}>
-                <Select allowClear onChange={(value, option) => handleSelectAddress(option)}>
+                <Select allowClear onChange={(value, option) => handleSelectAddress(option )}>
                   {
                     listShipperAddress.map((item: any, idx: number) => (
-                      <Option key={item.id} value={item.id}>{item.fullAddress}</Option>
+                      <Option key={item.id} value={item.id} shipperName={item.shipperName} shipperPhone={item.phone}>{item.fullAddress}</Option>
                     ))
                   }
                 </Select>

src/pages/logistics/components/orderSearchDetail.tsx

-import React, { useEffect, useState, ReactNode, useRef, Fragment } from 'react';
-import { Row, Col, Table, Input, Button, Tag, Badge, Steps, message, Form, Checkbox } from 'antd'
+import React, { useEffect, useState, ReactNode, useRef } from 'react';
+import { Row, Col, Table, Input, Button, Tag, Badge, Steps, message, Form, Typography } from 'antd'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { CheckSquareOutlined } from '@ant-design/icons'
 import { ColumnType } from 'antd/lib/table/interface'
@@ -8,7 +8,7 @@ import { history } from 'umi'
 import { PublicApi } from '@/services/api'
 import moment from 'moment'
 import style from './index.less'
-import statuStyle from '../colorTag'
+import statuStyle from '../colorTag';
 const { Step } = Steps
 
 const layout: any = {
@@ -251,6 +251,7 @@ const detailInfo: React.FC<{}> = () => {
 
   // 输入报价价格
   const inputOnchange = (e: any) => {
+    console.log(e.target.value)
     const value = e.target.value;
     setfreightPrice(value);
   }
@@ -259,10 +260,16 @@ const detailInfo: React.FC<{}> = () => {
     try {
       const value = await form.validateFields();
       setfreightPrice(value.freight);
+<<<<<<< HEAD
       setTaxRate(value.taxRate);
       setvisible(true);
     } catch {
       message.error('请下拉到运费模块输入税率和运费！')
+=======
+      setvisible(true);
+    } catch {
+      message.error('请下拉到运费模块输入运费！')
+>>>>>>> 578e3fe8502feddf01a81cccdaf08c0a2db24cbb
     }
   }
 
@@ -433,6 +440,7 @@ const detailInfo: React.FC<{}> = () => {
                 (item: any, index: number) => {
                   return (
                     <Form {...layout} form={form}>
+<<<<<<< HEAD
                       {item.key === 'taxRate' &&
                         <Form.Item label={item.title} style={{ marginBottom: 0, position: 'relative' }}>
                           <div style={{
@@ -464,6 +472,39 @@ const detailInfo: React.FC<{}> = () => {
                             style={{ width: '300px' }}
                           />
                         </Form.Item>}
+=======
+                      {item.key === 'freight' &&
+                        <>
+                          {type === 'option' ? (
+                            <Form.Item
+                              label={item.title}
+                              name={item.key}
+                              rules={[
+                                {
+                                  required: true,
+                                  message: '请正确输入运费',
+                                },
+                                {
+                                  pattern: /^\d+(\.\d{1,2})?$/,
+                                  message: '运费数值小数点后仅限两位',
+                                }
+                              ]}
+                            >
+                              <Input
+                                type='number'
+                                addonBefore="¥"
+                                maxLength={25}
+                                style={{ width: '300px' }}
+                              />
+                            </Form.Item>
+                          ) : (
+                            <Form.Item label={item.title} name={item.key} rules={[{ required: true, message: '请输入运费' }]}>
+                              {dataInfo.status < 3 ? <Typography.Text>未报价</Typography.Text> : <Typography.Text>{item.value && `￥${(item.value).toFixed(2)}`}</Typography.Text>}
+                            </Form.Item>
+                          )}
+                        </>
+                      }
+>>>>>>> 578e3fe8502feddf01a81cccdaf08c0a2db24cbb
                       {item.key === 'settlement' &&
                         <Form.Item label={item.title} name={item.key}>
                           <span>{item.value}</span>

src/pages/logistics/list/addCompany.tsx

@@ -196,7 +196,7 @@ const company: React.FC<parmas> = (props) => {
       backIcon={<ReutrnEle description="返回" />}
       title={headerTitle}
     >
-      <Row gutter={[36, 36]}>
+      <Row>
         <Col span={24}>
           <Card>
             {

src/pages/lxMall/commodityDetail/index.tsx

@@ -461,6 +461,7 @@ const CommodityDetail = (props) => {
           param.commodityType = 2
           param.channelCommodityUnitPriceId = selectCommodityId
           param.commodityUnitPriceId = selectCommodityUnitPriceId
+          param.channelMemberId = memberId
           postFn = PublicApi.postSearchShopPurchaseChannelSaveOrUpdatePurchase
           break;
         case LAYOUT_TYPE.ichannel:
@@ -470,6 +471,7 @@ const CommodityDetail = (props) => {
           param.commodityType = 2
           param.channelCommodityUnitPriceId = selectCommodityId
           param.commodityUnitPriceId = selectCommodityUnitPriceId
+          param.channelMemberId = memberId
           postFn = PublicApi.postSearchShopPurchaseChannelSaveOrUpdatePurchase
           break;
         default:

src/pages/lxMall/components/FindMore/components/newTrade/index.tsx

@@ -20,7 +20,7 @@ const NewTrade: React.FC = () => {
   }, [])
 
   const autoPlayList = (maxLenght) => {
-    const new_trade_list = document.getElementById("new_trade_list")
+    const new_trade_list: any = document.getElementById("new_trade_list")
     if (new_trade_list) {
       const autoPlaySpeed = 5000
       const unitDistance = 79
@@ -29,8 +29,6 @@ const NewTrade: React.FC = () => {
         timer = setInterval(() => {
           distance += unitDistance
           if (distance < maxDistance) {
-
-            //@ts-ignore
             new_trade_list.style = `transform: translateY(${-distance}px);`
           } else {
             clearInterval(timer)
@@ -47,16 +45,16 @@ const NewTrade: React.FC = () => {
   }, [current])
 
   const fetchData = () => {
-    let param = {
+    const param: any = {
       current: current,
       pageSize: pageSize
     }
-    //@ts-ignore
+
     PublicApi.getOrderProcurementOrderTransactionDynamics(param).then(res => {
       if (res.code === 1000) {
-        let newList = [...list, ...res.data.data]
+        const newList = [...list, ...res.data.data]
         setList(newList)
-        let maxLenght = newList.length
+        const maxLenght = newList.length
         if (res.data.data && res.data.data.length > 0) {
           autoPlayList(maxLenght)
         }

src/pages/lxMall/index/index.tsx

 import React, { useMemo, useEffect, useState } from 'react'
 import QuickNav from '../components/QuickNav'
 import Information from '../components/Information'
-import FindMore from '../components/FindMore'
+// import FindMore from '../components/FindMore'
 import { inject, observer } from 'mobx-react'
 import FloorAnchor from '../components/FloorAnchor'
 import { PublicApi } from '@/services/api'

src/pages/lxMall/purchaseOrder/index.tsx

@@ -60,13 +60,16 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
     const headers: { type: number} = {
       type: 1
     }
+    const param: any = {}
     switch (layoutType) {
       case LAYOUT_TYPE.channel:
         headers.type = 3
+        param.channelMemberId = shopInfo.memberId
         getFn = PublicApi.getSearchShopPurchaseChannelGetPurchaseList
         break;
       case LAYOUT_TYPE.ichannel:
         headers.type = 4
+        param.channelMemberId = shopInfo.memberId
         getFn = PublicApi.getSearchShopPurchaseChannelGetPurchaseList
         break;
       default:
@@ -75,7 +78,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
         break;
     }
 
-    getFn && getFn({}, { headers }).then(res => {
+    getFn && getFn(param, { headers }).then(res => {
       if (res.code === 1000) {
         initPurchaseList(res.data)
         getCategoryIds(res.data)
@@ -278,6 +281,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
         switch (layoutType) {
           case LAYOUT_TYPE.channel:
           case LAYOUT_TYPE.ichannel:
+            param.channelMemberId = shopInfo.memberId
             param.commodityType = 2
             postFn = PublicApi.postSearchShopPurchaseChannelSaveOrUpdatePurchase
             break

src/pages/mobileTemplate/channelTemplateEdit/index.tsx

@@ -43,6 +43,7 @@ interface ShopPreviewPropsType {
        * 模板名称
        */
       template: string;
+      type: number,
     }
   }
 }
@@ -50,13 +51,14 @@ interface ShopPreviewPropsType {
 const TemplateList = ['science']
 
 const  mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = (props) => {
-  const { query: { id, template } } = props.location
+  const { query: { id, template, type } } = props.location
   const [loading, setLoading] = useState<boolean>(true)
   const [theme, setTheme] = useState<string>('theme-mall-science')
   const [componentConfigs, setComponentConfigs] = useState({})
 
   const headers = {
-    environment: "4"
+    environment: "4",
+    type: Number(type)
   }
 
   useEffect(() => {

src/pages/payandSettle/paySetting/components/payWayTable.tsx

@@ -44,13 +44,14 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
       key: 'options',
       dataIndex: 'options',
       render: (text: any, record: any, index: number) => <>
-        <Button type='link' onClick={() => { setedit(record); setmodalvisible(true); setModifyIndex(index); setmodify(true) }}>编辑</Button>
+        <Button type='link' onClick={() => { setedit(record); setmodalvisible(true); setModifyIndex(index); setmodify(true); setType(id) }}>编辑</Button>
         <Button type='link' onClick={() => onDel(record.type, index)}>删除</Button>
       </>
     }
   ]
 
   const handleOk = (value: any, idx: number) => {
+    console.log(value, type)
     let idType = null;
     switch (type) {
       case 1:

src/pages/payandSettle/paySetting/components/setUpModal.tsx

@@ -25,7 +25,6 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
 
   const handleOk = () => {
     form.validateFields().then(res => {
-      console.log(type)
       let idType = null;
       switch (type) {
         case 1:
@@ -59,7 +58,6 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
 
   useEffect(() => {
     if (Object.keys(edit).length > 0) {
-      console.log(edit, 10086)
       form.setFieldsValue({
         code: edit.payWayCodeTypeEnum,
         value: edit.value,

src/pages/payandSettle/paySetting/index.tsx

@@ -56,7 +56,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
   }
 
   const onGet = (value: any, type: number, idx: number) => {
-    console.log(value, type)
     const data = [...payItem];
     if (type === 2) {
       data[idx].payParametersList = [...data[idx].payParametersList, value]
@@ -81,7 +80,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
   }
   /**编辑 */
   const onEdit = (value: any, type: number, index: number, idx: number) => {
-    console.log(value, type, index, idx)
     const data = [...payItem];
     if (type === 2) {
       data[idx].payParametersList[index] = { ...value };
@@ -90,7 +88,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
       data[idx].payParametersAddListRequests[index] = { ...value };
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests]
     }
-    console.log(data, 10086)
     setPayItem(data);
   }