瀏覽代碼

Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5

魏熙美 5 年之前
父節點
當前提交
c1c706bc56

+ 6
- 4
src/pages/activity/ActivityList.jsx 查看文件

71
       key: 'title',
71
       key: 'title',
72
       align: 'center',
72
       align: 'center',
73
       // width: '15%',
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
       // width: '300px',
75
       // width: '300px',
76
-      // ellipsis:'true'
76
+      // ellipsis:'true'overflow: hidden; /*溢出隐藏*/
77
+// text-overflow: ellipsis; /*以省略号...显示*/
78
+// white-space: nowrap;
77
     },
79
     },
78
     {
80
     {
79
       title: '活动时间',
81
       title: '活动时间',
135
             {row.activityStatus != 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>}
137
             {row.activityStatus != 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>}
136
           </AuthButton>
138
           </AuthButton>
137
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
139
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
138
-            {row.isEnlist == 1 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
140
+            {row.activityStatus != 2 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
139
           </AuthButton>
141
           </AuthButton>
140
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
142
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
141
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
143
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
142
-            {row.isEnlist != 2 && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
144
+            {row.activityStatus != 2 && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
143
           </AuthButton>
145
           </AuthButton>
144
       {row.status === 1 &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist === 1 && '下载二维码'} {row.isEnlist === 1 && <Icon type="qrcode" className={styles.shoppingCart} />}</span>}
146
       {row.status === 1 &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist === 1 && '下载二维码'} {row.isEnlist === 1 && <Icon type="qrcode" className={styles.shoppingCart} />}</span>}
145
         </>
147
         </>

+ 1
- 0
src/pages/activity/groupActivity/helpRecord.jsx 查看文件

109
         dataIndex: 'createTime',
109
         dataIndex: 'createTime',
110
         key: 'createTime',
110
         key: 'createTime',
111
         align: 'center',
111
         align: 'center',
112
+        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
112
       },
113
       },
113
     ]
114
     ]
114
     return (
115
     return (

+ 4
- 4
src/pages/customer/customerlist/customerDetail.jsx 查看文件

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