Compare commits
No commits in common. "500151c95757434f96d133529c67432d5d919014" and "4c23fba5de08fc11a79f0d2d14a9e55b19faf159" have entirely different histories.
500151c957
...
4c23fba5de
|
|
@ -1386,7 +1386,6 @@ const Shipping: React.FC<{
|
||||||
{ label: 'tms.freightwaves', value: 'freightwaves' },
|
{ label: 'tms.freightwaves', value: 'freightwaves' },
|
||||||
]);
|
]);
|
||||||
const [courierCompany, setCourierCompany] = useState([
|
const [courierCompany, setCourierCompany] = useState([
|
||||||
{ label: '最佳物流', value: '' },
|
|
||||||
{ label: 'UNIUNI', value: 'UNIUNI' },
|
{ label: 'UNIUNI', value: 'UNIUNI' },
|
||||||
{ label: 'PuroYYZ', value: 'PuroYYZ' },
|
{ label: 'PuroYYZ', value: 'PuroYYZ' },
|
||||||
{ label: 'CPYYZ', value: 'CPYYZ' },
|
{ label: 'CPYYZ', value: 'CPYYZ' },
|
||||||
|
|
@ -1444,8 +1443,8 @@ const Shipping: React.FC<{
|
||||||
let shipmentInfo = localStorage.getItem('shipmentInfo');
|
let shipmentInfo = localStorage.getItem('shipmentInfo');
|
||||||
if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
|
if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
|
||||||
const a = {
|
const a = {
|
||||||
shipmentPlatform: 'freightwaves',
|
shipmentPlatform: 'uniuni',
|
||||||
courierCompany: '',
|
courierCompany: 'UNIUNI',
|
||||||
...data,
|
...data,
|
||||||
// payment_method_id: shipmentInfo?.payment_method_id,
|
// payment_method_id: shipmentInfo?.payment_method_id,
|
||||||
stockPointId: shipmentInfo?.stockPointId,
|
stockPointId: shipmentInfo?.stockPointId,
|
||||||
|
|
@ -1516,7 +1515,7 @@ const Shipping: React.FC<{
|
||||||
...data
|
...data
|
||||||
}) => {
|
}) => {
|
||||||
details.origin.email_addresses =
|
details.origin.email_addresses =
|
||||||
details.origin.email_addresses;
|
details.origin.email_addresses.split(',');
|
||||||
details.destination.email_addresses =
|
details.destination.email_addresses =
|
||||||
details.destination.email_addresses.split(',');
|
details.destination.email_addresses.split(',');
|
||||||
details.destination.phone_number.number =
|
details.destination.phone_number.number =
|
||||||
|
|
@ -2166,7 +2165,7 @@ const Shipping: React.FC<{
|
||||||
const originEmail = details.origin.email_addresses;
|
const originEmail = details.origin.email_addresses;
|
||||||
const destinationEmail = details.destination.email_addresses;
|
const destinationEmail = details.destination.email_addresses;
|
||||||
details.origin.email_addresses =
|
details.origin.email_addresses =
|
||||||
details.origin.email_addresses;
|
details.origin.email_addresses.split(',');
|
||||||
details.destination.email_addresses =
|
details.destination.email_addresses =
|
||||||
details.destination.email_addresses.split(',');
|
details.destination.email_addresses.split(',');
|
||||||
details.destination.phone_number.number =
|
details.destination.phone_number.number =
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ import * as order from './order';
|
||||||
import * as product from './product';
|
import * as product from './product';
|
||||||
import * as site from './site';
|
import * as site from './site';
|
||||||
import * as siteApi from './siteApi';
|
import * as siteApi from './siteApi';
|
||||||
import * as siteProduct from './siteProduct';
|
|
||||||
import * as statistics from './statistics';
|
import * as statistics from './statistics';
|
||||||
import * as stock from './stock';
|
import * as stock from './stock';
|
||||||
import * as subscription from './subscription';
|
import * as subscription from './subscription';
|
||||||
|
|
@ -29,7 +28,6 @@ export default {
|
||||||
order,
|
order,
|
||||||
product,
|
product,
|
||||||
siteApi,
|
siteApi,
|
||||||
siteProduct,
|
|
||||||
site,
|
site,
|
||||||
statistics,
|
statistics,
|
||||||
stock,
|
stock,
|
||||||
|
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
// @ts-ignore
|
|
||||||
/* eslint-disable */
|
|
||||||
import { request } from 'umi';
|
|
||||||
|
|
||||||
/** 此处后端没有提供注释 GET /site-product/list */
|
|
||||||
export async function siteproductcontrollerGetsiteproductlist(
|
|
||||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
|
||||||
params: API.siteproductcontrollerGetsiteproductlistParams,
|
|
||||||
options?: { [key: string]: any },
|
|
||||||
) {
|
|
||||||
return request<any>('/site-product/list', {
|
|
||||||
method: 'GET',
|
|
||||||
params: {
|
|
||||||
...params,
|
|
||||||
},
|
|
||||||
...(options || {}),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 此处后端没有提供注释 POST /site-product/sync */
|
|
||||||
export async function siteproductcontrollerSyncsiteproducts(
|
|
||||||
body: number,
|
|
||||||
options?: { [key: string]: any },
|
|
||||||
) {
|
|
||||||
return request<any>('/site-product/sync', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'text/plain',
|
|
||||||
},
|
|
||||||
data: body,
|
|
||||||
...(options || {}),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
@ -1103,8 +1103,8 @@ declare namespace API {
|
||||||
categoryId?: number;
|
categoryId?: number;
|
||||||
/** 库存组成 */
|
/** 库存组成 */
|
||||||
components?: ProductStockComponent[];
|
components?: ProductStockComponent[];
|
||||||
/** 站点 SKU关联 */
|
/** 站点 SKU 列表 */
|
||||||
siteSkus?: SiteSku[];
|
siteSkus?: string[];
|
||||||
/** 来源 */
|
/** 来源 */
|
||||||
source?: number;
|
source?: number;
|
||||||
/** 创建时间 */
|
/** 创建时间 */
|
||||||
|
|
@ -1630,12 +1630,10 @@ declare namespace API {
|
||||||
stockPointId?: number;
|
stockPointId?: number;
|
||||||
orderIds?: number[];
|
orderIds?: number[];
|
||||||
shipmentPlatform?: string;
|
shipmentPlatform?: string;
|
||||||
courierCompany?: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
type ShipmentFeeBookDTO = {
|
type ShipmentFeeBookDTO = {
|
||||||
shipmentPlatform?: string;
|
shipmentPlatform?: string;
|
||||||
courierCompany?: string;
|
|
||||||
stockPointId?: number;
|
stockPointId?: number;
|
||||||
sender?: string;
|
sender?: string;
|
||||||
startPhone?: Record<string, any>;
|
startPhone?: Record<string, any>;
|
||||||
|
|
@ -2223,23 +2221,6 @@ declare namespace API {
|
||||||
id: string;
|
id: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type siteproductcontrollerGetsiteproductlistParams = {
|
|
||||||
sku?: string;
|
|
||||||
name?: string;
|
|
||||||
siteId?: number;
|
|
||||||
pageSize?: number;
|
|
||||||
current?: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
type SiteSku = {
|
|
||||||
/** sku */
|
|
||||||
sku?: string;
|
|
||||||
/** 商品ID */
|
|
||||||
productId?: number;
|
|
||||||
/** 是否旧版数据 */
|
|
||||||
isOld?: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
type SitesResponse = {
|
type SitesResponse = {
|
||||||
/** 状态码 */
|
/** 状态码 */
|
||||||
code?: number;
|
code?: number;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue