zls

src/pages/activity/ActivityList.jsx

@@ -175,9 +175,9 @@ const header = props => {
           <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '取消发布' : '发布'} onClick={sendOrPublicDynamic.bind(this, row)} />
         </AuthButton>,
 
-        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
-          <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.dynamicId)} />
-        </AuthButton>,
+    
+          <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.dynamicId)} />,
+        
 
         row.activityStatus === 0 ?
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>

src/pages/activity/drainage/DrainageList.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Select, message, Table, Pagination, Modal, DatePicker, Radio } from 'antd';
+import { Form, Input, Button, Select, message, Table, Pagination, Typography, Modal, DatePicker, Radio } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import Prompt from 'umi/prompt';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
 import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
@@ -56,7 +57,7 @@ const header = (props) => {
 
   }, [])
 
-  function gettaDrainage (params) {
+  function gettaDrainage(params) {
     request({ ...apis.activity.taDrainage, params: params }).then((data) => {
       setDatas(data)
       console.log(data.records, '_213_')
@@ -71,7 +72,7 @@ const header = (props) => {
       title: '确认删除该引流？',
       okText: '确认',
       cancelText: '取消',
-      onOk () {
+      onOk() {
         request({ ...apis.activity.deletetaDrainage, urlData: { id: drainageIid }, }).then((data) => {
           message.info('操作成功！')
           gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
@@ -110,13 +111,13 @@ const header = (props) => {
   }
 
   const exchangeDrainage = drainage => () => {
-    if(drainage.status === 1){
-      if(drainage.isMiniapp){
+    if (drainage.status === 1) {
+      if (drainage.isMiniapp) {
         Modal.confirm({
           title: '下架后当前H5活动关联的小程序端开屏图、banner图等也会自动下架。',
           okText: '确认',
           cancelText: '取消',
-          onOk () {
+          onOk() {
             request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
               message.info('操作成功！')
               gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
@@ -126,7 +127,7 @@ const header = (props) => {
             })
           }
         });
-      }else{
+      } else {
         request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
           message.info('H5活动已下架！')
           gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
@@ -135,8 +136,8 @@ const header = (props) => {
           message.info(err.msg || err.message)
         })
       }
-      
-    }else{
+
+    } else {
       request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
         message.info('H5活动已上架！')
         gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
@@ -145,7 +146,7 @@ const header = (props) => {
         message.info(err.msg || err.message)
       })
     }
-    
+
   }
 
   const columns = [
@@ -160,18 +161,14 @@ const header = (props) => {
       dataIndex: 'isMiniapp',
       key: 'isMiniapp',
       align: 'cenxter',
-      render: (isMiniapp) => <span>{ isMiniapp ? '是' : '否'  }</span>, 
+      render: (isMiniapp) => <span>{isMiniapp ? '是' : '否'}</span>,
     },
     {
       title: 'H5项目名称',
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      render: (text, datas) => <>
-
-        <div style={{ color: '#66B3FF', cursor: 'pointer' }} onClick={toDrainageDetail(datas.drainageId)}>{datas.name}</div>
-
-      </>
+      render: (text, datas) => <Navigate onClick={toDrainageDetail(datas.drainageId)}><Typography.Text ellipsis>{datas.name}</Typography.Text></Navigate>,
     },
     {
       title: '链接地址',
@@ -185,7 +182,7 @@ const header = (props) => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-    render: (status) => <span>{status === 1 ? '已上架' : '已下架'}</span>,
+      render: (status) => <span>{status === 1 ? '已上架' : '已下架'}</span>,
     },
     {
       title: '新建时间',
@@ -226,24 +223,26 @@ const header = (props) => {
           <EditIcon type="edit" text="编辑" onClick={() => addshowModal(datas)} />
         </AuthButton>,
 
+        <EditIcon type="look" text="查看详情" onClick={toDrainageDetail(datas.drainageId)} />,
+
         <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
           <EditIcon type="delete" text="删除" onClick={deleteDrainage(datas.drainageId)} />
         </AuthButton >,
 
-          <AuthButton name="admin.taDrainage.publish" noRight={null}>
-            <EditIcon type={datas.status === 1 ? 'cancel' : 'publish'} text={datas.status === 1 ? '下架' : '上架'} onClick={exchangeDrainage(datas)} />
-          </AuthButton>,
+        <AuthButton name="admin.taDrainage.publish" noRight={null}>
+          <EditIcon type={datas.status === 1 ? 'cancel' : 'publish'} text={datas.status === 1 ? '下架' : '上架'} onClick={exchangeDrainage(datas)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.taDrainage.data" noRight={null}>
+          <EditIcon text="数据" onClick={toEditList(datas.drainageId)} />
+        </AuthButton>,
 
-          <AuthButton name="admin.taDrainage.data" noRight={null}>
-            <EditIcon color="#666" text="数据" onClick={toEditList(datas.drainageId)} />
-          </AuthButton>,
 
-          
-          <EditIcon color="#666" type="record" text="数据记录" onClick={toDataReacord(datas)} />,
+        <EditIcon type="record" text="数据记录" onClick={toDataReacord(datas)} />,
 
-          <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
-            <EditIcon color="#666" text="下载二维码" onClick={newQrcode.bind(this, datas)} />
-          </AuthButton >,
+        <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
+          <EditIcon text="下载二维码" onClick={newQrcode.bind(this, datas)} />
+        </AuthButton >,
       ]),
     },
   ];
@@ -256,7 +255,7 @@ const header = (props) => {
     // }, [formsDate])
 
     const [hiddenStatus, setHiddenStatus] = useState(formsdate.isMiniapp)
-    
+
     const handleSubmit = e => {
       e.preventDefault();
       props.form.validateFields((err, values) => {
@@ -322,9 +321,9 @@ const header = (props) => {
     };
 
     const changeMiniapp = e => {
-      if(e.target.value == 1){
+      if (e.target.value == 1) {
         setHiddenStatus(true)
-      }else{
+      } else {
         setHiddenStatus(false)
       }
     }
@@ -335,8 +334,8 @@ const header = (props) => {
     return <Form {...formItemLayout} onSubmit={handleSubmit}>
 
       <Form.Item label="是否投放小程序端" help='选择是后,该活动可投放至小程序的轮播位以及开屏广告'>
-        {getFieldDecorator('isMiniapp',{
-          initialValue : formsDate.isMiniapp ? 1 : 0,
+        {getFieldDecorator('isMiniapp', {
+          initialValue: formsDate.isMiniapp ? 1 : 0,
           rules: [
             { required: true, message: '请选择是否投放小程序' },
           ],
@@ -348,7 +347,8 @@ const header = (props) => {
         )}
       </Form.Item>
       <Form.Item label="H5项目名称">
-        {getFieldDecorator('name',{initialValue : formsDate.name,
+        {getFieldDecorator('name', {
+          initialValue: formsDate.name,
           rules: [
             { required: true, message: '请输入H5项目名称' },
           ],
@@ -359,25 +359,29 @@ const header = (props) => {
         )}
       </Form.Item>
       {hiddenStatus && (<Form.Item label="选择项目">
-        {getFieldDecorator('buildingId',{initialValue : formsDate.buildingId})(
-            <BuildSelect />,
+        {getFieldDecorator('buildingId', { initialValue: formsDate.buildingId })(
+          <BuildSelect />,
         )}
       </Form.Item>)}
       <Form.Item label="下架时间">
-        {getFieldDecorator('endDate',{initialValue : formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
+        {getFieldDecorator('endDate', {
+          initialValue: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
           rules: [
             { required: true, message: '请输入下架时间' },
-          ]})(
+          ]
+        })(
           <DatePicker
-          showTime={{ format: 'HH:mm:ss' }}
+            showTime={{ format: 'HH:mm:ss' }}
           />,
         )}
       </Form.Item>
       {hiddenStatus && (<Form.Item label="活动链接地址">
-        {getFieldDecorator('h5Address',{initialValue : formsDate.h5Address,
+        {getFieldDecorator('h5Address', {
+          initialValue: formsDate.h5Address,
           rules: [
             { required: true, message: '请输入H5活动链接地址' },
-          ]})(
+          ]
+        })(
           <Input
             placeholder="请输入H5活动链接地址"
             disabled={formsDate.isMiniapp}
@@ -385,16 +389,20 @@ const header = (props) => {
         )}
       </Form.Item>)}
       {hiddenStatus && (<Form.Item label="分享设置" help="建议图片尺寸：750*600px，比例5:4,格式：jpg">
-          {getFieldDecorator('shareImg',{initialValue : formsDate.shareImg,
+        {getFieldDecorator('shareImg', {
+          initialValue: formsDate.shareImg,
           rules: [
             { required: true, message: '请选择分享图片' },
-          ]})(<ImageUploader />)}
+          ]
+        })(<ImageUploader />)}
       </Form.Item>)}
       {hiddenStatus && (<Form.Item label="活动分享语">
-        {getFieldDecorator('shareTitle',{initialValue : formsDate.shareTitle,
+        {getFieldDecorator('shareTitle', {
+          initialValue: formsDate.shareTitle,
           rules: [
             { required: true, message: '请输入活动分享语' },
-          ]})(
+          ]
+        })(
           <Input
             placeholder="分享语，不超过15个字"
             maxLength="15"
@@ -402,10 +410,12 @@ const header = (props) => {
         )}
       </Form.Item>)}
       {hiddenStatus && (<Form.Item label="中间页飞机图" help="建议图片尺寸：750*1667px，比例9:20,格式：jpg。图片底部不要放置关键信息。">
-          {getFieldDecorator('middleImg',{initialValue : formsDate.middleImg,
+        {getFieldDecorator('middleImg', {
+          initialValue: formsDate.middleImg,
           rules: [
             { required: true, message: '请选择中间页飞机图' },
-          ]})(<ImageUploader />)}
+          ]
+        })(<ImageUploader />)}
       </Form.Item>)}
       <Form.Item {...tailFormItemLayout}>
         <AuthButton name="admin.taDrainage.id.put" noRight={null}>
@@ -425,7 +435,7 @@ const header = (props) => {
 
 
   //重置搜索
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
     localStorage.setItem("drainageActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
     gettaDrainage({ pageNum: 1, pageSize: 10 })
@@ -433,7 +443,7 @@ const header = (props) => {
 
 
 
-  function addshowModal (datas) {
+  function addshowModal(datas) {
 
     // alert(datas.drainageId)
     setFormsDate(datas)
@@ -443,7 +453,7 @@ const header = (props) => {
     });
   };
 
-  function showModal () {
+  function showModal() {
     setFormsDate({
       drainageId: '',
       name: '',
@@ -463,14 +473,14 @@ const header = (props) => {
     });
   }
 
-  function handleOk () {
+  function handleOk() {
 
 
     setDate({
       ModalText: 'The modal will be closed after two seconds',
       confirmLoading: true,
     });
-    function setTimeout () {
+    function setTimeout() {
       setDate({
         visible: false,
         confirmLoading: false,
@@ -478,13 +488,13 @@ const header = (props) => {
     };
   };
 
-  function handleCancel () {
+  function handleCancel() {
     console.log('Clicked cancel button');
     setDate({
       visible: false,
     });
   };
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       console.log('values', values)
@@ -498,10 +508,10 @@ const header = (props) => {
 
   //打开新页面
   const openIndexImg = () => {
-    const newWin=window.open('about:blank');
-    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%A1%88%E4%BE%8B.png"
+    const newWin = window.open('about:blank');
+    newWin.location.href = "http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%A1%88%E4%BE%8B.png"
   }
-  
+
   const { getFieldDecorator } = props.form;
   const { visible, confirmLoading, ModalText, title } = date;
   return (
@@ -527,27 +537,27 @@ const header = (props) => {
             )}
           </Form.Item>
           <Form.Item>
-          {getFieldDecorator('isMiniapp')(
-            <Select style={{ width: '180px' }} placeholder="是否投放小程序">
-              <Option value="1">是</Option>
-              <Option value="0">否</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('status')(
-            <Select style={{ width: '180px' }} placeholder="上架状态">
-              <Option value="1">已上架</Option>
-              <Option value="0">已下架</Option>
-            </Select>,
-          )}
-        </Form.Item>
+            {getFieldDecorator('isMiniapp')(
+              <Select style={{ width: '180px' }} placeholder="是否投放小程序">
+                <Option value="1">是</Option>
+                <Option value="0">否</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('status')(
+              <Select style={{ width: '180px' }} placeholder="上架状态">
+                <Option value="1">已上架</Option>
+                <Option value="0">已下架</Option>
+              </Select>,
+            )}
+          </Form.Item>
           <Form.Item >
-          <AuthButton name="admin.taDrainage.search" noRight={null}>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
-              搜索
+            <AuthButton name="admin.taDrainage.search" noRight={null}>
+              <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
+                搜索
           </Button>
-          </AuthButton>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
@@ -556,7 +566,7 @@ const header = (props) => {
         <AuthButton name="admin.taDrainage.add.post" noRight={null}>
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
         </AuthButton>
-          <span style={{ color: '#66B3FF', cursor: 'pointer', margin: '20px',display:'inline-block' }} onClick={openIndexImg}>优质案例</span>
+        <span style={{ color: '#66B3FF', cursor: 'pointer', margin: '20px', display: 'inline-block' }} onClick={openIndexImg}>优质案例</span>
         <Modal
           title={title}
 
@@ -568,13 +578,13 @@ const header = (props) => {
         >
           <Formss formsDate={formsdate} />
         </Modal>
-        <Table 
-        // onRow={record => {
-        //   return {
-        //     onClick: toDrainageDetail(record.drainageId),
-        //   };
-        // }}
-        columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
+        <Table
+          // onRow={record => {
+          //   return {
+          //     onClick: toDrainageDetail(record.drainageId),
+          //   };
+          // }}
+          columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
           <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} current={datas.current} />
         </div>

src/pages/activity/groupActivity/list.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Typography, Pagination, Modal } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
@@ -92,8 +92,7 @@ const header = props => {
       dataIndex: 'activityName',
       key: 'activityName',
       align: 'center',
-      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <Navigate onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</Navigate></div></>,
+      render: (x, row) => <Navigate onClick={getActivityDetail(row.groupActivityId)}><Typography.Text ellipsis>{row.activityName}</Typography.Text></Navigate>,
     },
     {
       title: '活动时间',
@@ -147,6 +146,9 @@ const header = props => {
       align: 'center',
       width: 400,
       render: withActions((x, row) => [
+
+        <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.groupActivityId)} />,
+
         row.activityStatus === 0 ?
           <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
             <EditIcon type="end" text="结束活动" onClick={endGroupActivity(row)} />
@@ -161,14 +163,14 @@ const header = props => {
           </AuthButton>,
             
           <AuthButton name="admin.taShareActivity.top" noRight={null}>
-            <EditIcon color={row.activityStatus === 0 ? '#666' : undefined} type={row.sort === 1 ? 'cancel' : 'add'} text={row.sort === 1 ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
+            <EditIcon type={row.sort === 1 ? 'cancel' : 'add'} text={row.sort === 1 ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
           </AuthButton>,
 
-          <EditIcon color="#666" type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,
+          <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,
 
           (row.activityStatus === 0 || row.activityStatus === 1) ?
             <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
-              <EditIcon color="#666" type="edit" text="编辑" onClick={toEditActivity(row.groupActivityId)} />
+              <EditIcon type="edit" text="编辑" onClick={toEditActivity(row.groupActivityId)} />
             </AuthButton> : null,
       ]),
     },

src/pages/activity/helpActivity/list.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Pagination, Typography, Modal, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
@@ -86,9 +86,7 @@ const header = props => {
       dataIndex: 'title',
       key: 'title',
       align: 'center',
-      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <Navigate onClick={getActivityDetail(row.helpActivityId)}>{row.title}</Navigate>
-        </div></>,
+      render: (x, row) => <Navigate onClick={getActivityDetail(row.helpActivityId)}><Typography.Text ellipsis>{row.title}</Typography.Text></Navigate>,
     },
     {
       title: '活动时间',
@@ -104,7 +102,7 @@ const header = props => {
       align: 'center',
       render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
         <Navigate onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</Navigate>
-        </div></>,
+      </div></>,
     },
     {
       title: '助力成功数',
@@ -144,20 +142,22 @@ const header = props => {
             <EditIcon type="end" text="结束活动" onClick={topDynamic(row, 2)} />
           </AuthButton> : null,
 
+        <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.helpActivityId)} />,
+
         <AuthButton name="admin.help.tag" noRight={null}>
           <EditIcon type={row.weight === 1 ? 'cancel' : 'add'} text={row.weight === 1 ? '取消标签' : '添加标签'} onClick={topDynamic(row, 0)} />
         </AuthButton>,
 
         <AuthButton name="admin.help.top" noRight={null}>
-          <EditIcon type={row.isMain === 1 ? 'cancel' : 'add'} color="#666" text={row.isMain === 1 ? '取消推首页' : '推首页'} onClick={topDynamic(row, 1)} />
+          <EditIcon type={row.isMain === 1 ? 'cancel' : 'add'} text={row.isMain === 1 ? '取消推首页' : '推首页'} onClick={topDynamic(row, 1)} />
         </AuthButton>,
 
-        <EditIcon type="record" text="数据记录" color="#666" onClick={() => toDataReacord(row.helpActivityId)} />,
+        <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />,
 
         (row.activityStatus === 1 || row.activityStatus === 0) ?
-            <AuthButton name="admin.helpActivity.update.put" noRight={null}>
-              <EditIcon color="#666" type="edit" text="编辑" onClick={toEditGoods(row.helpActivityId)} />
-            </AuthButton> : null,
+          <AuthButton name="admin.helpActivity.update.put" noRight={null}>
+            <EditIcon type="edit" text="编辑" onClick={toEditGoods(row.helpActivityId)} />
+          </AuthButton> : null,
       ]),
     },
   ];