Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/authConfig/memberSystem/index.tsx

@@ -79,8 +79,10 @@ const MemberSystem: React.FC<{}> = () => {
       dataIndex: 'option',
       align: 'center',
       render: (text:any, record:any) => {
-        return record.status === 0 ? (
-          <>
+        return <>
+          <Button type='link' onClick={()=>updateItem(record)}>修改</Button>
+          {
+            record.status === 0 ?
             <Popconfirm
               title="确定要执行这个操作?"
               onConfirm={() => deleteItem(record)}
@@ -89,9 +91,9 @@ const MemberSystem: React.FC<{}> = () => {
             >
               <Button type='link'>删除</Button>
             </Popconfirm>
-            <Button type='link' onClick={()=>updateItem(record)}>修改</Button>
-          </>
-        ) : null
+            : null
+          }
+        </>
       }
     }
   ];
@@ -145,7 +147,7 @@ const MemberSystem: React.FC<{}> = () => {
         }}
       />
     </Card>
-  </PageHeaderWrapper>      
+  </PageHeaderWrapper>
   )
 }
 

src/pages/home/components/Centers/Container.less

 .container {
-  padding: 24px 24px 16px 24px ;
+  padding: 24px;
   background-color: #fff;
+  border-radius: 8px;
   .header {
     display: flex;
     flex-direction: row;
@@ -24,4 +25,4 @@
   .body {
     margin-top: 12px;
   }
-}
+}
\ No newline at end of file

src/pages/transaction/purchaseOrder/orderCollect/constant/index.tsx

@@ -157,9 +157,9 @@ export const inquiryColumns: any[] = [
   },
   {
     title: '报价会员',
-    dataIndex: 'memberName',
+    dataIndex: 'offerMemberName',
     align: 'center',
-    key: 'memberName',
+    key: 'offerMemberName',
   },
   {
     title: '单据时间',