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

src/pages/carouselFigure/advertisingList.jsx

       render: (image) => <img src={image} className={styles.imgSmall} />,
     },
     {
-      title: '类型',
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+    {
+      title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : '' }</span>
     },
     // {
     //   title: '发布位置',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+      render: (status)=> <><span>{status == 1 ? '上架' : '下架'}</span></>
     },
     {
       title: '操作',
       render: (x,row) => (
         <>
           <AuthButton name="admin.extendContent.id.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton>
         </>
       )
         });
   }
   
+  //删除
+const deleteCarouse = (contentId) => () =>{
+  Modal.confirm({
+    title: '确认删除此数据?',
+    okText: '确定',
+    cancelText: '取消',
+    onOk() {
+      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+        })
+    },
+  });
+}
+
 //   停用启用
   const changeStatus = (row) => () => {
       console.log(row)
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form.Item>
+          {getFieldDecorator('cityId')(
+             <SelectCity />,
+          )}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
-              <Option value="other">其他</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="">无</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">
-              <Option value="1">启用</Option>
-              <Option value="0">停用</Option>
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/carouselFigure/carouselFigureList.jsx

       render: (x, row) => <img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} />,
     },
     {
-      title: '类型',
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+    {
+      title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : '' }</span>
     },
     {
       title: '发布位置',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+      render: (status)=> <><span>{status == 1 ? '已上架' : '已下架'}</span></>
     },
     {
       title: '操作',
       render: (x,row) => (
         <>
           <AuthButton name="admin.extendContent.id.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer'}} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton>
         </>
       )
         });
   }
   
+//删除
+const deleteCarouse = (contentId) => () =>{
+  Modal.confirm({
+    title: '确认删除此数据?',
+    okText: '确定',
+    cancelText: '取消',
+    onOk() {
+      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+        })
+    },
+  });
+}
+
 //   停用启用
   const changeStatus = (row) => () => {
       console.log(row)
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+             <SelectCity />,
+          )}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="">无</Option>
               {/* <Option value="other">其他</Option> */}
             </Select>,
           )}
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">
-              <Option value="1">启用</Option>
-              <Option value="0">停用</Option>
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
             </Select>,
           )}
         </Form.Item>

src/services/apis.js

       method: 'PUT',
       action: 'admin.extendContent.id.put',
     },
+    deleteExtendContent: {
+      url: `${prefix}/extendContentDelete/:id`,
+      method: 'PUT',
+      action: 'admin.extendContent.id.put',
+    },
     getExtendContent: {
       url: `${prefix}/extendContent/:id`,
       method: 'GET',