fix: 修改筛选条件样式&商品信息添加规格

src/pages/orderManage/pendingDeliveryOrder/components/LogisticsForm.jsx

@@ -147,7 +147,7 @@ const LogisticsForm = props => {
                       message: '请填写物流单号!',
                     },
                   ],
-                })(<Input placeholder="请填写物流单号" />)}
+                })(<Input maxLength={30} placeholder="请填写物流单号" />)}
               </FormItem>
               <FormItem>
                 {getFieldDecorator(`${i}-serialNumber`, {

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

@@ -36,11 +36,14 @@ const DetailModal = (props, ref) => {
       dataIndex: 'skuName',
       width: 350,
       render: (value, record) => {
-        const { primaryImage } = record;
+        const { primaryImage, skuSpec } = record;
         return (
           <div className={style['sku-info']}>
             <img src={primaryImage} width="50px" height="50px" alt="" />
-            <span className={style['sku-info__name']}>{value}</span>
+            <div className={style['sku-info__box']}>
+              <p className={style['sku-info__box--name']}>{value}</p>
+              <p className={style['sku-info__box--spec']}>{skuSpec}</p>
+            </div>
           </div>
         );
       },

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

@@ -23,8 +23,15 @@
 
 .sku-info {
   display: flex;
-  .sku-info__name {
+  .sku-info__box {
     margin-left: 10px;
+    p {
+      margin: 0;
+      padding: 0;
+    }
+    &--spec {
+      color: #999;
+    }
   }
 }
 

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

@@ -22,10 +22,10 @@ const FormSearch = props => {
   } = props;
 
   const FormItemBox = ({ bindKey, label, column, children, afterRender }) => {
-    let columnValue = column;
-    if (afterRender) {
-      columnValue = '';
-    }
+    const columnValue = column;
+    // if (afterRender) {
+    //   columnValue = '';
+    // }
     return (
       <Form.Item
         className={style['custom-form-item']}
@@ -46,6 +46,7 @@ const FormSearch = props => {
       originOptions = {},
       afterRender = null,
       afterOptions = {},
+      column,
     } = config;
 
     // 提取公共部分
@@ -63,10 +64,14 @@ const FormSearch = props => {
 
     if (afterRender) {
       return (
-        <div className={style['custom-form-item-group']}>
+        <>
+          {/* // <div className={style['custom-form-item-group']}> */}
           <BaseSelectElement />
-          <FormItemBox {...afterOptions}>{afterRender()}</FormItemBox>
-        </div>
+          <FormItemBox column={column} {...afterOptions}>
+            {afterRender()}
+          </FormItemBox>
+          {/* // </div> */}
+        </>
       );
     }
 

src/pages/orderManage/queryOrder/components/FormSearch/index.less

@@ -27,6 +27,6 @@
   width: 100%;
 }
 
-.custom-form-item-group {
-  display: flex;
-}
+// .custom-form-item-group {
+//   display: flex;
+// }

src/pages/orderManage/queryOrder/const.js

@@ -75,7 +75,7 @@ export const ORDER_STATUS = [
 ];
 
 export const COUPON_CODE_STATUS = {
-  1: '待核销',
-  2: '已核销',
-  3: '已取消',
+  1: '未使用',
+  2: '已使用',
+  3: '已退款',
 };

src/pages/orderManage/queryOrder/index.jsx

@@ -124,11 +124,11 @@ const OrderList = ref => {
 
   const baseStyle = {
     style: {
-      width: '250px',
+      // width: '250px',
     },
   };
   const FormSearchProps = {
-    width: '1200px',
+    // width: '1200px',
     form,
     initialValues: {
       orderSearch: 'orderNo',
@@ -141,15 +141,13 @@ const OrderList = ref => {
         type: SEARCH_TYPE.SELECT,
         label: '订单搜索',
         bindKey: 'orderSearch',
-        column: 1,
+        column: 5,
         options: ORDER_SEARCH_TYPE,
         originOptions: {
           placeholder: '请选择',
           ...baseStyle,
         },
-        afterRender: () => (
-          <Input style={{ width: '300px', marginLeft: '10px' }} type="text"></Input>
-        ),
+        afterRender: () => <Input style={{ width: '100%' }} type="text"></Input>,
         afterOptions: {
           bindKey: 'orderSearchValue',
         },
@@ -157,7 +155,7 @@ const OrderList = ref => {
       {
         type: SEARCH_TYPE.RANGE_PICKER,
         label: '下单时间',
-        column: 1,
+        column: 5,
         bindKey: 'orderTime',
         originOptions: {
           placeholder: ['请选择', '请选择'],
@@ -167,7 +165,7 @@ const OrderList = ref => {
       {
         type: SEARCH_TYPE.INPUT,
         label: '商品名称',
-        column: 4,
+        column: 5,
         bindKey: 'skuName',
         originOptions: {
           placeholder: '请输入',
@@ -178,7 +176,7 @@ const OrderList = ref => {
         // 1-普通商品订单 2-虚拟商品订单 3-电子卡券 4-服务商品
         type: SEARCH_TYPE.SELECT,
         label: '订单类型',
-        column: 4,
+        column: 5,
         bindKey: 'productType',
         options: ORDER_TYPE,
         originOptions: {
@@ -189,7 +187,7 @@ const OrderList = ref => {
       {
         type: SEARCH_TYPE.SELECT,
         label: '订单状态',
-        column: 1,
+        column: 5,
         bindKey: 'orderStatus',
         options: ORDER_STATUS,
         originOptions: {
@@ -225,11 +223,14 @@ const OrderList = ref => {
       align: 'left',
       width: 350,
       render: ({ value, subRecord }) => {
-        const { primaryImage } = subRecord;
+        const { primaryImage, skuSpec } = subRecord;
         return (
           <div className={style['sku-info']}>
             <img src={primaryImage} width="50px" height="50px" alt="" />
-            <span className={style['sku-info__name']}>{value}</span>
+            <div className={style['sku-info__box']}>
+              <p className={style['sku-info__box--name']}>{value}</p>
+              <p className={style['sku-info__box--spec']}>{skuSpec}</p>
+            </div>
           </div>
         );
       },

src/pages/orderManage/queryOrder/index.less

@@ -33,8 +33,15 @@
 
 .sku-info {
   display: flex;
-  .sku-info__name {
+  .sku-info__box {
     margin-left: 10px;
+    p {
+      margin: 0;
+      padding: 0;
+    }
+    &--spec {
+      color: #999;
+    }
   }
 }