Skip to content

M
merchant-manage-ui
Commit 7c39742d authored by 武广's avatar 武广
Browse files
Options

fix: 修改已发货订单列表缺少物流信息

parent 1c9a2cc9
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 28 deletions
config/env.config.js
View file @ 7c39742d
const isProduction = process.env.NODE_ENV === 'production'; const isProduction = process.env.NODE_ENV === 'production';
const isPre = process.env.PRE_ENV === 'pre'; const isPre = process.env.PRE_ENV === 'pre';
const environment = 'yxm'; const environment = 'xyqb';
const envAPi = { const envAPi = {
api: `https://security-${environment}.liangkebang.net`, //'https://security-xyqb.liangkebang.net', api: `https://security-${environment}.liangkebang.net`, //'https://security-xyqb.liangkebang.net',
kdspOpApi: `https://sc-merchant-api-${environment}.liangkebang.net`, kdspOpApi: `https://sc-merchant-api-${environment}.liangkebang.net`,
......
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @ 7c39742d
...@@ -361,33 +361,36 @@ const TableList = props => { ...@@ -361,33 +361,36 @@ const TableList = props => {
hideInSearch: true, hideInSearch: true,
width: 350, width: 350,
}, },
// { {
// title: '物流公司', title: '物流公司',
// dataIndex: 'expressCompanyName', dataIndex: 'expressCompanyName',
// key: 'expressCompanyName', key: 'expressCompanyName',
// width: 120, width: 120,
// className: 'colStyle', className: 'colStyle',
// hideInSearch: true, hideInSearch: true,
// render: (_, record) => renderContent(record, 'expressCompanyName'), hideInTable: props.type !== 2,
// }, render: (_, record) => renderContent(record, 'expressCompanyName'),
// { },
// title: '物流单号', {
// dataIndex: 'deliveryNo', title: '物流单号',
// key: 'deliveryNo', dataIndex: 'deliveryNo',
// width: 210, key: 'deliveryNo',
// className: 'colStyle', width: 210,
// hideInSearch: true, className: 'colStyle',
// render: (_, record) => renderContent(record, 'deliveryNo'), hideInSearch: true,
// }, hideInTable: props.type !== 2,
// { render: (_, record) => renderContent(record, 'deliveryNo'),
// title: '物流信息', },
// dataIndex: 'action', {
// key: 'action', title: '物流信息',
// width: 150, dataIndex: 'action',
// hideInSearch: true, key: 'action',
// className: 'colStyle', width: 150,
// render: (_, record) => renderContent(record, 'action'), hideInSearch: true,
// }, hideInTable: props.type !== 2,
className: 'colStyle',
render: (_, record) => renderContent(record, 'action'),
},
{ {
title: '订单状态', title: '订单状态',
dataIndex: 'orderStatusDesc', dataIndex: 'orderStatusDesc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment