Merge branch 'fix/orderList' into 'master'

fix: 优化代码

See merge request !20

src/pages/orderManage/pendingDeliveryOrder/index.jsx

@@ -67,31 +67,35 @@ const TableList = props => {
     setLogisticsComList(tempObj);
   };
 
-  const renderContent = (record, key) =>
-    record.mchOrderSkuVoList.map((item, index) => (
-      <p
-        className={[
-          'tableContent',
-          index < record?.mchOrderSkuVoList?.length - 1 ? 'border' : null,
-        ].join(' ')}
-        key={item.orderSkuId}
-      >
-        {key === 'skuName' ? <PopoverDom name={item[key]} url={item.imageUrl} /> : ''}
-        {key === 'action' && props.type === 2 ? (
-          <Button
-            size="small"
-            type="primary"
-            onClick={() => {
-              handleCom(record, item);
-            }}
-          >
-            查看物流
-          </Button>
-        ) : (
-          item[key]
-        )}
-      </p>
-    ));
+  const renderContent = (record, key) => {
+    if (record.mchOrderSkuVoList) {
+      return record?.mchOrderSkuVoList.map((item, index) => (
+        <p
+          className={[
+            'tableContent',
+            index < record?.mchOrderSkuVoList?.length - 1 ? 'border' : null,
+          ].join(' ')}
+          key={item.orderSkuId}
+        >
+          {key === 'skuName' ? <PopoverDom name={item[key]} url={item.imageUrl} /> : ''}
+          {key === 'action' && props.type === 2 ? (
+            <Button
+              size="small"
+              type="primary"
+              onClick={() => {
+                handleCom(record, item);
+              }}
+            >
+              查看物流
+            </Button>
+          ) : (
+            item[key]
+          )}
+        </p>
+      ));
+    }
+    return '';
+  };
 
   const columns = [
     {