合并

config/routes.js

@@ -380,6 +380,24 @@ export default [
               },
             ],
           },
+          {
+            path: '/third',
+            name: '第三方管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/third/thirdList',
+                name: '第三方公司',
+                component: './third/thirdList',
+              },
+              {
+                path: '/third/editThirdParty',
+                name: '编辑活动',
+                hideInMenu: true,
+                component: './third/editThirdParty',
+              },
+            ],
+          },
           {
             component: './404',
           },

src/pages/activity/ActivityList.jsx

@@ -13,40 +13,40 @@ import AuthButton from '@/components/AuthButton';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-const header = (props) => {
-  const [ data, setData ] = useState({})
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ list: [], total: 0 })
 //   const [page, changePage] = useState({})
 
+ // 查询列表
+ const getList = params => {
+  request({ ...apis.activity.list, params: { ...params } }).then(data => {
+      console.log(data)
+      setData(data)
+  })
+}
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
-
-  // 查询列表
-  const getList = (params) => {
-    request({ ...apis.activity.list, params: { ...params } }).then((data) => {
-        console.log(data)
-        setData(data)
-    })
-  }
+  }, [])
 
-  
 // 跳转到编辑商品
-const toEditGoods = (dynamicId) => () => {
+const toEditGoods = dynamicId => () => {
     router.push({
       pathname: '/activity/editActivity',
       query: {
-        dynamicId
+        dynamicId,
       },
     });
   }
-  
+
   /**
    *
    *
    * @param {*} props
    * @returns
    */
-  
   const columns = [
     {
       title: '活动标题',
@@ -90,14 +90,14 @@ const toEditGoods = (dynamicId) => () => {
       dataIndex: 'isEnlist',
       key: 'isEnlist',
       align: 'center',
-      render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
+      render: isEnlist => <><span>{isEnlist == 0 ? "未开始" : isEnlist == 1 ? '进行中' : '已结束'}</span></>,
     },
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
           <AuthButton name="admin.SignList.get" noRight={null}>
             <span style={{ color: '#1990FF', cursor: 'pointer'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
@@ -116,48 +116,48 @@ const toEditGoods = (dynamicId) => () => {
       )
     },
   ];
-  
-  const getSignList = (dynamicId) => {
+
+  const getSignList = dynamicId => {
       router.push({
           pathname: '/activity/SignList',
           query: {
-              dynamicId
+              dynamicId,
           },
         });
   }
-  
-  const finishDynamic = (row) => {
+
+  const finishDynamic = row => {
       Modal.confirm({
           title: '结束以后将无法编辑, 是否继续?',
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
+              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: "" } }).then(data => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10 })
-              }).catch((err) => {
+              }).catch(err => {
                   console.log(err)
                   message.info(err.msg || err.message)
               })
           },
         });
   }
-  
+
 //   置顶
-  const topDynamic = (row) => () => {
+  const topDynamic = row => () => {
       const weight = Math.abs(row.weight - 1)
-      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
+      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then(data => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
-      }).catch((err) => {
+      }).catch(err => {
           console.log(err)
           message.info(err.msg || err.message)
       })
   }
   
-  const sendOrPublicDynamic = (row) => {
+  const sendOrPublicDynamic = row => {
       if (row.status === 1) {
           cancelDynamic(row)
       } else {
@@ -166,7 +166,7 @@ const toEditGoods = (dynamicId) => () => {
   }
   
   // 取消活动
-  const cancelDynamic = (row) => {
+  const cancelDynamic = row => {
       request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -177,7 +177,7 @@ const toEditGoods = (dynamicId) => () => {
   }
   
   //发布活动
-  const sendDynamic = (row) => {
+  const sendDynamic = row => {
       request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
@@ -187,7 +187,7 @@ const toEditGoods = (dynamicId) => () => {
       })
   }
   
-  const changePageNum = (pageNumber) => {
+  const changePageNum = pageNumber => {
       getList({ pageNum: pageNumber, pageSize: 10 })
   }
 
@@ -258,7 +258,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+       <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={(e) => changePageNum(e)} />
       </div>
     </>
   )

src/pages/activity/editActivity.jsx

@@ -29,7 +29,7 @@ const { TextArea } = Input;
 const Edit = (props) => {
   const [tab, changeTab] = useState('basic')
   const dynamicId = props.location.query.dynamicId
-  const [dynamicData, setDynamicData] = useState({})
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
   if (dynamicId) {
     useEffect(() => {
       getDynamicData(dynamicId);
@@ -50,6 +50,11 @@ const Edit = (props) => {
     });
   }
 
+  const radioOnChange = e => {
+    console.log(e.target.value)
+    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  }
+
   const Basic = (props) => {
     const fields = [
       {
@@ -123,7 +128,7 @@ const Edit = (props) => {
       {
         label: '是否需要报名',
         name: 'isEnlist',
-        render: <Radio.Group name="radiogroup">
+        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
           <Radio value={1}>是</Radio>
           <Radio value={0}>否</Radio>
         </Radio.Group>,
@@ -132,9 +137,10 @@ const Edit = (props) => {
       {
         label: '报名时间',
         name: 'signupTime',
-        type: FieldTypes.RangePicker,
+        // type: FieldTypes.RangePicker,
+        render: dynamicData.isEnlist === 1 ? (<RangePicker format={ 'YYYY/MM/DD HH:mm' } style={{ width: '100%' }} />) : '',
         value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD HH:mm'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD HH:mm')] : null,
-        props: {showTime:{ format: 'HH:mm' }},
+        // props: {showTime:{ format: 'HH:mm' }},
         rules: [
           { required: true, message: '请选择报名时间' },
         ]

src/pages/building/list/add/components/base.jsx

@@ -90,7 +90,7 @@ function AddBuilding(props) {
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(() => {
       openNotificationWithIcon('success', '操作成功')
-      router.go(-1)
+      // router.go(-1)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox } from 'antd';
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, InputNumber } from 'antd';
 import { render } from 'react-dom';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
@@ -32,7 +32,13 @@ class TypeForm extends React.Component {
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         // console.log('Received values of form: ', values);
-        values[name] = e.target.value
+        const currentValue = e.target.value
+        if (currentValue === '') {
+          values[name] = null
+        } else {
+          values[name] = currentValue
+        }
+        
         values.buildingTypeName = this.props.type.buildingTypeName
         console.log('values: ', values)
         this.props.onSuccess(values)
@@ -48,7 +54,7 @@ class TypeForm extends React.Component {
     const { getFieldDecorator } = this.props.form;
 
     // this.props.form.setFieldsValue(this.props.type)
-
+    console.log(this.props.type)
     return (
       <>
         <Col span={11} style={{
@@ -130,7 +136,7 @@ class ProjectTypeBody extends React.Component {
     const { projectType } = this.state
     const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
 
-    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: null, decoration: null, rightsYear: null, status: '1' }))
     const updateProjectDate = this.updateProjectType(tempDate)
     console.log('updateProjectDate: ', updateProjectDate)
     this.setState({ data: updateProjectDate })
@@ -138,7 +144,10 @@ class ProjectTypeBody extends React.Component {
 
   onClose = e => {
     const { data } = this.state
+    console.log('onClose——data: ', data)
+    console.log('onClose: ', e.buildingTypeId)
     const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
+    console.log('onClose——data: ', buildingType)
     this.setState({ data: buildingType })
     this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
   }
@@ -234,7 +243,7 @@ class ProjectTypeBody extends React.Component {
         </Modal>
         <Row type="flex" justify="space-between">
           {
-            this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+            this.state.data.map(item => <WrappedTypeForm type={item} key={item.buildingTypeId} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
           }
         </Row>
       </>

src/pages/third/editThirdParty.jsx

@@ -0,0 +1,109 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import apis from '../../services/apis';
+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'
+import yinhao from '../../assets/yinhao.png'
+import ImageUploader from '../../components/XForm/ImageUpload';
+import logo from '../../assets/logo.png';
+import touxiang from '../../assets/touxiang.jpg';
+import poster1 from '../../assets/poster1.png';
+import poster2 from '../../assets/poster2.png';
+import xiaochengxu from '../../assets/xiaochengxu.png'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const third = (props) => {
+  const configId = props.location.query.configId
+  const [thirdData, setThirdData] = useState({})
+  if (configId) {
+    useEffect(() => {
+      getThirdData(configId);
+    }, [])
+
+    // 查询列表
+    const getThirdData = (configId) => {
+      request({ ...apis.third.details, urlData: { id: configId } }).then((data) => {
+        console.log(data)
+        setThirdData(data)
+      })
+    }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/third/thirdList',
+    });
+  }
+ 
+  const fields = [
+    {
+      label: 'appid',
+      name: 'appid',
+      type: FieldTypes.Text,
+      value: thirdData.appid,
+      rules: [
+        { required: true, message: '请输入appid' },
+      ]
+    },
+    {
+      label: 'appSecret',
+      name: 'appSecret',
+      type: FieldTypes.Text,
+      value: thirdData.appSecret,
+      rules: [
+        { required: true, message: '请输入appSecret' },
+      ]
+    },
+    {
+      label: '过期时间',
+      name: 'expirationDate',
+      type: FieldTypes.DatePicker,
+      value: thirdData.expirationDate != null ? moment(thirdData.expirationDate, 'YYYY-MM-DD HH:mm') : null,
+      rules: [
+        { required: true, message: '请选择时间' },
+      ]
+    },
+  ]
+
+  const handleSubmit = val => {
+    console.log('submit data --->', val)
+    if (configId) {
+      val.configId = configId
+      request({ ...apis.third.update, data: val }).then((data) => {
+        message.info("保存成功")
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    } else {
+      request({ ...apis.third.add, data: val }).then((data) => {
+        message.info("保存成功")
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+}
+
+
+
+export default third

src/pages/third/thirdList.jsx

@@ -0,0 +1,103 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.third.thirdPartyMiniapp, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  //重置搜索
+  const handleReset = () => {
+    props.form.resetFields();
+  }
+
+  const toEditThirdParty =  (configId) => () => {
+    router.push({
+      pathname: '/third/editThirdParty',
+      query: {
+        configId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: 'appid',
+      dataIndex: 'appid',
+      key: 'appid',
+      align: 'center',
+    },
+    {
+      title: 'appSecret',
+      dataIndex: 'appSecret',
+      key: 'appSecret',
+      align: 'center',
+    },
+    {
+      title: '过期时间',
+      dataIndex: 'expirationDate',
+      key: 'expirationDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.expirationDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditThirdParty(row.configId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+        </>
+      )
+    },
+  ];
+   
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+ 
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditThirdParty()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="messageList" 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} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/services/apis.js

@@ -685,4 +685,26 @@ export default {
     action: 'admin.taRole.get',
   },
  },
+ third: {
+  thirdPartyMiniapp: {
+    url: `${prefix}/thirdPartyMiniapp`,
+    method: 'GET',
+    action: 'admin.thirdPartyMiniapp.get',
+  },
+  update: {
+    url: `${prefix}/thirdPartyMiniapp/update`,
+    method: 'PUT',
+    action: 'admin.thirdPartyMiniapp.update.put',
+  },
+  add: {
+    url: `${prefix}/thirdPartyMiniapp/add`,
+    method: 'POST',
+    action: 'admin.thirdPartyMiniapp.add.post',
+  },
+  details: {
+    url: `${prefix}/thirdPartyMiniapp/:id`,
+    method: 'GET',
+    action: 'admin.thirdPartyMiniapp.id.get',
+  },
+ },
 }