commit

src/pages/marketingTools/components/step1.jsx

@@ -10,11 +10,11 @@ function CreatActivity(props) {
     const formItemLayout = {
         labelCol: {
             xs: { span: 24 },
-            sm: { span: 5 },
+            sm: { span: 4 },
         },
         wrapperCol: {
             xs: { span: 24 },
-            sm: { span: 16 },
+            sm: { span: 19 },
         },
     };
 
@@ -30,7 +30,7 @@ function CreatActivity(props) {
 
     return (
         <>
-            <Form {...formItemLayout} onSubmit={handleSubmit}>
+            <Form {...formItemLayout} style={{ minWidth: '600px' }} onSubmit={handleSubmit}>
                 <p className={Styles.title}>基本信息</p>
                 <Form.Item label="活动名称" >
                     {getFieldDecorator('activityName', {
@@ -65,7 +65,7 @@ function CreatActivity(props) {
                     })(
                         <Radio.Group>
                             <Radio value={1}>无线抽奖</Radio>
-                            <Radio value={2}>积分抽奖，消耗 {getFieldDecorator('integral')(<InputNumber min={1} />)} 积分</Radio>
+                            <Radio value={2}>积分抽奖，消耗 {getFieldDecorator('integral')(<InputNumber size="small" min={1} />)} 积分</Radio>
                         </Radio.Group>,
                     )}
                 </Form.Item>
@@ -77,28 +77,24 @@ function CreatActivity(props) {
                         <Radio.Group>
                             <Radio value={1}>
                                 一天N次
-                                <div style={{ marginTop: '8px' }}>每人每天抽 {getFieldDecorator('times1')(<InputNumber min={1} />)} 次</div>
-                                <div>每天分享额外抽 {getFieldDecorator('times2')(<InputNumber min={1} />)} 次</div>
+                                <div style={{ margin: '10px 0' }}>每人每天抽 {getFieldDecorator('times1')(<InputNumber size="small" min={1} />)} 次</div>
+                                <div style={{width:'400px'}}>每天分享额外抽 {getFieldDecorator('times2')(<InputNumber size="small" min={1} />)} 次</div>
                             </Radio>
                             <Radio value={2}>
                                 一人N次
-                                        <div style={{ marginTop: '8px' }}>每人一共可抽 {getFieldDecorator('times3')(<InputNumber min={1} />)} 次</div>
-                                <div>每人分享额外抽 {getFieldDecorator('times4')(<InputNumber min={1} />)} 次</div>
+                                <div style={{ margin: '10px 0' }}>每人一共可抽 {getFieldDecorator('times3')(<InputNumber size="small" min={1} />)} 次</div>
+                                <div>每人分享额外抽 {getFieldDecorator('times4')(<InputNumber size="small" min={1} />)} 次</div>
                             </Radio>
                         </Radio.Group>,
                     )}
                 </Form.Item>
-
-
-
-                <Form.Item style={{ width: '500px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
-                    <Button onClick={() => router.go(-1)} style={{ margin: '0 20px' }}>
-                        取消
-                    </Button>
-
-                    <Button type="primary" htmlType="submit">
+                <Form.Item style={{ width: '400px', position: 'absolute', bottom: '70px', left: '600px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                    <Button type="primary" htmlType="submit" style={{ margin: '0 40px' }}>
                         下一步
                     </Button>
+                    <Button onClick={() => router.go(-1)}>
+                        取消
+                    </Button>
                 </Form.Item>
             </Form>
         </>

src/pages/marketingTools/components/step2.jsx

@@ -8,11 +8,11 @@ function Award(props) {
     const formItemLayout = {
         labelCol: {
             xs: { span: 24 },
-            sm: { span: 5 },
+            sm: { span: 4 },
         },
         wrapperCol: {
             xs: { span: 24 },
-            sm: { span: 16 },
+            sm: { span: 19 },
         },
     };
     const list = [
@@ -119,9 +119,6 @@ function Award(props) {
     return (
         <>
             <Form {...formItemLayout} onSubmit={handleSubmit}>
-                <p className={Styles.title}>奖品设置</p>
-                <p className={Styles.blue}>添加奖品</p>
-                <Table className={Styles.table} bordered dataSource={list} columns={columns} pagination={false} rowKey={(x => x.index)} />
                 <p className={Styles.title} style={{ marginTop: '20px' }}>未中奖设置</p>
                 <Form.Item label="名称" >
                     {getFieldDecorator('name', {
@@ -158,14 +155,18 @@ function Award(props) {
 
                     )}
                 </Form.Item>
-
-                <Form.Item style={{ width: '500px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
-                    <Button onClick={() => props.onPre()} style={{ margin: '0 20px' }}>
-                        上一步
-                    </Button>
-                    <Button type="primary" htmlType="submit">
+                <div >
+                    <p className={Styles.title}>奖品设置</p>
+                    <p className={Styles.blue}>添加奖品</p>
+                    <Table className={Styles.table} bordered dataSource={list} columns={columns} pagination={false} rowKey={(x => x.index)} />
+                </div>
+                <Form.Item style={{ width: '400px', position: 'absolute', bottom: '70px', left: '600px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                    <Button type="primary" htmlType="submit" style={{ margin: '0 40px' }}>
                         下一步
                     </Button>
+                    <Button onClick={() => props.onPre()} >
+                        上一步
+                    </Button>
                 </Form.Item>
             </Form>
         </>

src/pages/marketingTools/components/style.less

@@ -1,9 +1,7 @@
 .title{
     font-weight: 600;
-    border-bottom: 1px solid #eee;
-    font-size: 15px;
-    padding-bottom: 6px;
-    margin-bottom: 20px;
+    font-size: 16px;
+    margin-bottom: 30px;
 }
 .blue{
     color: #1D74D9;

src/pages/marketingTools/index.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import { Row, Col } from 'antd';
+import { Row, Col, message } from 'antd';
 import router from 'umi/router';
 import Styles from './style.less';
+import lotteryTop from '../../assets/lotteryTop.png'
 import bargain from '../../assets/market/bargain.png'
 import card from '../../assets/market/card.png'
 import collage from '../../assets/market/collage.png'
@@ -65,30 +66,34 @@ const Market = props => {
     ]
 
     const handleItem = (url) => {
-
-        router.push({
-            pathname: url,
-        });
+        if (url) {
+            router.push({
+                pathname: url,
+            });
+        } else {
+            message.info('正在积极开发中');
+        }
     }
 
     return <>
-        <p>营销工具：抓取客户，社交裂变</p>
+        {/* <p>营销工具：抓取客户，社交裂变</p> */}
+        <img src={lotteryTop} className={Styles.lotteryTop}></img>
 
-            <Row style={{width:'100%'}}>
-                {
-                    list.map((item, index) => (
-                        <Col span={8}>
-                            <div key={index} className={Styles.itemBox} onClick={() => handleItem(item.url)}>
-                                <img className={Styles.img} src={item.img} ></img>
-                                <div>
-                                    <p style={{ fontSize: '18px' }}>{item.title}</p>
-                                    <p style={{ fontSize: '15px', color: '#999', marginBottom: '0px' }}>{item.desc}</p>
-                                </div>
+        <Row style={{ width: '100%' }}>
+            {
+                list.map((item, index) => (
+                    <Col span={8}>
+                        <div key={index} className={Styles.itemBox} onClick={() => handleItem(item.url)}>
+                            <img className={Styles.img} src={item.img} ></img>
+                            <div>
+                                <p style={{ fontSize: '17px', fontWeight: '600', color: '#333' }}>{item.title}</p>
+                                <p style={{ fontSize: '15px', color: '#666', marginBottom: '0px' }}>{item.desc}</p>
                             </div>
-                        </Col>
-                    ))
-                }
-            </Row>
+                        </div>
+                    </Col>
+                ))
+            }
+        </Row>
     </>
 }
 

src/pages/marketingTools/lottery/add.jsx

@@ -5,12 +5,13 @@ import Step1 from '../components/step1'
 import Step2 from '../components/step2'
 import Step3 from '../components/step3'
 import Step4 from '../components/step4'
+import lotteryImg from '../../../assets/choujiang1.png'
 
 function AddActivity(props) {
     const { getFieldDecorator } = props.form;
     const { RangePicker } = DatePicker;
 
-    const [tab, setTab] = useState('0')
+    const [tab, setTab] = useState('1')
 
 
     const tabTitle = [
@@ -21,7 +22,6 @@ function AddActivity(props) {
     ]
 
 
-    const img = 'http://123.57.65.31:8081/axure/%E8%90%A5%E9%94%80%E4%BA%91/%e8%90%a5%e9%94%80%e4%ba%91V3.5.30%e6%a9%99%e8%95%89%e6%8e%a8%e5%b9%bf/images/%E6%96%B0%E5%A2%9E%E5%B9%B8%E8%BF%90%E5%A4%A7%E6%8A%BD%E5%A5%96_v3_5_30_/u4584.png'
     return (
         <>
             <div className={Styles.tabBox}>
@@ -32,11 +32,6 @@ function AddActivity(props) {
                 }
             </div>
             <div className={Styles.content}>
-                {tab != '3' && <>
-                    <div className={Styles.img}>
-                        <img src={img}></img>
-                    </div>
-                </>}
 
                 {tab == '0' && <><Step1 onNext={() => setTab('1')} /></>}
                 {tab == '1' && <>
@@ -49,6 +44,12 @@ function AddActivity(props) {
                     <Step4 onRefresh={() => setTab('0')} />
                 </>}
 
+                {tab != '3' && <>
+                    <div className={Styles.img}>
+                        <img src={lotteryImg} style={{ width: '300px' }}></img>
+                    </div>
+                </>}
+
             </div>
         </>
     )

src/pages/marketingTools/lottery/index.jsx

@@ -1,6 +1,8 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Button, Select, Icon, message, Table, Pagination, Input, Modal } from 'antd';
+import React, { useState } from 'react';
+import { Form, Button, Select, Icon, Table, Pagination, Input, Modal } from 'antd';
 import router from 'umi/router';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 
@@ -94,12 +96,12 @@ const Lottery = (props) => {
             dataIndex: 'handle',
             key: 'handle',
             align: 'center',
-            render: () => <>
-                <span style={{ color: '#FF4A4A', marginRight: '6px', cursor: 'pointer' }} onClick={() => toData()}>数据</span>
-                <span style={{ color: '#FF4A4A', marginRight: '6px', cursor: 'pointer' }} onClick={() => setVisible(true)}>推广</span>
-                <span style={{ color: '#FF4A4A', marginRight: '6px' }} onClick={() => toEdit()}>编辑</span>
-                <span style={{ color: '#FF4A4A' }}>删除</span>
-            </>
+            render: withActions((text, record) => [
+                <EditIcon color="#FF7E48" type="edit" text="编辑" onClick={() => toEdit()} />,
+                <EditIcon color="#FF4A4A" type="publish" text="推广" onClick={() => setVisible(true)} />,
+                <EditIcon color="#FF4A4A" type="data" text="数据" onClick={() => toData()} />,
+                <EditIcon color="#FF4A4A" type="delete" text="删除" />
+            ]),
         },
     ];
 

src/pages/marketingTools/lottery/style.less

@@ -24,15 +24,11 @@
 .content{
     display: flex;
     padding: 60px 10%;
+    margin-bottom: 60px;
   
 }
-.title{
-    font-weight: 600;
-    border-bottom: 1px solid #eee;
-    font-size: 15px;
-    padding-bottom: 6px;
-    margin-bottom: 20px;
-}
+
 .img{
-    margin-right: 80px;
+    margin-left: 80px;
+    margin-top: 40px;
 }

src/pages/marketingTools/style.less

@@ -1,3 +1,8 @@
+.lotteryTop{
+    padding:  0 15px 15px 15px;
+    width: 100%;
+    min-width: 1400px;
+}
 
 .itemBox{
     height: 132px;