周立森 5 jaren geleden
bovenliggende
commit
86ce8b0157
2 gewijzigde bestanden met toevoegingen van 6 en 4 verwijderingen
  1. 4
    2
      src/pages/activity/ActivityList.jsx
  2. 2
    2
      src/pages/customer/customerlist/customerDetail.jsx

+ 4
- 2
src/pages/activity/ActivityList.jsx Bestand weergeven

@@ -71,9 +71,11 @@ const header = props => {
71 71
       key: 'title',
72 72
       align: 'center',
73 73
       // width: '15%',
74
-      render:  (x, row) => <><div style={{wordWrap: 'break-word',  width: '201px'}}>{row.title}</div></>,
74
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>{row.title}</div></>,
75 75
       // width: '300px',
76
-      // ellipsis:'true'
76
+      // ellipsis:'true'overflow: hidden; /*溢出隐藏*/
77
+// text-overflow: ellipsis; /*以省略号...显示*/
78
+// white-space: nowrap;
77 79
     },
78 80
     {
79 81
       title: '活动时间',

+ 2
- 2
src/pages/customer/customerlist/customerDetail.jsx Bestand weergeven

@@ -32,7 +32,7 @@ function header(props) {
32 32
 
33 33
     request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
34 34
       setData(res)
35
-      setDataonsultant(res.consultant)
35
+      setDataonsultant(res.geoInfo)
36 36
     })
37 37
   }
38 38
 
@@ -92,7 +92,7 @@ function header(props) {
92 92
           <p className={styles.rightItem}>预约到访时间:{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p>
93 93
           <div className={styles.rightInfo}>
94 94
             <p className={styles.rightItem}>国家:{ dataConsultant.country }</p>
95
-            <p className={styles.rightItem}>省份:{ dataConsultant.province }</p>
95
+            <p className={styles.rightItem}>省份:{ dataConsultant.provience }</p>
96 96
             <p className={styles.rightItem}>城市:{dataConsultant.city }</p>
97 97
             <p className={styles.rightItem}>详细信息:</p>
98 98
             <p className={styles.rightItem}>意向项目:{data.intention }</p>