合并

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -0,0 +1,350 @@
+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 Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  // 判断是否展示助力次数的输入框
+  // const [help, helpTab] = useState('1')
+  const { groupActivityId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  if (groupActivityId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      // eslint-disable-next-line no-use-before-define
+      getDynamicData(groupActivityId);
+    }, [])
+
+    // 详情
+    const getDynamicData = (groupActivityId) => {
+      request({ ...apis.groupActivity.details, urlData: { id: groupActivityId } }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+      })
+    }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/activity/groupActivity/list',
+    });
+  }
+  const radioOnChange = e => {
+    console.log(e.target.value)
+    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  }
+
+  const Basic = props => {
+    const fields = [
+      {
+        label: '选择项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          { required: true, message: '请选择项目' },
+        ],
+      },
+      {
+        label: '活动标题',
+        name: 'activityName',
+        type: FieldTypes.Text,
+        value: dynamicData.activityName,
+        rules: [
+          { required: true, message: '请输入活动标题' },
+        ]
+      },
+      {
+        label: '活动主图',
+        name: 'mainImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.mainImg,
+        help: '建议图片尺寸：750px*560px',
+      },
+      {
+        label: '活动时间',
+        name: 'activityTime',
+        type: FieldTypes.RangePicker,
+        value: dynamicData.startTime != null ? [moment(dynamicData.startTime, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endTime, 'YYYY-MM-DD HH:mm')] : null,
+        props: { showTime: { format: 'HH:mm' } },
+        rules: [
+          { required: true, message: '请选择活动时间' },
+        ],
+      },
+      {
+        label: '成团人数',
+        name: 'groupBuyPeople',
+        type: FieldTypes.Text,
+        value: dynamicData.groupBuyPeople,
+        rules: [
+          { required: true, message: '请输入成团人数' },
+        ]
+      },
+      {
+        label: '所需积分',
+        name: 'integral',
+        type: FieldTypes.Text,
+        value: dynamicData.integral,
+        rules: [
+          { required: true, message: '请输入所需积分' },
+        ]
+      },
+      {
+        label: '活动说明',
+        name: 'descImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.descImg,
+        help: '建议图片尺寸：750px*560px',
+      },
+    ]
+
+    const handleSubmit = val => {
+      const { activityTime, signupTime, ...submitValue } = val
+      console.log('val', val)
+      const [startTime, endTime] = activityTime
+      submitValue.startTime = moment(startTime).format('YYYY-MM-DD HH:mm');
+      submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
+      console.log('submit data --->', submitValue)
+      if (groupActivityId) {
+        submitValue.groupActicityId = groupActivityId
+        request({ ...apis.groupActivity.update, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({ ...apis.groupActivity.add, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+
+  const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if (groupActivityId) {
+      console.log(groupActivityId, 'groupActivityId')
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'activity' } }).then((data) => {
+          console.log(data, "2222")
+          if (data.length > 0) {
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+        getMiniappName()
+      }, [])
+    }else{
+      getMiniappName()
+    }
+    // 获取小程序名称
+    const [miniappName, setMiniappName] = useState('')
+    function getMiniappName() {
+      request({ ...apis.building.getMiniappName }).then(res => {
+        console.log(res, "0000000000000")
+        setMiniappName(res)
+      })
+    }
+
+    const submitPoster = () => {
+      if (groupActivityId) {
+        if (posterId) {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+            setPosterId(data.posterId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      } else {
+        message.warn("请先保存基本信息数据")
+      }
+    }
+
+    return <div>
+      <div style={{ display: 'flex' }}>
+        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+          <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+            </div>
+            <p style={{
+              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+              display: '-webkit-box', lineClamp: '3', height: '60px',
+              WebkitLineClamp: '2',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{inputValue ? inputValue : '海报标题'}</p>
+
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+              display: '-webkit-box', lineClamp: '3', height: '72px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+            <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>{miniappName || '置业V顾问'}</span>报名活动</p>
+              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
+            </div>
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
+
+        <div >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片1</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题1</p>
+            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          </div>
+          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述1</p>
+            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          </div>
+
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+
+  }
+
+
+
+  const Share = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+
+    if (groupActivityId) {
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'activity' }, }).then((data) => {
+          console.log(data, "2222")
+          if (data.length > 0) {
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitShare = () => {
+      if (groupActivityId) {
+        if (shareContentId) {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+            setShareContentId(data.shareContentId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      } else {
+        message.warn("请先保存基本信息数据")
+      }
+    }
+
+    return <div style={{ padding: '20px' }}>
+      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板1</p>
+        <div>
+          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />知与行互动</p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+          <img style={{ width: '200px', height: '140px' }} src={imgValue ? imgValue : poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题1</p>
+        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片1</p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息1</Radio.Button>
+          <Radio.Button value="poster">海报图片1</Radio.Button>
+          <Radio.Button value="share">分享设置1</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic />}
+        {tab === 'poster' && <Poster />}
+        {tab === 'share' && <Share />}
+      </div>
+    </div>
+  );
+}
+export default Edit

src/pages/activity/groupActivity/list.jsx

@@ -31,12 +31,12 @@ const header = props => {
   }
 
   
-// 跳转到助力新增
-const toEditActivity = (recordId) => () => {
+// 跳转到拼团活动新增
+const toEditActivity = (groupActivityId) => () => {
     router.push({
       pathname: '/activity/groupActivity/editGroupActivity',
       query: {
-        recordId
+        groupActivityId
       },
     });
   }
@@ -101,25 +101,25 @@ const toEditActivity = (recordId) => () => {
           {row.status === 0 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
         
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.recordId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消首页推荐' : '推荐至首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton> }
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        </AuthButton> }
 
           {row.status === 1 &&
            <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.recordId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActicityId)}>编辑<Icon type="form" className={styles.edit} /></span>
                       <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-                      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消首页推荐' : '推荐至首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
+                      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        </AuthButton>
           }
 
           {row.status === 2 &&
         <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.recordId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
         </AuthButton>
           }
@@ -156,7 +156,7 @@ const toEditActivity = (recordId) => () => {
   
   //结束活动
   const endGroupActivity = (row) => () => {
-      request({ ...apis.groupActivity.finish, data: { groupActicityId: row.groupActicityId} }).then((data) => {
+      request({ ...apis.groupActivity.finish, urlData: { id: row.groupActicityId} }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -167,8 +167,8 @@ const toEditActivity = (recordId) => () => {
   }
 
   //置顶
-  const topGroupActivity = (row, code) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, weight: row.weight } }).then((data) => {
+  const topGroupActivity = (row, weight) => () => {
+    request({ ...apis.groupActivity.top, data: { groupActicityId: row.groupActicityId, weight: weight } }).then((data) => {
         console.log(data)
         message.info('操作成功！')
         getList({ pageNum: 1, pageSize: 10 })

src/services/apis.js

@@ -727,54 +727,17 @@ export default {
     action: 'admin.taShareActivity.get',
   },
   add: {
-    url: `${prefix}/helpActivity/add`,
-    method: 'post',
-    action: 'admin.taRole.get',
-  },
-  details: {
-    url: `${prefix}/helpActivity/details`,
-    method: 'get',
-    action: 'admin.taRole.get',
-  },
-  update: {
-    url: `${prefix}/helpActivity/update`,
-    method: 'put',
-    action: 'admin.taRole.get',
-  },
-  finish: {
-    url: `${prefix}/taShareActivity/finish/:id`,
-    method: 'put',
-    action: 'admin.taShareActivity.finish',
-  },
-  top: {
-    url: `${prefix}/taShareActivity/weight`,
-    method: 'put',
-    action: 'admin.taShareActivity.weight',
-  },
-  record: {
-    url: `${prefix}/helpRecord`,
-    method: 'get',
-    action: 'admin.taRole.get',
-  },
- },
- groupActivity: {
-  list: {
-    url: `${prefix}/taShareActivity/list`,
-    method: 'get',
-    action: 'admin.taShareActivity.get',
-  },
-  add: {
-    url: `${prefix}/helpActivity/add`,
+    url: `${prefix}/taShareActivity`,
     method: 'post',
     action: 'admin.taRole.get',
   },
   details: {
-    url: `${prefix}/helpActivity/details`,
+    url: `${prefix}/taShareActivity/:id`,
     method: 'get',
     action: 'admin.taRole.get',
   },
   update: {
-    url: `${prefix}/helpActivity/update`,
+    url: `${prefix}/taShareActivity/update`,
     method: 'put',
     action: 'admin.taRole.get',
   },