src/pages/Logistics/Address/index.tsx

@@ -393,14 +393,6 @@ const UpdateForm: React.FC<{
           }));
         }}
       />
-      <ProFormText
-          name={['email']}
-          label="邮箱"
-           width="lg"
-          placeholder="请输入邮箱"
-          required
-          rules={[{ required: true, message: '请输入邮箱' }]}
-        />
       <ProForm.Group title="地址">
         <ProFormText
           name={['address', 'country']}
@@ -439,8 +431,6 @@ const UpdateForm: React.FC<{
           required
           rules={[{ required: true, message: '请输入详细地址' }]}
         />
-
-         
       </ProForm.Group>
       <ProFormItem
         name="contact"

src/pages/Order/List/index.tsx

@@ -77,7 +77,6 @@ import {
 } from 'antd';
 import React, { useMemo, useRef, useState } from 'react';
 import RelatedOrders from '../../Subscription/Orders/RelatedOrders';
-import dayjs from 'dayjs';
 
 const ListPage: React.FC = () => {
   const actionRef = useRef<ActionType>();
@@ -1268,10 +1267,7 @@ const Shipping: React.FC<{
   const [rates, setRates] = useState<API.RateDTO[]>([]);
   const [ratesLoading, setRatesLoading] = useState(false);
   const { message } = App.useApp();
-const [shipmentPlatforms, setShipmentPlatforms] = useState([
+
-    { label: 'uniuni', value: 'uniuni' },
-    { label: 'tms.freightwaves', value: 'freightwaves' },
-  ]); 
   return (
     <ModalForm
       formRef={formRef}
@@ -1300,7 +1296,6 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
           await ordercontrollerGetorderdetail({
             orderId: id,
           });
-        console.log('success data',success,data)
         if (!success || !data) return {};
         data.sales = data.sales?.reduce(
           (acc: API.OrderSale[], cur: API.OrderSale) => {
@@ -1323,8 +1318,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         if (reShipping) data.sales = [{}];
         let shipmentInfo = localStorage.getItem('shipmentInfo');
         if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
-        const a =  {
+        return {
-          shipmentPlatform: 'uniuni',
           ...data,
           // payment_method_id: shipmentInfo?.payment_method_id,
           stockPointId: shipmentInfo?.stockPointId,
@@ -1384,7 +1378,6 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             },
           },
         };
-        return a 
       }}
       onFinish={async ({
         customer_note,
@@ -1448,18 +1441,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         }
       }}
     >
-       <Row gutter={16}>
+      <ProFormText label="订单号" readonly name={'externalOrderId'} />
-        <Col span={8}>
-     <ProFormSelect
-        name="shipmentPlatform"
-        label="发货平台"
-        options={shipmentPlatforms}
-        placeholder="请选择发货平台"
-        rules={[{ required: true, message: '请选择一个选项' }]}
-      />
-      </Col>
-       </Row>
-      <ProFormText label="订单号" readonly name='externalOrderId' />
       <ProFormText label="客户备注" readonly name="customer_note" />
       <ProFormList
         label="后台备注"
@@ -1591,21 +1573,16 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             title="发货信息"
             extra={
               <AddressPicker
-                onChange={(row) => {
+                onChange={({
-                  console.log(row);
-                  const {
                   address,
                   phone_number,
                   phone_number_extension,
                   stockPointId,
-                    email,
+                }) => {
-                  } = row;
                   formRef?.current?.setFieldsValue({
                     stockPointId,
-                    //   address_id: row.id,
                     details: {
                       origin: {
-                        email_addresses:email,
                         address,
                         phone_number: {
                           phone: phone_number,
@@ -1618,11 +1595,6 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
               />
             }
           >
-             {/* <ProFormText
-              label="address_id"
-              name={'address_id'}
-              rules={[{ required: true, message: '请输入ID' }]}
-            /> */}
             <ProFormSelect
               name="stockPointId"
               width="md"
@@ -1715,6 +1687,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             <ProFormText
               label="公司名称"
               name={['details', 'destination', 'name']}
+              rules={[{ required: true, message: '请输入公司名称' }]}
             />
             <ProFormItem
               name={['details', 'destination', 'address', 'country']}
@@ -2044,7 +2017,6 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             details.origin.phone_number.number =
               details.origin.phone_number.phone;
             const res = await logisticscontrollerGetshipmentfee({
-              shipmentPlatform: data.shipmentPlatform,
               stockPointId: data.stockPointId,
 
               sender: details.origin.contact_name,
@@ -2371,7 +2343,7 @@ const CreateOrder: React.FC<{
         <ProFormText
           label="公司名称"
           name={['billing', 'company']}
-          rules={[{  message: '请输入公司名称' }]}
+          rules={[{ required: true, message: '请输入公司名称' }]}
         />
         <ProFormItem
           name={['billing', 'country']}
@@ -2457,11 +2429,6 @@ const AddressPicker: React.FC<{
           value: item.id,
         }));
       },
-    },
-     {
-      title: 'id',
-      dataIndex: ['id'],
-      hideInSearch: true,
     },
     {
       title: '地区',
@@ -2489,11 +2456,6 @@ const AddressPicker: React.FC<{
         `+${record.phone_number_extension} ${record.phone_number}`,
       hideInSearch: true,
     },
-    {
-      title: '邮箱',
-      dataIndex: [ 'email'],
-      hideInSearch: true,
-    },
   ];
   return (
     <ModalForm

src/pages/Product/GroupBy/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useMemo } from 'react';
-import { PageContainer, ProFormSelect } from '@ant-design/pro-components';
+import { PageContainer, ProFromSelect } from '@ant-design/pro-components';
 import { Card, Collapse, Divider, Image, Select, Space, Typography, message } from 'antd';
 import { categorycontrollerGetall } from '@/servers/api/category';
 import { productcontrollerGetproductlistgrouped } from '@/servers/api/product';
@@ -272,7 +272,7 @@ const ProductGroupBy: React.FC = () => {
                   {categoryAttributes.map(attr => (
                       <div key={attr.id} style={{ display: 'flex', alignItems: 'center' }}>
                         <Text style={{ width: '100px' }}>{attr.title}：</Text>
-                        <ProFormSelect
+                        <ProFromSelect
                           placeholder={`请选择${attr.title}`}
                           style={{ width: 300 }}
                           value={attributeFilters[attr.name] || null}

src/servers/api/typings.d.ts

@@ -1627,11 +1627,9 @@ declare namespace API {
     details?: ShippingDetailsDTO;
     stockPointId?: number;
     orderIds?: number[];
-    shipmentPlatform?: string;
   };
 
   type ShipmentFeeBookDTO = {
-    shipmentPlatform?: string;
     stockPointId?: number;
     sender?: string;
     startPhone?: string;
@@ -1652,7 +1650,6 @@ declare namespace API {
     dimensionUom?: string;
     weight?: number;
     weightUom?: string;
-    address_id?: number;
   };
 
   type ShippingAddress = {