fix:

src/layouts/components/UserHeader.tsx

@@ -24,7 +24,7 @@ const UserHeader: React.FC<UserHeaderProps> = (props) => {
   const getRouteName = () => {
     switch (pathname) {
       case '/user/login':
-        setTitle("欢登录")
+        setTitle("欢迎登录")
         break
       case '/user/register':
         setTitle("欢迎注册")

src/pages/commodity/products/addChannelItem/selectProduct.tsx

@@ -58,6 +58,8 @@ const SelectProduct:React.FC<IProps> = (props) => {
       title: '商品名称',
       dataIndex: 'name',
       key: 'name',
+      width: 300,
+      ellipsis: true,
     },
     {
       title: '品类',

src/pages/commodity/products/addProductsItem/logisticsForm.tsx

@@ -37,6 +37,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
   const [carriageType, setCarriageType] = useState<number>()
   const flagRef = useRef<boolean>(false)
   const [banCarriageType, setBanCarriageType] = useState(false)
+  const [template, setTemplate] = useState(false) // 是否必填运费模板
 
   const { productInfoByEdit, selectCategoryId, productPriceType } = ProductStore
 
@@ -102,6 +103,19 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
     logisticsForm.setFieldsValue({weight: null})
   }
 
+  const changeCarriageType = (e) => {
+    setCarriageType(e.target.value)
+    if(e.target.value === 2) {
+      setTemplate(true)
+      setIsTemplate(true)
+      logisticsForm.setFieldsValue({useTemplate: true})
+    } else {
+      setTemplate(false)
+      setIsTemplate(false)
+      logisticsForm.setFieldsValue({useTemplate: false})
+    }
+  }
+
   return (<>
     <Form
       {...layout}
@@ -140,7 +154,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
             },
           ]}
         >
-          <Radio.Group onChange={(e)=>setCarriageType(e.target.value)} disabled={banCarriageType}>
+          <Radio.Group onChange={changeCarriageType} disabled={banCarriageType}>
             <Radio value={1}>卖家承担运费（默认）</Radio>
             <Radio value={2}>买家承担运费</Radio>
           </Radio.Group>
@@ -170,17 +184,23 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
       }
       {
         carriageType === 2 && <Form.Item 
-          name="useTemplate" 
+          name="useTemplate"
           valuePropName="checked"
           label=" "
         >
-          <Checkbox onChange={onChangeTemplate}>使用运费模板（只有买家承担运费才能选择）</Checkbox>
+          <Checkbox disabled={template} onChange={onChangeTemplate}>使用运费模板（只有买家承担运费才能选择）</Checkbox>
         </Form.Item>
       }
       {
         isTemplate && <Form.Item
           name="templateId"
           label="运费模板"
+          rules={[
+            {
+              required: template,
+              message: '请正确输入重量',
+            }
+          ]}
         >
           <Select
             placeholder="请选择运费模板"

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -330,11 +330,11 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
           if(updateFlag.current){ // 初次渲染tab 再次进入tab采用缓存数据
             _tempObj['单价'] = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice || {}
           }else{
-            _tempObj['单价'] = _tableDataSource[i] && tableDataSource[i]['单价'] || {}
+            _tempObj['单价'] = _tableDataSource[i] && tableDataSource[i] || {}
           }
         }else{
           _tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0
-          _tempObj['单价'] = _tableDataSource[i] && tableDataSource[i]['单价'] || {}
+          _tempObj['单价'] = _tableDataSource[i] && tableDataSource[i] && tableDataSource[i]['单价'] || {}
         }
         // 价格属性变动引发的构建清空价格（仅清空一次）
         if(clearPrice.current){

src/pages/commodity/products/directChannel.tsx

@@ -26,7 +26,7 @@ import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'
 import { searchBrandOptionEffect, searchCustomerCategoryOptionEffect } from './effect'
 import EyePreview from '@/components/EyePreview'
 import moment from 'moment'
-import { GetProductChannelCommodityGetShopResponse } from '@/services'
+import { GetProductChannelCommodityGetShopResponse } from '@/services/ProductApi'
 
 // 定义选择的行数据的类型
 interface Item {
@@ -68,6 +68,8 @@ const DirectChannel: React.FC<{}> = () => {
       dataIndex: ['channelCommodity', 'commodity', 'name'],
       key: 'id',
       className: 'commonPickColor',
+      width: 300,
+      ellipsis: true,
       render: (text:any, record:any) => <EyePreview
         url={`/memberCenter/commodityAbility/commodity/products/directChannel/detail?id=${record.id}`}
       >

src/pages/commodity/products/index.less

@@ -257,4 +257,11 @@
       background-color: #909399 !important;
     }
   }
+}
+
+.overFlowEllipsis {
+  width: 300px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
\ No newline at end of file

src/pages/commodity/products/index.tsx

@@ -109,7 +109,9 @@ const Products: React.FC<{}> = () => {
       dataIndex: 'name',
       key: 'name',
       className: 'commonPickColor',
-      render: (text: any, record: any) => <span className="commonPickColor" onClick={() => handleSee(record)}>{text}&nbsp;<EyeOutlined /></span>
+      width: 300,
+      ellipsis: true,
+      render: (text: any, record: any) => <a title={text} onClick={() => handleSee(record)}>{text}&nbsp;<EyeOutlined /></a>
     },
     {
       title: '品类',

src/pages/commodity/products/schema/channelSchema.tsx

@@ -68,7 +68,7 @@ export const channelSchema: ISchema = {
                 defaultActiveFirstOption: false,
                 filterOption: false,
                 notFoundContent: null,
-                style: { width: '174px', lineHeight: '32px' },
+                // style: { width: '174px', lineHeight: '32px' },
                 searchValue: null,
                 dataoption: [],
               },
@@ -83,7 +83,7 @@ export const channelSchema: ISchema = {
                 defaultActiveFirstOption: false,
                 filterOption: false,
                 notFoundContent: null,
-                style: { width: '174px', lineHeight: '32px' },
+                // style: { width: '174px', lineHeight: '32px' },
                 searchValue: null,
                 dataoption: []
               },
@@ -102,7 +102,7 @@ export const channelSchema: ISchema = {
               ],
               'x-component-props': {
                 placeholder: '商品来源',
-                style: { width: '174px' },
+                // style: { width: '174px' },
               },
             },
             statusList: {
@@ -123,7 +123,7 @@ export const channelSchema: ISchema = {
               ],
               'x-component-props': {
                 placeholder: '商品状态',
-                style: { width: '174px' },
+                // style: { width: '174px' },
               },
             },
             priceTypeList: {
@@ -144,7 +144,7 @@ export const channelSchema: ISchema = {
               ],
               'x-component-props': {
                 placeholder: '产品定价',
-                style: { width: '174px' },
+                // style: { width: '174px' },
               },
             },
             'NO_NAME_FIELD_$2': {

src/pages/repositories/components/PositionSetting.tsx

@@ -306,6 +306,8 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
       dataIndex: 'name',
       align: 'center',
       key: 'name',
+      width: 210,
+      ellipsis: true,
     },
     {
       title: '品类',

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

@@ -45,20 +45,20 @@ const OrderHandReceivedModal:React.FC<OrderHandReceivedModalProps> = ({currentRe
       formData && 
       <>
         <Row>
-          <Col span={6}>发货地址: </Col>
-          <Col>{formData.name}</Col>
+          <Col span={6}><p>发货地址: </p></Col>
+          <Col><p>{formData.name}</p></Col>
         </Row>
         <Row>
-          <Col span={6}>发货时间: </Col>
-          <Col>{moment(formData.deliverTime).format('YYYY-MM-DD')}</Col>
+          <Col span={6}><p>发货时间: </p></Col>
+          <Col><p>{moment(formData.deliverTime).format('YYYY-MM-DD')}</p></Col>
         </Row>
         <Row>
-          <Col span={6}>物流单号: </Col>
-          <Col>{formData.deliverNo}</Col>
+          <Col span={6}><p>物流单号: </p></Col>
+          <Col><p><a href={`https://www.kuaidi100.com/chaxun?nu=${formData.deliverNo}`} target="_blank">{formData.deliverNo}</a></p></Col>
         </Row>
         <Row>
-          <Col span={6}>物流公司: </Col>
-          <Col>{formData.logisticsCompany}</Col>
+          <Col span={6}><p>物流公司: </p></Col>
+          <Col><p>{formData.logisticsCompany}</p></Col>
         </Row>
       </>
     }

src/pages/transaction/purchaseOrder/orderCollect/index.less

+.orderCollectCard {
+  :global {
+    .ant-form-item-explain-error {
+      position: absolute;
+      top: 92%;
+    }
+  }
+}
\ No newline at end of file

src/pages/transaction/purchaseOrder/orderCollect/index.tsx

@@ -29,6 +29,7 @@ import { changeRouterTitleByStatus } from '../../_public/order/utils'
 
 import { ReadyAddOrderDetailContext } from '../context'
 import AuditProcess from '@/components/AuditProcess'
+import styles from './index.less'
 
 export interface PurchaseOrderDetailProps {}
 
@@ -329,7 +330,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
               []
           }
         ></AuditProcess> }
-        <Card className='' style={{marginTop: 24}}>
+        <Card className={styles.orderCollectCard} style={{marginTop: 24}}>
           <NiceForm
             loading={formLoading}
             previewPlaceholder=' '

src/pages/transaction/saleOrder/constant/index.tsx

@@ -28,10 +28,10 @@ export const baseOrderListColumns: any[] = [
     key: 'orderThe',
   },
   {
-    title: '供应会员',
+    title: '采购会员',
     align: 'center',
-    dataIndex: 'supplyMembersName',
-    key: 'supplyMembersName',
+    dataIndex: 'memberName',
+    key: 'memberName',
   },
   {
     title: '下单时间',