outaozhen 5 سال پیش
والد
کامیت
c4409ed31e
3فایلهای تغییر یافته به همراه15 افزوده شده و 6 حذف شده
  1. 1 1
      src/models/district.js
  2. 13 4
      src/pages/Customer/Contact/index.jsx
  3. 1 1
      src/pages/Customer/Contact/index.less

+ 1 - 1
src/models/district.js

@@ -16,7 +16,7 @@ export default {
         })
 
       }
-      console.log(response)
+      // console.log(response)
     }
   },
   // reducers:用于处理同步操作,由action触发,可修改state

+ 13 - 4
src/pages/Customer/Contact/index.jsx

@@ -109,8 +109,7 @@ const Contact = props => {
       title: '地区',
       dataIndex: 'local',
       key: 'local',
-      width: 100,
-      render: local => <a>{local}</a>
+      width: 100
     },
     {
       title: '个人标签',
@@ -200,7 +199,8 @@ const Contact = props => {
       title: '地址',
       dataIndex: 'address',
       key: 'address',
-      width: 100
+      width: 100,
+      ellipsis: true
     },
     {
       title: '乘车',
@@ -303,6 +303,11 @@ const Contact = props => {
     }
     options()
   }, [])
+  const {
+    districtName
+  } = props
+  const districtlist = [ ...districtName.data ]
+  console.log(districtlist)
 
   return (
     // <PageHeaderWrapper></PageHeaderWrapper>
@@ -310,7 +315,9 @@ const Contact = props => {
       <div className="zh-pd-24">
         <Cascader onChange={onChange} />
       </div>
+      <div className={styles.tableContent}>
       <ProTable
+        // className={styles.tableContent}
         rowKey={record => record.id}
         size="middle"
         columns={columns}
@@ -335,16 +342,18 @@ const Contact = props => {
           </Button>
         ]}
       />
+      </div>
       <Contacts onClose={hideDrawer} visible={visible} onCreate={onCreate} />
     </div>
   )
 }
 
-export default connect(({ global, loading }) => ({
+export default connect(({ district, global, loading }) => ({
   // export default connect(({ contact, global, loading })
   // contactName: contact,
   // data: contact.data,
   // total: contact.total,
+  districtName: district,
   collapsed: global.collapsed,
   getlist: loading.effects['contact/fetch']
 }))(Contact)

+ 1 - 1
src/pages/Customer/Contact/index.less

@@ -1,5 +1,5 @@
 .tableContent {
   :global(.ant-table-body) {
-    height: 700px;
+    height: 590px;
   }
 }