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

config/routes.js

@@ -142,7 +142,8 @@ export default [
               },
               {
                 path: '/integralMall/editAchieve',
-                name: '积分获取',
+                name: '积分编辑',
+                hideInMenu: true,
                 component: './integralMall/editAchieve',
               },
               {

src/pages/activity/SignList.jsx

@@ -30,13 +30,31 @@ const columns = [
     key: 'phone',
     align: 'center',
   },
+  {
+    title: '参与人数',
+    dataIndex: 'attendNum',
+    key: 'attendNum',
+    align: 'center',
+  },
   {
     title: '报名时间',
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
     render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>
-  }
+  },
+  {
+    title: '推广人',
+    dataIndex: 'sharePersonName',
+    key: 'sharePersonName',
+    align: 'center',
+  },
+  {
+    title: '公司',
+    dataIndex: 'orgName',
+    key: 'orgName',
+    align: 'center',
+  },
 ];
 
 

src/pages/integralMall/exchangeRecords.jsx

@@ -164,7 +164,7 @@ function record(props) {
             {getFieldDecorator('personType')(
               <Select style={{ minWidth: '1.1rem' }} placeholder="用户类型">
                 <Option value="Realty Consultant">置业顾问</Option>
-                <Option value="Sales Executive">销售主管</Option>
+                <Option value="customer">客户</Option>
                 <Option value="estate agent">经纪人</Option>
               </Select>,
             )}