jifen

config/config.js

@@ -139,6 +139,11 @@ export default {
                   name: '商品列表',
                   component: './integralMall/GoodsList',
                 },
+                {
+                  path: '/integralMall/achieve',
+                  name: '积分获取',
+                  component: './integralMall/achieve',
+                },
                 {
                   path: '/integralMall/editGoods',
                   name: '',
@@ -149,6 +154,11 @@ export default {
                   name: '兑换记录',
                   component: './integralMall/exchangeRecords',
                 },
+                {
+                  path: '/integralMall/writeOff',
+                  name: '商品核销',
+                  component: './integralMall/writeOff',
+                },
               ],
             },
             {
@@ -273,7 +283,7 @@ export default {
     basePath: '/',
   },
   chainWebpack: webpackPlugin,
-  
+
   proxy: {
     '/api/': {
       target: 'http://192.168.0.84:8080/',
@@ -281,5 +291,5 @@ export default {
       // pathRewrite: { '^/server': '' },
     },
   },
-  
+
 };

src/global.less

@@ -99,4 +99,10 @@ ol {
 }
 .ant-pro-sider-menu-logo img{
   height: 41px;
+}
+.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active {
+  color: #FF7E48;
+}
+.ant-table{
+  line-height: 3;
 }

src/pages/integralMall/achieve.jsx

@@ -0,0 +1,91 @@
+import React from 'react';
+import { Form, Input, Button, Icon, Tabs, Row, Col, Table } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+
+
+const { TabPane } = Tabs;
+function callback(key) {
+  console.log(key);
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const dataSource = [
+  {
+    key: '1',
+    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
+    name: '华为P30 Pro',
+  },
+  {
+    key: '2',
+    img: '',
+    name: '大米',
+  },
+];
+
+const columns = [
+  {
+    title: '类型',
+    dataIndex: 'type',
+    key: 'type',
+    align: 'center',
+  },
+  {
+    title: '获取积分',
+    dataIndex: 'intergral',
+    key: 'intergral',
+    align: 'center',
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    key: 'state',
+    align: 'center',
+  },
+  {
+    title: '说明',
+    dataIndex: 'desc',
+    key: 'desc',
+    align: 'center',
+  },
+  {
+    title: '操作时间',
+    dataIndex: 'time',
+    key: 'time',
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'handle',
+    key: 'handle',
+    align: 'center',
+    render: () => <><span style={{ color: '#EF273A', marginRight: '20px' }} >停用<Icon type="stop" className={styles.shoppingCart} /></span><span style={{ color: '#EF273A', marginRight: '20px' }} >启用<Icon type="check-circle" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span></>,
+  },
+
+];
+
+
+function header(props) {
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+      <Tabs onChange={callback} type="card">
+        <TabPane tab="平台积分" key="1">
+          <Table style={{ marginTop: '40px' }} dataSource={dataSource} columns={columns} />
+        </TabPane>
+        <TabPane tab="项目积分" key="2">
+          <Table style={{ marginTop: '40px' }} dataSource={dataSource} columns={columns} />
+        </TabPane>
+      </Tabs>,
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/integralMall/exchangeRecords.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, Input, Button, Icon, Select, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, DatePicker, Table } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 
@@ -172,6 +172,72 @@ class DateRange2 extends React.Component {
   }
 }
 // 领取时间 组件  end
+const dataSource = [
+  {
+    key: '1',
+    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
+    name: '华为P30 Pro',
+  },
+  {
+    key: '2',
+    img: '',
+    name: '大米',
+  },
+];
+
+const columns = [
+
+  {
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+
+  },
+  {
+    title: '用户类型',
+    dataIndex: 'type',
+    key: 'type',
+    align: 'center',
+  },
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '商品图片',
+    dataIndex: 'img',
+    key: 'img',
+    align: 'center',
+    render: (text, record) => <img src={record.img} className={styles.touxiang} />,
+  },
+  {
+    title: '商品名称',
+    dataIndex: 'goodName',
+    key: 'goodName',
+    align: 'center',
+  },
+  {
+    title: '兑换时间',
+    dataIndex: 'time',
+    key: 'time',
+    align: 'center',
+  },
+  {
+    title: '领取时间',
+    dataIndex: 'time2',
+    key: 'time2',
+    align: 'center',
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    key: 'state',
+    align: 'center',
+  },
+];
 
 function record(props) {
   const { getFieldDecorator } = props.form
@@ -221,7 +287,6 @@ function record(props) {
             </Select>,
           )}
         </Form.Item>
-
         <Form.Item>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
@@ -234,6 +299,7 @@ function record(props) {
           <DateRange2 />
         </Form.Item>
       </Form>
+      <Table style={{ marginTop: '40px' }} dataSource={dataSource} columns={columns} />
     </>
   )
 }

src/pages/integralMall/writeOff.jsx

@@ -0,0 +1,73 @@
+import React from 'react';
+import { Form, Input, Button, Icon, Tabs, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import erweima from '../../assets/erweima.png';
+import saoma from '../../assets/saoma.png';
+import list from '../../assets/list.png';
+
+const { TabPane } = Tabs;
+function callback(key) {
+  console.log(key);
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+function header(props) {
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+      <Tabs onChange={callback} type="card">
+        <TabPane tab="扫码核销" key="1">
+          <Row>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>1</p>
+              <p>请用户出示核销的二维码</p>
+              <p>请将网页输入法切换成英文</p>
+            </Col>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={saoma} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>2</p>
+              <p>点击“立即核销”按钮</p>
+              <p>使用扫码枪扫描客户二维码</p>
+            </Col>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={list} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>3</p>
+              <p style={{ margin: '44px auto' }}>根据提示进行核销操作</p>
+            </Col>
+          </Row>
+          <Button type="primary" style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+        </TabPane>
+        <TabPane tab="手机号核销" key="2">
+          <Row>
+            <Col span={12} style={{ textAlign: 'center' }}>
+              <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>1</p>
+              <p>请输入用户的手机号</p>
+            </Col>
+            <Col span={12} style={{ textAlign: 'center' }}>
+              <img src={list} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>2</p>
+              <p>点击“立即核销”按钮</p>
+            </Col>
+          </Row>
+          <div style={{ margin: '110px auto', display: 'block',textAlign:'center' }}>
+            <Input placeholder="请输入手机号" style={{width:'200px'}} />
+            <Button type="primary" style={{marginLeft:'10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+          </div>
+        </TabPane>
+      </Tabs>,
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/style/GoodsList.less

@@ -36,4 +36,4 @@
   color: #dcdcdc;
   margin-left: 6px;
   font-size: 15px;
-}
+}