Merge branch 'feature/remark-logistics' into 'master'

Feature/remark logistics

See merge request !99

src/pages/orderManage/components/GoodsRemark.jsx

+import React from 'react';
+import { Table } from 'antd';
+import style from './style.less';
+
+const GoodsRemark = props => {
+  const columns = [
+    {
+      title: '商品',
+      dataIndex: 'skuName',
+      width: 350,
+      render: (value, record) => {
+        const { skuName, imageUrl } = record;
+        return (
+          <div className={style.popoverGoods}>
+            <img src={imageUrl} alt="" className={style['popoverGoods-img']} />
+            <span>{skuName}</span>
+          </div>
+        );
+      },
+    },
+    {
+      title: '备注',
+      dataIndex: 'content',
+      width: 150,
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'time',
+      width: 150,
+    },
+  ];
+
+  return (
+    <div>
+      <Table columns={columns} dataSource={props.dataSource} pagination={false} />
+    </div>
+  );
+};
+
+export default GoodsRemark;

src/pages/orderManage/components/style.less

+.popoverGoods {
+  display: flex;
+  align-items: center;
+  &-img {
+    width: 50px;
+    height: 50px;
+    margin-right: 10px;
+  }
+}

src/pages/orderManage/pendingDeliveryOrder/index.jsx

@@ -12,6 +12,7 @@ import LogisticsForm from './components/LogisticsForm';
 import PopoverDom from './components/PreviewImage';
 import LogisticsCom from './components/LogisticsCom';
 import DelayDeliverGoods from './components/DelayDeliverGoods';
+import GoodsRemark from '../components/GoodsRemark';
 
 import MultiLogisticsModal from './components/MultiLogisticsModal';
 import {
@@ -228,7 +229,7 @@ const TableList = props => {
       key: 'orderNotice',
       width: 150,
       render: (_, record) => {
-        const { updateAddressList, platformRemark } = record;
+        const { updateAddressList, platformRemark, platformRemarkList } = record;
         // let addressData;
         // if (updateAddressList) {
         //   addressData = updateAddressList.pop();
@@ -251,13 +252,11 @@ const TableList = props => {
             ) : (
               ''
             )}
-            {platformRemark ? (
+            {platformRemarkList && platformRemarkList.length ? (
               <Popover
                 placement="top"
                 title="平台备注"
-                content={
-                  <PopoverNotice time={platformRemark?.time} content={platformRemark?.content} />
-                }
+                content={<GoodsRemark dataSource={platformRemarkList} />}
                 trigger="hover"
               >
                 <Button block type="warning">

src/pages/orderManage/queryOrder/components/DetailModal/index.jsx

@@ -57,7 +57,7 @@ const DetailModal = (props, ref) => {
     {
       title: '数量',
       dataIndex: 'count',
-      width: 150,
+      width: 100,
     },
     {
       title: '小计',
@@ -68,6 +68,11 @@ const DetailModal = (props, ref) => {
         return (supplyPrice * count).toFixed(2);
       },
     },
+    {
+      title: '商品备注',
+      dataIndex: 'remark',
+      width: 150,
+    },
     {
       title: '售后状态',
       width: 150,