fix

config/proxy.js

@@ -17,7 +17,7 @@ export default {
   },
   test: {
     '/api/': {
-      target: 'https://preview.pro.ant.design',
+      target: 'https://xlk.njyz.tech',
       changeOrigin: true,
       pathRewrite: {
         '^': '',

src/pages/carouselFigure/carouselFigureList.jsx

@@ -6,39 +6,39 @@ import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
 import Navigate from '@/components/Navigate';
-import SelectCity from '../../components/SelectButton/CitySelect'
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import SelectCity from '../../components/SelectButton/CitySelect';
+import BuildSelect from '../../components/SelectButton/BuildSelect';
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import styles from '../style/GoodsList.less';
+import {getImgURL} from '../../utils/image';
 
 const { Option } = Select;
 
-const header = (props) => {
-  const [data, setData] = useState({})
+const header = props => {
+  const [data, setData] = useState({});
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
-  }, [])
+  }, []);
 
   // 查询列表
-  const getList = (params) => {
-    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
-      console.log(data)
-      setData(data)
-    })
-  }
-
+  const getList = params => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params } }).then(data => {
+      console.log(data);
+      setData(data);
+    });
+  };
 
   // 跳转到编辑页面
-  const toEditCarouse = (contentId) => () => {
+  const toEditCarouse = contentId => () => {
     router.push({
       pathname: '/carouselFigure/editCarousel',
       query: {
-        contentId
+        contentId,
       },
     });
-  }
+  };
 
   const columns = [
     {
@@ -46,7 +46,20 @@ const header = (props) => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (x, row) => <Navigate onClick={toEditCarouse(row.contentId)} ><img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} /></Navigate>,
+      render: (x, row) => (
+        <Navigate onClick={toEditCarouse(row.contentId)}>
+          <img
+            src={getImgURL(row.image)}
+            className={
+              row.showPosition === 'index'
+                ? styles.imgIndex
+                : row.showPosition === 'mall'
+                ? styles.imgPerfect
+                : ''
+            }
+          />
+        </Navigate>
+      ),
     },
     {
       title: '发布城市',
@@ -59,36 +72,67 @@ const header = (props) => {
       dataIndex: 'buildingName',
       key: 'buildingName',
       align: 'center',
-      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+      render: buildingName => <span>{buildingName === null ? '无' : buildingName}</span>,
     },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
-        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+      render: contentType => (
+        <span>
+          {contentType === 'project'
+            ? '项目'
+            : contentType === 'activity'
+            ? '活动'
+            : contentType === 'news'
+            ? '资讯'
+            : contentType === 'other'
+            ? '其他'
+            : contentType === 'help'
+            ? '助力'
+            : contentType === 'group'
+            ? '拼团'
+            : contentType === 'h5'
+            ? 'H5活动'
+            : contentType === 'salesBatch'
+            ? '销售批次详情'
+            : contentType === 'live'
+            ? '直播活动详情'
+            : '无'}
+        </span>
+      ),
     },
     {
       title: '发布位置',
       dataIndex: 'showPosition',
       key: 'showPosition',
       align: 'center',
-      render: (showPosition) => <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+      render: showPosition => (
+        <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+      ),
     },
     {
       title: '发布时间',
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+      render: (x, row) => (
+        <>
+          <span>{moment(row.createDate).format('YYYY-MM-DD')}</span>
+        </>
+      ),
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status) => <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+      render: status => (
+        <>
+          <span>{status == 1 ? '已上架' : '已下架'}</span>
+        </>
+      ),
     },
     {
       title: '操作',
@@ -97,7 +141,11 @@ const header = (props) => {
       align: 'center',
       render: withActions((x, row) => [
         <AuthButton name="admin.extendContent.publish" noRight={null}>
-          <EditIcon type={row.status === 1 ? 'down' : 'up'} text={row.status === 1 ? '下架' : '上架'} onClick={changeStatus(row)} />
+          <EditIcon
+            type={row.status === 1 ? 'down' : 'up'}
+            text={row.status === 1 ? '下架' : '上架'}
+            onClick={changeStatus(row)}
+          />
         </AuthButton>,
 
         <AuthButton name="admin.extendContent.id.put" noRight={null}>
@@ -107,103 +155,121 @@ const header = (props) => {
         <AuthButton name="admin.extendContent.delete" noRight={null}>
           <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
         </AuthButton>,
-      ])
+      ]),
     },
   ];
 
-  const finishDynamic = (row) => {
+  const finishDynamic = row => {
     Modal.confirm({
       title: '结束以后将无法编辑, 是否继续?',
       okText: '确定',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: '' } })
+          .then(data => {
+            console.log(data);
+            message.info('操作成功！');
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
       },
     });
-  }
+  };
 
   //删除
-  const deleteCarouse = (contentId) => () => {
+  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)
-        })
+        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)
+  const changeStatus = row => () => {
+    console.log(row);
     if (row.status === 0) {
-
       Modal.confirm({
         title: '确认发布此数据?',
         okText: '确定',
         cancelText: '取消',
         onOk() {
-          row.status = 1
-          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-          }).catch((err) => {
-            console.log(err)
-            row.status = 0
-            message.info(err.msg || err.message)
+          row.status = 1;
+          request({
+            ...apis.carsuseFigure.updataExtendContent,
+            urlData: { id: row.contentId },
+            data: row,
           })
+            .then(data => {
+              message.info('操作成功！');
+              getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+            })
+            .catch(err => {
+              console.log(err);
+              row.status = 0;
+              message.info(err.msg || err.message);
+            });
         },
       });
     } else if (row.status === 1) {
-
       Modal.confirm({
         title: '停用后不会再显示在小程序端',
         okText: '确定',
         cancelText: '取消',
         onOk() {
-          row.status = 0
-          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-          }).catch((err) => {
-            console.log(err)
-            row.status = 1
-            message.info(err.msg || err.message)
+          row.status = 0;
+          request({
+            ...apis.carsuseFigure.updataExtendContent,
+            urlData: { id: row.contentId },
+            data: row,
           })
+            .then(data => {
+              message.info('操作成功！');
+              getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+            })
+            .catch(err => {
+              console.log(err);
+              row.status = 1;
+              message.info(err.msg || err.message);
+            });
         },
       });
     }
+  };
 
-  }
-
-  const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner', ...props.form.getFieldsValue() })
-  }
+  const changePageNum = pageNumber => {
+    getList({
+      pageNum: pageNumber,
+      pageSize: 10,
+      showType: 'banner',
+      ...props.form.getFieldsValue(),
+    });
+  };
 
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+        console.log('提交数据: ', values);
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' });
       }
     });
-  }
+  };
 
   //重置搜索
   function handleReset() {
@@ -211,21 +277,12 @@ const header = (props) => {
     getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
   }
 
-  const { getFieldDecorator } = props.form
+  const { getFieldDecorator } = props.form;
   return (
-
     <Card>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
-          )}
-        </Form.Item>
+        <Form.Item>{getFieldDecorator('cityId')(<SelectCity />)}</Form.Item>
+        <Form.Item>{getFieldDecorator('buildingId')(<BuildSelect />)}</Form.Item>
         <Form.Item>
           {getFieldDecorator('contentType')(
             <Select style={{ width: '180px' }} placeholder="类型">
@@ -258,25 +315,36 @@ const header = (props) => {
         </Form.Item>
         <Form.Item>
           <AuthButton name="admin.extendContent.search" noRight={null}>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            <Button type="primary" htmlType="submit" >
               搜索
-          </Button>
+            </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
-            </Button>
+          </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.extendContent.post" noRight={null}>
-        <Button type='primary' onClick={toEditCarouse()} style={{margin:'20px 0'}}>新增</Button>
-      </AuthButton>
+      <div style={{textAlign:'right'}}>
+        <AuthButton name="admin.extendContent.post" noRight={null}>
+          <Button type="primary" onClick={toEditCarouse()} style={{ margin: '20px 0' }}>
+            新增
+          </Button>
+        </AuthButton>
+      </div>
+
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="contentId" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+        <Pagination
+          showQuickJumper
+          defaultCurrent={1}
+          total={data.total}
+          onChange={changePageNum}
+          current={data.current}
+        />
       </div>
     </Card>
-  )
-}
+  );
+};
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader;

src/pages/carouselFigure/editCarousel.jsx

@@ -94,30 +94,27 @@ const Edit = props => {
   const XForm = createForm({ onValuesChange: handleFormValueChange });
 
   return props => {
-    const [tab, changeTab] = useState('basic');
     const { contentId } = props.location.query;
     const [data, setData] = useState({});
+    useEffect(() => {
+      if (contentId) {
+        isCanChoose = false;
+        // eslint-disable-next-line react-hooks/rules-of-hooks
 
-    if (contentId) {
-      isCanChoose = false;
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      useEffect(() => {
         getDetail(contentId);
-      }, []);
+      } else {
+        isCanChoose = true;
+      }
+    }, []);
 
-      // 查询列表
-      const getDetail = contentId => {
-        request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(
-          data => {
-            console.log(data);
-            setExtraData1(data);
-            setData(data);
-          },
-        );
-      };
-    } else {
-      isCanChoose = true;
-    }
+    // 查询列表
+    const getDetail = contentId => {
+      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
+        console.log(data);
+        setExtraData1(data);
+        setData(data);
+      });
+    };
 
     const cancelPage = () => {
       router.push({
@@ -192,6 +189,10 @@ const Edit = props => {
             label: '直播活动详情',
             value: 'live',
           },
+          {
+            label: '无',
+            value: 'nothing',
+          },
         ],
         value: data.contentType,
         rules: [{ required: true, message: '请选择类型' }],