Commit fd1f83ba authored by 李腾's avatar 李腾

fix: 修复商户首次登录消息数据不正确的问题

parent 34d37bb5
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 = 'yxm2'; const environment = 'sc';
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`,
......
...@@ -122,7 +122,7 @@ const Simple = props => { ...@@ -122,7 +122,7 @@ const Simple = props => {
const [messageData, setMessageData] = useState([]); const [messageData, setMessageData] = useState([]);
const userInfo = JSON.parse(localStorage.getItem('user') || '{}'); let userInfo = JSON.parse(localStorage.getItem('user') || '{}');
const toggle = () => { const toggle = () => {
setVisible(!visible); setVisible(!visible);
...@@ -130,6 +130,13 @@ const Simple = props => { ...@@ -130,6 +130,13 @@ const Simple = props => {
// 初始化获取数据 // 初始化获取数据
const getMsgList = async () => { const getMsgList = async () => {
if (!userInfo.supplierCode) {
userInfo = JSON.parse(localStorage.getItem('user') || '{}');
setTimeout(() => {
getMsgList();
}, 1000);
return;
}
const params = { const params = {
pageNo: 1, pageNo: 1,
pageSize: 1000, pageSize: 1000,
......
...@@ -213,6 +213,9 @@ export const getColumns = props => { ...@@ -213,6 +213,9 @@ export const getColumns = props => {
hideInSearch: true, hideInSearch: true,
width: 150, width: 150,
render: (val, record) => { render: (val, record) => {
if (record.status !== 14) {
return <div align="center">-</div>;
}
const serviceTime = moment(record.approvalEndTime).valueOf(); const serviceTime = moment(record.approvalEndTime).valueOf();
return ( return (
<Countdown <Countdown
...@@ -228,6 +231,7 @@ export const getColumns = props => { ...@@ -228,6 +231,7 @@ export const getColumns = props => {
if (dealStatus === 70) { if (dealStatus === 70) {
auditCountDown = []; auditCountDown = [];
} }
return [ return [
...auditCountDown, ...auditCountDown,
{ {
......
...@@ -499,6 +499,7 @@ const TableList = props => { ...@@ -499,6 +499,7 @@ const TableList = props => {
// eslint-disable-next-line no-unused-expressions // eslint-disable-next-line no-unused-expressions
form?.resetFields(); form?.resetFields();
setorderStatus(''); setorderStatus('');
setOrderNo('');
// eslint-disable-next-line no-unused-expressions // eslint-disable-next-line no-unused-expressions
form?.submit(); form?.submit();
}} }}
...@@ -512,7 +513,11 @@ const TableList = props => { ...@@ -512,7 +513,11 @@ const TableList = props => {
type="primary" type="primary"
onClick={() => { onClick={() => {
if (ref.current) { if (ref.current) {
const obj = { ...ref.current.getFieldsValue(), logisticsStatus: props.type || 1 }; const obj = {
...ref.current.getFieldsValue(),
orderNo,
logisticsStatus: props.type || 1,
};
obj.startTime = startTimeStr; obj.startTime = startTimeStr;
obj.endTime = endTimeStr; obj.endTime = endTimeStr;
downOrder(obj); downOrder(obj);
......
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