Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

src/pages/carouselFigure/carouselFigureList.jsx

@@ -289,6 +289,7 @@ const header = props => {
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
+              <Option value="live">直播活动详情</Option>
               {/* <Option value="help">助力</Option>
               <Option value="group">拼团</Option>
               <Option value="h5">H5</Option> */}

src/pages/channel/independentList/index.jsx

@@ -350,6 +350,7 @@ function body(props) {
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
+      console.log(values)
       if (!err) {
         getList({ pageNum: 1, pageSize: 10, ...values });
       }
@@ -460,8 +461,8 @@ function body(props) {
     },
     {
       title: '姓名',
-      dataIndex: 'nickname',
-      key: 'nickname',
+      dataIndex: 'name',
+      key: 'name',
       render: (_, record) => (
         <>
           <span>{record.name || record.nickname}</span>

src/pages/findRoom/addedValueService/index.jsx

@@ -188,7 +188,7 @@ function Recommend() {
       placeholder: '请输入姓名',
     },
     {
-      name: 'tel',
+      name: 'phone',
       label: '电话',
       placeholder: '请输入电话',
     },
@@ -205,7 +205,7 @@ function Recommend() {
     //   ]
     // },
     {
-      name: 'verifyStatus',
+      name: 'status',
       label: '状态',
       placeholder: '请选择状态',
       type: 'select',

src/pages/findRoom/overseas/index.jsx

@@ -169,7 +169,7 @@ function Recommend() {
       placeholder: '请输入姓名',
     },
     {
-      name: 'tel',
+      name: 'phone',
       label: '电话',
       placeholder: '请输入电话',
     },
@@ -186,7 +186,7 @@ function Recommend() {
     //   ]
     // },
     {
-      name: 'verifyStatus',
+      name: 'status',
       label: '状态',
       placeholder: '请选择状态',
       type: 'select',

src/pages/findRoom/rent/index.jsx

@@ -181,7 +181,7 @@ function Recommend() {
       placeholder: '请输入姓名',
     },
     {
-      name: 'tel',
+      name: 'phone',
       label: '电话',
       placeholder: '请输入电话',
     },
@@ -198,7 +198,7 @@ function Recommend() {
     //   ]
     // },
     {
-      name: 'verifyStatus',
+      name: 'status',
       label: '状态',
       placeholder: '请选择状态',
       type: 'select',