轮播图

config/config.js

@@ -333,11 +333,21 @@ export default {
                   name: '轮播图列表',
                   component: './carouselFigure/carouselFigureList',
                 },
+                {
+                  path: '/carouselFigure/editCarousel',
+                  name: '',
+                  component: './carouselFigure/editCarousel',
+                },
                 {
                   path: '/carouselFigure/advertisingList',
                   name: '开屏广告',
                   component: './carouselFigure/advertisingList',
                 },
+                {
+                  path: '/carouselFigure/editAdvertising',
+                  name: '',
+                  component: './carouselFigure/editAdvertising',
+                },
               ],
             },
             {

src/pages/carouselFigure/advertisingList.jsx

@@ -34,11 +34,11 @@ const header = (props) => {
 
   
 // 跳转到编辑商品
-const toEditGoods = (dynamicId) => () => {
+const toEdit = (contentId) => () => {
     router.push({
-      pathname: '/activity/editActivity',
+      pathname: '/carouselFigure/editAdvertising',
       query: {
-        dynamicId
+        contentId
       },
     });
   }
@@ -86,7 +86,7 @@ const toEditGoods = (dynamicId) => () => {
       align: 'center',
       render: (x,row) => <>
                            <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                           <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
                          </>
     },
   ];
@@ -217,7 +217,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="primary" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/carouselFigure/carouselFigureList.jsx

@@ -33,12 +33,12 @@ const header = (props) => {
   }
 
   
-// 跳转到编辑商品
-const toEditGoods = (dynamicId) => () => {
+// 跳转到编辑页面
+const toEditCarouse = (contentId) => () => {
     router.push({
-      pathname: '/activity/editActivity',
+      pathname: '/carouselFigure/editCarousel',
       query: {
-        dynamicId
+        contentId
       },
     });
   }
@@ -86,7 +86,7 @@ const toEditGoods = (dynamicId) => () => {
       align: 'center',
       render: (x,row) => <>
                            <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                           <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
                          </>
     },
   ];
@@ -217,7 +217,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="primary" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/carouselFigure/editAdvertising.jsx

@@ -0,0 +1,155 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import request from '../../utils/request'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const contentId = props.location.query.contentId
+  const [ data, setData ] = useState({})
+  if(contentId){
+    useEffect(() => {
+      getDetail(contentId);
+    },[])
+
+  // 查询列表
+  const getDetail = (contentId) => {
+    request({
+        url: '/api/admin/extendContent/' + contentId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/carouselFigure/advertisingList',
+    });
+  }
+ 
+    const fields = [
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+      },
+      {
+        label: '商品图片',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title,
+      },
+      // {
+      //   label: '发布位置',
+      //   name: 'showPosition',
+      //   type: FieldTypes.Select,
+      //   dict: [{
+      //     label: '首页',
+      //     value: 'index'
+      //   },
+      //   {
+      //     label: '商城',
+      //     value: 'mall'
+      //   }],
+      //   value: data.showPosition,
+      // },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '其他',
+          value: 'other'
+        }],
+        value: data.contentType,
+      },
+      // {
+      //   label: '发布内容',
+      //   name: 'content',
+      //   render: <Wangedit />,
+      //   value: data.content,
+      // },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "启用",
+          value: 1
+        },
+        {
+          label: "停用",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      val.showType = 'screen'
+      if(contentId){
+        request({
+          url: '/api/admin/extendContent/'+contentId,
+          method: 'PUT',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/extendContent',
+          method: 'POST',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+ }
+
+
+
+export default Edit

src/pages/carouselFigure/editCarousel.jsx

@@ -0,0 +1,155 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import request from '../../utils/request'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const contentId = props.location.query.contentId
+  const [ data, setData ] = useState({})
+  if(contentId){
+    useEffect(() => {
+      getDetail(contentId);
+    },[])
+
+  // 查询列表
+  const getDetail = (contentId) => {
+    request({
+        url: '/api/admin/extendContent/' + contentId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/carouselFigure/carouselFigureList',
+    });
+  }
+ 
+    const fields = [
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+      },
+      {
+        label: '商品图片',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title,
+      },
+      {
+        label: '发布位置',
+        name: 'showPosition',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '首页',
+          value: 'index'
+        },
+        {
+          label: '商城',
+          value: 'mall'
+        }],
+        value: data.showPosition,
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '其他',
+          value: 'other'
+        }],
+        value: data.contentType,
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "启用",
+          value: 1
+        },
+        {
+          label: "停用",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      val.showType = 'banner'
+      if(contentId){
+        request({
+          url: '/api/admin/extendContent/'+contentId,
+          method: 'PUT',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/extendContent',
+          method: 'POST',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+ }
+
+
+
+export default Edit