Merge branch 'dev' into v3.5.30

src/pages/activity/detailActivity.jsx

@@ -66,7 +66,6 @@ const BasicForm = props => {
   }
 
   const { dynamicId } = props
- 
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -81,7 +80,6 @@ const BasicForm = props => {
           values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
           values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         }
-        
         console.log('submit data --->', values)
         if (dynamicId) {
           values.dynamicId = dynamicId
@@ -114,18 +112,18 @@ const BasicForm = props => {
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
-        {getFieldDecorator('buildingId', {
-          initialValue: detailData.buildingId,
-          rules: [
-            {
-              required: true,
-              message: '请选择所属项目',
-            },
-          ],
-        })(<BuildSelect disabled/>)}
+          {getFieldDecorator('buildingId', {
+            initialValue: detailData.buildingId,
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled />)}
         </Form.Item>
         <Form.Item label="活动封面图1">
-           <img src={detailData.listImgUrl} height="210px" width="375px" />
+          <img src={detailData.listImgUrl} height="210px" width="375px" />
         </Form.Item>
         <Form.Item label="活动封面图2">
           <img src={detailData.bannerListImg} height="125px" width="375px" />
@@ -158,11 +156,11 @@ const BasicForm = props => {
           <span>{detailData.maxEnlistByPerson}</span>
         </Form.Item>
         <Form.Item label="活动详情">
-          <div style={{ maxHeight: '500px', overflowY: 'auto' }} dangerouslySetInnerHTML={{ __html: detailData.desc}}></div>
+          <div style={{ maxHeight: '500px', overflowY: 'auto' }} dangerouslySetInnerHTML={{ __html: detailData.desc }}></div>
         </Form.Item>
         <Form.Item label="报名时间">
           <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
-        </Form.Item>  
+        </Form.Item>
         <Form.Item label="权重">
           <span>{detailData.heavy}</span>
         </Form.Item>
@@ -173,229 +171,235 @@ const BasicForm = props => {
 
 const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  const { dynamicId } = props.location.query
-  const [detailData, setDetailData] = useState(false)
-
-  const getDynamicData = dynamicId => {
-    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
-      console.log(data)
-      data.activityTime = [moment(data.startDate), moment(data.endDate)]
-      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
-
-      setDetailData(data)
-    })
-  }
+const Poster = (props) => {
+  const { dynamicId } = props
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
 
-  
+  if (dynamicId) {
+    console.log(dynamicId, 'dynamicId')
     useEffect(() => {
-      if (dynamicId) {
-        getDynamicData(dynamicId);
-      }
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, 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 Poster = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [textAreaValue, changeTextArea] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [posterId, setPosterId] = useState('')
-
+  const submitPoster = () => {
     if (dynamicId) {
-      console.log(dynamicId, 'dynamicId')
-      useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: dynamicId, 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)
-          }
+      if (posterId) {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          message.info("保存成功")
         }).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 (dynamicId) {
-        if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, 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: dynamicId, 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("请先保存基本信息数据")
+        request({ ...apis.activity.addPoster, data: { targetId: dynamicId, 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>
+  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={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-        </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>
 
-        {/* <div >
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
-            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
-          </div>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
-          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
-            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          <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 style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
-            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
-          </div>
-
-        </div> */}
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
       </div>
-      {/* <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>
-        取消
-      </Button> */}
+
+      {/* <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</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={() => cancelPage()}>
+      取消
+    </Button> */}
+  </div>
+
+}
 
-  }
 
 
+const Share = (props) => {
+  const { dynamicId } = props
+
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
 
-  const Share = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [shareContentId, setShareContentId] = useState('')
 
+  useEffect(() => {
     if (dynamicId) {
-      useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setShareContentId(data[0].shareContentId)
-            changeImg(data[0].shareContentImg)
-            changeInput(data[0].shareContentTitle)
-          }
+      request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
+        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 (dynamicId) {
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          message.info("保存成功")
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
-      }, [])
-    }
-
-    const submitShare = () => {
-      if (dynamicId) {
-        if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, 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: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            setShareContentId(data.shareContentId)
-            message.info("保存成功")
-          }).catch(err => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, 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' }}>分享模板</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: '160px' }} 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' }}>分享标题</p>
-        {inputValue === '' ? '无' : <span>{inputValue}</span>}
-      </div>
-      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
-        {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+  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' }}>分享模板</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: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
       </div>
-      {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>
-        取消
-      </Button> */}
     </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      {inputValue === '' ? '无' : <span>{inputValue}</span>}
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
+      {imgValue === '' ? '无' : <img src={imgValue} height="120px" height="150px" />}
+    </div>
+    {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button> */}
+  </div>
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { dynamicId } = props.location.query
+  const [detailData, setDetailData] = useState(false)
+
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+      setDetailData(data)
+    })
   }
 
+
+  useEffect(() => {
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, [])
+
+
+  
+
   return (
     <div>
       <div>
@@ -407,18 +411,18 @@ const Edit = props => {
       </div>
       <div>
         {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
-        {tab === 'poster' && <Poster />}
-        {tab === 'share' && <Share />}
+        {tab === 'poster' && <Poster  dynamicId={dynamicId} />}
+        {tab === 'share' && <Share  dynamicId={dynamicId} />}
       </div>
-      <div style={{textAlign: 'center'}}>
+      <div style={{ textAlign: 'center' }}>
         <AuthButton name="admin.SignList.get" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>}
-          </AuthButton>
-          <AuthButton name="admin.dymic.qrcode" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
-          </AuthButton>
-          <Button onClick={() => cancelPage()}>
-            取消
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>}
+        </AuthButton>
+        <AuthButton name="admin.dymic.qrcode" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
+        </AuthButton>
+        <Button onClick={() => cancelPage()}>
+          取消
           </Button>
       </div>
       <Prompt message={location =>

src/pages/activity/drainage/DrainageList.jsx

@@ -339,7 +339,7 @@ const header = props => {
             { required: true, message: '请选择是否投放小程序' },
           ],
         })(
-          <Radio.Group onChange={changeMiniapp}>
+          <Radio.Group onChange={changeMiniapp} disabled={!!formsDate.activityId}>
             <Radio value={1}>是</Radio>
             <Radio value={0}>否</Radio>
           </Radio.Group>
@@ -395,7 +395,7 @@ const header = props => {
           ]
         })(<ImageUploader />)}
       </Form.Item>)}
-      {hiddenStatus && (<Form.Item label="活动分享语">
+      {hiddenStatus && (<Form.Item label="活动分享语" help="可使用{name}代表用户昵称。">
         {getFieldDecorator('shareTitle', {
           initialValue: formsDate.shareTitle,
           rules: [

src/pages/activity/drainage/components/Basic.jsx

@@ -1,46 +1,25 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Slider, Row, Col, Checkbox, Input, Button, InputNumber } from 'antd';
+import { Form, Slider, Row, Col, Button, InputNumber, message } from 'antd';
 import router from 'umi/router';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 import ImageUploader from './ImageUpload';
 import Styles from './styles.less';
-import Navigate from '@/components/Navigate';
 import BuildSelect from '../../../../components/SelectButton/BuildSelect2'
+import CheckboxGroup from './CheckboxGroup';
 
 function Basic(props) {
 
     const { id, name } = props
 
-    const [registrationInputValue, setRegistrationInputValue] = useState()
-
-    const [viewProperty, setViewProperty] = useState(['index'])
-    const [productionPoster, setProductionPoster] = useState(['index'])
-    // const [registrationForm, setRegistrationForm] = useState([])
-    const [inputVisible, setInputVisible] = useState(false)
-    // const [registrationFormOption, setregistrationFormOption] = useState([
-    //     { label: '姓名', value: 'name' },
-    //     { label: '电话', value: 'tel' },
-    //     { label: '自定义', value: 'abc' },
-    // ])
-
     const [data, setData] = useState({})
     useEffect(() => {
         getList();
-        console.log(props.id, '2341')
     }, [])
     // 查询列表
 
     const getList = () => {
         request({ ...apis.redPacket.detail, urlData: { id } }).then(data => {
-            console.log(data, '2341')
-            // s.split("==");
-            data.buildingShowPos = data.buildingShowPos.split(',')
-
-            data.buildingSposterShowPoshowPos = (data.posterShowPos).split(',')
-            setViewProperty(data.buildingShowPos)
-            setProductionPoster(data.posterShowPos)
-            console.log(data, '2341')
             setData(data)
         })
     }
@@ -48,6 +27,9 @@ function Basic(props) {
     const updateRedPacket = data => {
         request({ ...apis.redPacket.update, data: { ...data } }).then(data => {
             // setData(data)
+            message.success('操作成功')
+        }).catch(() => {
+            message.error('操作失败')
         })
     }
 
@@ -56,57 +38,13 @@ function Basic(props) {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
-                console.log(values, '------222-------')
                 values.activityId = id
-                // values.name = name
-                values.buildingShowPos = values.buildingShowPos.toString()
-                values.posterShowPos = values.posterShowPos.toString()
-                console.log(values, '------222-------')
                 updateRedPacket(values)
             }
         },
         )
     }
 
-    function onViewPropertyChange(checkedValues) {
-        console.log('checked = ', checkedValues);
-        setViewProperty(checkedValues)
-    }
-
-    function onProductionPoster(checkedValues) {
-        console.log('checked = ', checkedValues);
-        setProductionPoster(checkedValues)
-    }
-
-    function onRegistrationForm(checkedValues) {
-        console.log('checked = ', checkedValues);
-        setRegistrationForm(checkedValues)
-    }
-    // registrationForm
-    // function  (value, list) {
-    //     return list.filter(f => f == value)
-    // }
-    function showInput() {
-        setInputVisible(!inputVisible)
-    }
-
-    const handleInputChange = e => {
-        setRegistrationInputValue(e.target.value)
-        // this.setState({ inputValue: e.target.value });
-
-    };
-
-    const handleInputConfirm = () => {
-        setregistrationFormOption([
-            { label: '姓名', value: 'name' },
-            { label: '电话', value: 'tel' },
-            { label: registrationInputValue, value: 'abc' },
-        ])
-
-
-        setInputVisible(!inputVisible)
-    }
-
     const { getFieldDecorator } = props.form
 
     return (
@@ -169,24 +107,19 @@ function Basic(props) {
                                     <Slider
                                         min={5}
                                         max={100}
-                                        // value={typeof inputValue === 'number' ? inputValue : 0}
                                         step={1}
-                                    // width="100px"
-                                    // style={{ width: '100px' }}
                                     />,
                                 )}
                         </Col>
                         <Col span={6}>
                             {getFieldDecorator('topLimitPersons',
                                 {
-                                    // initialValue: data.topLimitPersons,
                                 })(
                                     <InputNumber
                                         min={5}
                                         max={100}
                                         style={{ marginLeft: 16 }}
-                                    // value={inputValue}
-                                    // onChange={this.onChange}
+
                                     />,
                                 )}
                         </Col>
@@ -195,23 +128,8 @@ function Basic(props) {
                 <Form.Item label="查看楼盘按钮">
                     {getFieldDecorator('buildingShowPos',
                         {
-                            initialValue: viewProperty,
-                        })(
-                            // <Checkbox.Group options={ViewProperty} defaultValue={['Apple']} onChange={onChange} />,style={viewProperty.indexOf('home') == -1 ? {} : { color: '#EF273A' }}
-                            <Checkbox.Group name={Styles.Checkboxs} onChange={onViewPropertyChange} style={{ width: '100%' }}>
-                                <Row>
-                                    <Col span={6}>
-                                        <Checkbox className={viewProperty.indexOf('index') === -1 ? {} : Styles.CheckboxStytle} value="index" >首页</Checkbox>
-                                    </Col>
-                                    <Col span={6}>
-                                        <Checkbox className={viewProperty.indexOf('help') === -1 ? {} : Styles.CheckboxStytle} value="help">助力页</Checkbox>
-                                    </Col>
-                                    <Col span={6}>
-                                        <Checkbox className={viewProperty.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
-                                    </Col>
-                                </Row>
-                            </Checkbox.Group>,
-                        )}
+                            initialValue: data.buildingShowPos || 'index',
+                        })(<CheckboxGroup />)}
                 </Form.Item>
                 <Form.Item label="关联楼盘">
                     {getFieldDecorator('buildingId',
@@ -223,62 +141,12 @@ function Basic(props) {
                 </Form.Item>
                 <Form.Item label="生成海报按钮">
                     {getFieldDecorator('posterShowPos', {
-                        initialValue: productionPoster,
-                    })(
-                        <Checkbox.Group name={Styles.Checkboxs} onChange={onProductionPoster} style={{ width: '100%' }}>
-                            <Row>
-                                <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('index') === -1 ? {} : Styles.CheckboxStytle} value="index" >首页</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('help') === -1 ? {} : Styles.CheckboxStytle} value="help">助力页</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
-                                </Col>
-                            </Row>
-                        </Checkbox.Group>,
-                    )}
+                        initialValue: data.posterShowPos || 'index',
+                    })(<CheckboxGroup />)}
                 </Form.Item>
-                {/* <Form.Item label="报名表单">
-                    {getFieldDecorator('registrationForm')(
-                        <Checkbox.Group name={Styles.Checkboxs} onChange={onRegistrationForm} style={{ width: '100%' }}>
-                            <Row>
-                                {registrationFormOption.map((x, index) => {
-                                    return <Col span={6}>
-                                        {index !== 2 && (<Checkbox className={registrationForm.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>)}
-
-                                        {inputVisible && index === 2 && (
-                                            <Input
-                                                // ref={this.saveInputRef}
-                                                type="text"
-                                                size="small"
-                                                style={{ width: 78 }}
-                                                // value={inputValue}
-                                                onChange={handleInputChange}
-                                                onBlur={handleInputConfirm}
-                                                onPressEnter={handleInputConfirm}
-                                            />
-                                        )}
-                                        {!inputVisible && index === 2 && (
-                                            <Checkbox className={registrationForm.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>
-                                        )}
-                                        {!inputVisible && index === 2 && x.label === '自定义' && (
-                                            <Navigate onClick={showInput} >
-                                                修改
-                                            </Navigate>
-                                        )}
-                                    </Col>
-                                })}
-                            </Row>
-                          
-                        </Checkbox.Group>,
-                    )}
-                </Form.Item> */}
                 <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
                     <div style={{ width: '190px' }}>
                         <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>
-                        {/* <Button onClick={() => router.go(-1)} >取消</Button> */}
                     </div>
                 </Form.Item>
             </Form>

src/pages/activity/drainage/components/CheckboxGroup.jsx

@@ -0,0 +1,46 @@
+import React from 'react'
+import { Checkbox, Row, Col } from 'antd'
+import classNames from 'classnames'
+
+import Styles from './styles.less';
+
+const DataDict = [
+    {
+        label: '首页',
+        value: 'index',
+    },
+    {
+        label: '助力页',
+        value: 'help',
+    },
+    {
+        label: '活动规则页',
+        value: 'rule',
+    },
+]
+
+export default props => {
+    const { value, onChange } = props;
+    const vals = (value || '').split(',');
+    const handleChange = e => {
+        onChange(e.join(','));
+    }
+
+    return (
+        <Checkbox.Group className={Styles.Checkboxs} onChange={handleChange} style={{ width: '100%' }} value={vals}>
+            <Row>
+                {
+                    DataDict.map(item => {
+                        const key = item.value;
+                        return (
+                            <Col span={6} key={key}>
+                                <Checkbox className={classNames({ [Styles.CheckboxStytle]: vals.indexOf(item.value) > -1 })} value={item.value} >{item.label}</Checkbox>
+                            </Col>
+                        );
+                    })
+                }
+            </Row>
+        </Checkbox.Group>
+    );
+
+}

src/pages/activity/drainage/components/CustomerData.jsx

@@ -1,15 +1,20 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Avatar } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 
+const { RangePicker } = DatePicker
+
 const formateValue = v => {
+    const { date, ...values } = v
+
+    console.log(date)
     return {
-        ...v,
-        startTime: v.startTime ? `${v.startTime.format('YYYY-MM-DDT00:00:00')}Z` : undefined,
-        endTime: v.endTime ? `${v.endTime.format('YYYY-MM-DDT23:59:59')}Z` : undefined,
+        ...values,
+        startTime: date && date[0] ? `${date[0].format('YYYY-MM-DDT00:00:00')}Z` : undefined,
+        endTime: date && date[1] ? `${date[1].format('YYYY-MM-DDT23:59:59')}Z` : undefined,
     }
 }
 
@@ -25,6 +30,16 @@ function CustomerData(props) {
     // 查询列表
 
     const getList = params => {
+        // const { LocalDate, ...values } = params
+        // if (LocalDate != null && LocalDate.length > 0) {
+        //     const [refundStartTime, refundEndTime] = LocalDate
+        //     values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        //     values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // } else {
+        //     values.refundStartTime = null
+        //     values.refundEndTime = null
+        // }
+        console.log(params, 'params')
         request({ ...apis.redPacket.getRecordByConditionList, params: { ...params, activityId: id, drainageId } }).then(data => {
             setData(data)
         })
@@ -65,12 +80,12 @@ function CustomerData(props) {
             dataIndex: 'avatarurl',
             key: 'avatarurl',
             align: 'center',
-            render: (x, row) => <img src={row.avatarurl} alt="" width="100px"></img >,
+            render: (x, row) => <img src={row.avatarurl} alt="" width="64px"></img >,
         },
         {
             title: '昵称',
-            dataIndex: 'nickName',
-            key: 'nickName',
+            dataIndex: 'nickname',
+            key: 'nickname',
             align: 'center',
         },
         {
@@ -87,16 +102,17 @@ function CustomerData(props) {
         },
         {
             title: '访问时间',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
             align: 'center',
-            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+            render: (x, row) => <><span>{`${moment(row.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },
         {
             title: '分享人昵称',
-            dataIndex: 'sharePersonNickName',
-            key: 'sharePersonNickName',
+            dataIndex: 'sharePersonNickname',
+            key: 'sharePersonNickname',
             align: 'center',
+            render: (x, row) => <><span>{row.sharePersonNickname || row.sharePersonName}</span></>,
         },
         {
             title: '分享人手机号',
@@ -120,11 +136,16 @@ function CustomerData(props) {
         link.click()
     }
 
+    // ...formateValue(values)
     const exportReport = () => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...formateValue(values), activityId: id, drainageId } }).then(data => {
+                    download(data)
+                }).catch()
+            }
+        });
 
-        request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...props.form.getFieldsValue(), activityId: id, drainageId } }).then(data => {
-            download(data)
-        }).catch()
     }
 
     const { getFieldDecorator } = props.form
@@ -140,7 +161,14 @@ function CustomerData(props) {
                         />,
                     )}
                 </Form.Item>
+
                 <Form.Item>
+                    {getFieldDecorator('date')(
+                        <RangePicker placeholder={['访问开始时间', '访问结束时间']} />,
+                    )}
+                </Form.Item>
+
+                {/* <Form.Item>
                     {getFieldDecorator('startTime')(
                         <DatePicker placeholder="访问开始时间" />,
                     )}
@@ -149,7 +177,7 @@ function CustomerData(props) {
                     {getFieldDecorator('endTime')(
                         <DatePicker placeholder="访问结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('sharePersonPhone')(
                         <Input

src/pages/activity/drainage/components/Help.jsx

@@ -7,7 +7,7 @@ import request from '../../../../utils/request';
 
 const { RangePicker } = DatePicker;
 
-function validatorNum (rule, value, callback) {
+function validatorNum(rule, value, callback) {
     callback(value < 1 || value > 1000 ? '人数必须大于0 小于 1000' : undefined);
 }
 
@@ -33,11 +33,14 @@ function Help(props) {
     const updateRedPacket = values => {
 
         const [startDate, endDate] = values.date
-        values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
-        values.endDate = `${moment(endDate).format('YYYY-MM-DDT00:00:00.000')}Z`
+        console.log(values.date)
+        values.startDate = `${moment(startDate).format('YYYY-MM-DDTHH:mm:ss.000')}Z`
+        values.endDate = `${moment(endDate).format('YYYY-MM-DDTHH:mm:ss.000')}Z`
         values.activityId = id
         request({ ...apis.redPacket.updateHelp, urlData: { id }, data: { ...values } }).then(data => {
-
+            message.info('操作成功')
+        }).catch(() => {
+            message.error('操作失败')
         })
     }
 
@@ -164,7 +167,7 @@ function Help(props) {
                             { required: true, message: '请设置 活动开始～结束时间' },
                         ],
                     })(
-                        <RangePicker />,
+                        <RangePicker showTime={{ format: 'HH:mm:ss' }} />,
                     )}
                 </Form.Item>
                 <Form.Item label="活动结束提示文案">

src/pages/activity/drainage/components/Ranking.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Avatar } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import apis from '../../../../services/apis';
@@ -28,6 +28,7 @@ function Ranking(props) {
             if (!err) {
                 // eslint-disable-next-line no-console
                 console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10, ...values })
             }
         });
     }
@@ -52,7 +53,7 @@ function Ranking(props) {
             dataIndex: 'avatarurl',
             key: 'avatarurl',
             align: 'center',
-            render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
+            render: (x, row) => <img src={row.avatarurl} alt="" width="64px"></img >,
         },
         {
             title: '昵称',
@@ -74,8 +75,8 @@ function Ranking(props) {
         },
         {
             title: '发起时间',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
             render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },

src/pages/activity/drainage/components/RedPacket.jsx

@@ -31,6 +31,7 @@ function RedPacket(props) {
     const updateRedPacket = data => {
         request({ ...apis.redPacket.updateMoney, urlData: { id }, data: { ...data } }).then(data => {
             // setData(data)
+            message.info('操作成功')
         })
     }
 
@@ -38,7 +39,11 @@ function RedPacket(props) {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
+                values.budget = Math.round(values.budget * 100)
+                values.minPacket = Math.round(values.minPacket * 100)
+                values.maxPacket = Math.round(values.maxPacket * 100)
                 console.log(values, '------222-------')
+                // values
                 updateRedPacket(values)
             }
         },
@@ -62,20 +67,20 @@ function RedPacket(props) {
             <Row style={{ marginBottom: '40px' }}>
                 <Col span={8} style={{ paddingRight: '30px' }}>
                     <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>账户余额/元</span><span className={Styles.redHeaderTopNum}>{data.availableBalance/100}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>账户余额/元</span><span className={Styles.redHeaderTopNum}>{data.availableBalance / 100 || 0}</span></div>
                         <div className={Styles.redHeaderBottom}> <Navigate onClick={() => toRecharge()}>去充值</Navigate></div>
                     </div>
                 </Col>
                 <Col span={8} style={{ padding: '0 10px' }}>
                     <div className={Styles.redHeader}>
                         {/* packetSendedNum */}
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{data.sendNum/100}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{data.sendNum || 0}</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail()}>查看详情</Navigate></div>
                     </div>
                 </Col>
                 <Col span={8} style={{ paddingLeft: '30px' }}>
                     <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包金额/元</span><span className={Styles.redHeaderTopNum}>{data.sendTotalAmount/100}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包金额/元</span><span className={Styles.redHeaderTopNum}>{data.sendTotalAmount / 100 || 0}</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail(1)}>查看详情</Navigate></div>
                     </div>
                 </Col>
@@ -83,43 +88,72 @@ function RedPacket(props) {
             <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
                 <Form.Item label="本次红包预算/元">
                     {getFieldDecorator('budget', {
-                        initialValue: data.budget,
-                        // rules: [
-                        //     {
-                        //         type: 'number', message: '123'
-                        //     }
-                        // ],
+                        initialValue: data.budget / 100,
+                        rules: [
+
+                            { required: true, message: '请设置合适的红包预算金额', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
+                            {
+                                validator: (rule, value, callback) => {
+                                    callback(value > (data.availableBalance + data.sendTotalAmount) / 100 ? '预算超支' : value < data.sendTotalAmount / 100 ? '红包预算不能小于已发送红包金额' : undefined)
+                                }
+                            }
+                        ],
                     },
                     )(
-                        <Input type="number" min={0} max={99999} />,
+                        <Input type="number"
+                            // formatter={value => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                            // parser={value => value.replace(/\$\s?|(,*)/g, '')}
+                            min={0}
+                            max={99999}
+                            step={0.01}
+                        />,
                     )}
                 </Form.Item>
                 <Form.Item label="单个红包金额范围/元">
                     {getFieldDecorator('minPacket', {
-                        initialValue: data.minPacket || 3,
+                        initialValue: data.minPacket / 100 || 3,
+                        rules: [
+                            { required: true, message: '请设置合适的最小红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
+                        ],
                     })(
-                        <InputNumber min={1} max={1000} />,
+                        <InputNumber min={1} max={199} />,
                     )}~
                      {getFieldDecorator('maxPacket', {
-                        initialValue: data.maxPacket || 3,
+                        initialValue: data.maxPacket / 100 || 3,
+                        rules: [
+                            { required: true, message: '请设置合适的最大红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
+                        ],
                     })(
-                        <InputNumber min={1} max={1000} />,
+                        <InputNumber min={1} max={199} />,
                     )}
                 </Form.Item>
+                {/*  */}
                 <Form.Item label="发放红包个数上限">
                     {getFieldDecorator('limitPacketNum', {
-                        initialValue: data.limitPacketNum === -1 ? 0 : data.limitPacketNum,
-                    })(
-                        <Input type="number" />,
-                    )}
+                        initialValue: data.limitPacketNum === -1 ? -1 : data.limitPacketNum,
+                        rules: [
+                            // { required: false, message: '请设置合适的发放红包个数上限', pattern: new RegExp('^[0-9]{1,99}\d*$') }, help="-1为不限制红包个数" 
+                            {
+                                validator: (rule, value, callback) => {
+                                    // callback(((value > data.sendNum || data.limitPacketNum === -1) ? undefined : '不能小于已发送个数'))
+                                    callback(value >= data.sendNum ? undefined : value == -1 ? undefined : '不能小于已发送个数')
+                                },
+                            },
+
+                        ],
+                    })(<InputNumber precision={0} min={-1} />,
+                    )} -1为不限制红包个数
                 </Form.Item>
-                <Form.Item label="余额或预算不足时提示文案">
+                {/* <Form.Item label="余额或预算不足时提示文案">
                     {getFieldDecorator('insufficientBalanceTip', {
                         initialValue: data.insufficientBalanceTip || '红包已发送完毕，谢谢您的参与',
+                        rules: [
+                            { required: true, message: '请设置余额或预算不足时提示文案' },
+                        ],
                     })(
                         <Input placeholder="红包已发送完毕，谢谢您的参与" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 {/* font-size:22px;
 font-family:PingFangSC-Medium,PingFang SC;
 font-weight:500;
@@ -127,9 +161,13 @@ color:rgba(102,102,102,1); */}
                 <Row>
                     <Col span={8} style={{ textAlign: 'end', fontSize: '0.13rem', fontWeight: '500', color: 'rgba(102,102,102,1)', padding: '0 0.076rem' }}>配置消息</Col>
                 </Row>
-                <Form.Item label="商品名称" >
+                <Form.Item label="商户名称" >
                     {getFieldDecorator('mchName', {
                         initialValue: data.mchName,
+                        rules: [
+                            { required: true, message: '请设置商户名称' },
+                            { max: 10, message: '标商户名称长度不能超过10个字符' }
+                        ],
                     })(
                         <Input placeholder="{小程序名}" />,
                     )}
@@ -137,6 +175,9 @@ color:rgba(102,102,102,1); */}
                 <Form.Item label="红包祝福语">
                     {getFieldDecorator('blessing', {
                         initialValue: data.blessing,
+                        rules: [
+                            { required: true, message: '请设置红包祝福语' },
+                        ],
                     })(
                         <Input placeholder="祝您中个大红包！" />,
                     )}
@@ -144,6 +185,9 @@ color:rgba(102,102,102,1); */}
                 <Form.Item label="活动名称">
                     {getFieldDecorator('activityName', {
                         initialValue: data.activityName,
+                        rules: [
+                            { required: true, message: '请设置活动名称' },
+                        ],
                     })(
                         <Input placeholder="{活动标题}" />,
                     )}
@@ -151,13 +195,13 @@ color:rgba(102,102,102,1); */}
                 <Form.Item label="备注">
                     {getFieldDecorator('remark', {
                         initialValue: data.remark,
+                        rules: [
+                            { required: true, message: '请设置remark' },
+                        ],
                     })(
                         <Input placeholder="点我拆红包" />,
                     )}
                 </Form.Item>
-
-
-
                 <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
                     <div style={{ width: '190px' }}>
                         <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>

src/pages/activity/drainage/components/RedPacketRecord.jsx

@@ -6,7 +6,7 @@ import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 
 const TradingStatus = {
-    processing: '进行中',
+    // processing: '进行中',
     success: '成功',
     fail: '失败',
 }
@@ -77,7 +77,7 @@ function RedPacketRecord(props) {
             dataIndex: 'avatarurl',
             key: 'avatarurl',
             align: 'center',
-            render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
+            render: (x, row) => <img src={row.avatarurl} alt="" width="64px"></img >,
         },
         {
             title: '手机号',
@@ -93,16 +93,17 @@ function RedPacketRecord(props) {
         },
         {
             title: '金额（元）',
-            dataIndex: 'packetAmount',
-            key: 'packetAmount',
+            dataIndex: 'amount',
+            key: 'amount',
             align: 'center',
+            render: x => <span>{x / 100}</span >,
         },
         {
             title: '发送状态',
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: x => <span>{ TradingStatus[x] || ''}</span>,
+            render: x => <span>{TradingStatus[x] || ''}</span>,
         },
     ]
 

src/pages/activity/groupActivity/detailActivity.jsx

@@ -142,228 +142,232 @@ const BasicForm = props => {
 
 const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  const { groupActivityId } = props.location.query
-  const [detailData, setDetailData] = useState(false)
-
-  useEffect(() => {
-    if (groupActivityId) {
-      getDynamicData(groupActivityId);
-    }
-  }, [])
-
-  // 查询详情
-  const getDynamicData = (groupActivityId) => {
-    request({ ...apis.groupActivity.details, urlData: {id: groupActivityId } }).then((data) => {
-      console.log(data)
-      data.activityTime = [moment(data.startTime), moment(data.endTime)]
+const Poster = (props) => {
+  const { groupActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
 
-      // setActivityStatus(data.activityStatus)
-      // setDisable(data.activityStatus === 0 ? true : false)
-      // props.form.setFieldsValue(data)
-      setDetailData(data)
+  if (groupActivityId) {
+    console.log(groupActivityId, 'groupActivityId')
+    useEffect(() => {
+      request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then((data) => {
+        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 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: 'groupActivity' } }).then((data) => {
-          if (data.length > 0) {
-            setPosterId(data[0].posterId)
-            changeImg(data[0].posterImg)
-            changeTextArea(data[0].posterDescription)
-            changeInput(data[0].posterTitle)
-          }
+  const submitPoster = () => {
+    if (helpActivityId) {
+      if (posterId) {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          message.info("保存成功")
         }).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 (helpActivityId) {
-        if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'groupActivity', 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: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
-            setPosterId(data.posterId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'groupActivity', 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>
+  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>
+          <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>
-          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
         </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' }}>活动海报图</p>
-            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
-          </div>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
-          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</p>
-            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
-          </div>
+      {/* <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</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={() => cancelPage()}>
-        取消
-      </Button> */}
+      </div> */}
     </div>
+    {/* <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button> */}
+  </div>
+
+}
 
-  }
 
 
+const Share = (props) => {
+  const { groupActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
 
-  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: 'groupActivity' }, }).then((data) => {
+        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) {
-      useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' }, }).then((data) => {
-          if (data.length > 0) {
-            setShareContentId(data[0].shareContentId)
-            changeImg(data[0].shareContentImg)
-            changeInput(data[0].shareContentTitle)
-          }
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          message.info("保存成功")
         }).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: 'groupActivity', 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: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            setShareContentId(data.shareContentId)
-            message.info("保存成功")
-          }).catch(err => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', 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' }}>分享模板</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: '160px' }} 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' }}>分享标题</p>
-        {inputValue === '' ? '无' : <span>{inputValue}</span>}
-      </div>
-      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
-        {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+  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' }}>分享模板</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: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
       </div>
-      {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>
-        取消
-      </Button> */}
     </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      {inputValue === '' ? '无' : <span>{inputValue}</span>}
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
+      {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+    </div>
+    {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button> */}
+  </div>
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { groupActivityId } = props.location.query
+  const [detailData, setDetailData] = useState(false)
+
+  useEffect(() => {
+    if (groupActivityId) {
+      getDynamicData(groupActivityId);
+    }
+  }, [])
+
+  // 查询详情
+  const getDynamicData = (groupActivityId) => {
+    request({ ...apis.groupActivity.details, urlData: {id: groupActivityId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startTime), moment(data.endTime)]
+
+      // setActivityStatus(data.activityStatus)
+      // setDisable(data.activityStatus === 0 ? true : false)
+      // props.form.setFieldsValue(data)
+      setDetailData(data)
+    })
   }
 
+  
+
   return (
     <div>
       <div>
@@ -375,8 +379,8 @@ const Edit = props => {
       </div>
       <div>
         {tab === 'basic' && <Basic groupActivityId={groupActivityId} detailData={detailData}/>}
-        {tab === 'poster' && <Poster />}
-        {tab === 'share' && <Share />}
+        {tab === 'poster' && <Poster groupActivityId={groupActivityId} />}
+        {tab === 'share' && <Share groupActivityId={groupActivityId} />}
       </div>
       <div style={{textAlign: 'center'}}>
         <AuthButton name="admin.share.record" noRight={null}>

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -35,7 +35,7 @@ const Basic = props => {
     {
       label: '选择项目',
       name: 'buildingId',
-      render: <BuildSelect disabled={disable}/>,
+      render: <BuildSelect disabled={disable} />,
       value: dynamicData.buildingId,
       rules: [
         { required: true, message: '请选择项目' },
@@ -126,7 +126,7 @@ const Basic = props => {
       label: '权重',
       name: 'heavy',
       type: FieldTypes.Number,
-      render: <Input type="number" style={{ width: 80}} />,
+      render: <Input type="number" style={{ width: 80 }} />,
       value: dynamicData.heavy,
       rules: [
         { required: true, message: '请输入权重' },
@@ -268,7 +268,7 @@ const Poster = props => {
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
             textOverflow: 'ellipsis',
-          }}>{ textAreaValue || '海报描述'}</p>
+          }}>{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' }}>进入活动查看详情</p>
@@ -283,7 +283,7 @@ const Poster = props => {
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团海报图</p>
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
         </div>
-        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600，比例5:4,格式：jpg，用于拼团活动海报</p>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600，比例5:4,格式：jpg，用于拼团活动海报</p>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
           <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
@@ -302,13 +302,14 @@ const Poster = props => {
 
 
 const Share = props => {
+  console.log(props, 'props')
   const { groupActivityId } = props
   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
 
   useEffect(() => {
-      if (groupActivityId) {
+    if (groupActivityId) {
       request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
         if (data.length > 0) {
           setShareContentId(data[0].shareContentId)
@@ -322,6 +323,7 @@ const Share = props => {
   }, [])
 
   const submitShare = () => {
+    console.log(groupActivityId)
     if (groupActivityId) {
       if (shareContentId) {
         request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
@@ -359,7 +361,7 @@ const Share = props => {
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团分享图</p>
       <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
     </div>
-    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</p>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</p>
     <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
     <Button onClick={() => cancelPage()}>取消</Button>
   </div>
@@ -417,8 +419,8 @@ const Edit = props => {
       </div>
       <div>
         {tab === 'basic' && <Basic dynamicData={dynamicData} disable={disable} activityStatus={activityStatus} scoreData={scoreData} groupActivityId={groupActivityId} />}
-        {tab === 'poster' && <Poster groupActivityId={groupActivityId}/>}
-        {tab === 'share' && <Share />}
+        {tab === 'poster' && <Poster groupActivityId={groupActivityId} />}
+        {tab === 'share' && <Share groupActivityId={groupActivityId} />}
       </div>
       <Prompt message={location =>
         (location.pathname.startsWith('/activity/groupActivity')

src/pages/activity/helpActivity/detailActivity.jsx

@@ -34,18 +34,18 @@ const cancelPage = () => {
 }
 
 const getSignList = helpActivityId => {
-    router.push({
-        pathname: '/activity/helpActivity/signList',
-        query: {
-          helpActivityId,
-        },
-      });
+  router.push({
+    pathname: '/activity/helpActivity/signList',
+    query: {
+      helpActivityId,
+    },
+  });
 }
 
 const BasicForm = props => {
 
   const detailData = props.detailData || {}
-  
+
   const { helpActivityId } = props
 
   const handleSubmit = e => {
@@ -62,7 +62,7 @@ const BasicForm = props => {
           values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
           values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         }
-        
+
         console.log('submit data --->', values)
         if (helpActivityId) {
           values.helpActivityId = helpActivityId
@@ -95,15 +95,15 @@ const BasicForm = props => {
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
-        {getFieldDecorator('buildingId', {
-          initialValue: detailData.buildingId,
-          rules: [
-            {
-              required: true,
-              message: '请选择所属项目',
-            },
-          ],
-        })(<BuildSelect disabled/>)}
+          {getFieldDecorator('buildingId', {
+            initialValue: detailData.buildingId,
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled />)}
         </Form.Item>
         <Form.Item label="活动标题">
           <span>{detailData.title}</span>
@@ -112,7 +112,7 @@ const BasicForm = props => {
           <img src={detailData.img} height="300px" width="375px" />
         </Form.Item>
         <Form.Item label="助力封面图1">
-           <img src={detailData.listImg} height="210px" width="375px" />
+          <img src={detailData.listImg} height="210px" width="375px" />
         </Form.Item>
         <Form.Item label="助力封面图2">
           <img src={detailData.bannerListImg} height="125px" width="375px" />
@@ -139,230 +139,234 @@ const BasicForm = props => {
 
 const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  const { helpActivityId } = props.location.query
-  const [detailData, setDetailData] = useState(false)
 
-  const getDynamicData = helpActivityId => {
-    
-    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
-      console.log(data)
-      data.activityTime = [moment(data.startDate), moment(data.endDate)]
-      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+const Poster = (props) => {
+  const { helpActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
 
-      setDetailData(data)
+  if (helpActivityId) {
+    console.log(helpActivityId, 'helpActivityId')
+    useEffect(() => {
+      request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).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)
     })
   }
 
-  useEffect(() => {
-    
-    if (helpActivityId) {
-      
-      getDynamicData(helpActivityId);
-    }
-  }, [])
-
-  const Poster = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [textAreaValue, changeTextArea] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [posterId, setPosterId] = useState('')
-
+  const submitPoster = () => {
     if (helpActivityId) {
-      console.log(helpActivityId, 'helpActivityId')
-      useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).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)
-          }
+      if (posterId) {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          message.info("保存成功")
         }).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 (helpActivityId) {
-        if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', 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: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
-            setPosterId(data.posterId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'helpActivity', 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>
+  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={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-        </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>
 
-        {/* <div >
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
-            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          <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>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
-          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</p>
-            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
-          </div>
-
-        </div> */}
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
       </div>
-      {/* <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>
-        取消
-      </Button> */}
+
+      {/* <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</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={() => cancelPage()}>
+      取消
+    </Button> */}
+  </div>
 
-  }
+}
 
 
 
-  const Share = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [shareContentId, setShareContentId] = useState('')
+const Share = (props) => {
+  const { helpActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
 
+  if (helpActivityId) {
+    useEffect(() => {
+      request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' }, }).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 (helpActivityId) {
-      useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' }, }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setShareContentId(data[0].shareContentId)
-            changeImg(data[0].shareContentImg)
-            changeInput(data[0].shareContentTitle)
-          }
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          message.info("保存成功")
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
-      }, [])
-    }
-
-    const submitShare = () => {
-      if (helpActivityId) {
-        if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            setShareContentId(data.shareContentId)
-            message.info("保存成功")
-          }).catch(err => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helpActivity', 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' }}>分享模板</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: '160px' }} 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' }}>分享标题</p>
-        {inputValue === '' ? '无' : <span>{inputValue}</span>}
-      </div>
-      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
-        {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+  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' }}>分享模板</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: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
       </div>
-      {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>
-        取消
-      </Button> */}
     </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      {inputValue === '' ? '无' : <span>{inputValue}</span>}
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
+      {imgValue === '' ? '无' : <img src={imgValue} height="120px" height="150px" />}
+    </div>
+    {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button> */}
+  </div>
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { helpActivityId } = props.location.query
+  const [detailData, setDetailData] = useState(false)
+
+  const getDynamicData = helpActivityId => {
+
+    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+      setDetailData(data)
+    })
   }
 
+  useEffect(() => {
+
+    if (helpActivityId) {
+
+      getDynamicData(helpActivityId);
+    }
+  }, [])
+
+
   return (
     <div>
       <div>
@@ -373,21 +377,21 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic helpActivityId={helpActivityId} detailData={detailData}/>}
-        {tab === 'poster' && <Poster />}
-        {tab === 'share' && <Share />}
+        {tab === 'basic' && <Basic helpActivityId={helpActivityId} detailData={detailData} />}
+        {tab === 'poster' && <Poster helpActivityId={helpActivityId} />}
+        {tab === 'share' && <Share helpActivityId={helpActivityId} />}
       </div>
-      <div style={{textAlign: 'center'}}>
+      <div style={{ textAlign: 'center' }}>
         <AuthButton name="admin.help.record" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && 
-            <span 
-              style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} 
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&
+            <span
+              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
               onClick={getSignList.bind(this, detailData.helpActivityId)}>
               <Button>助力记录</Button>
             </span>}
-          </AuthButton>
-          <Button onClick={() => cancelPage()}>
-            取消
+        </AuthButton>
+        <Button onClick={() => cancelPage()}>
+          取消
           </Button>
       </div>
       <Prompt message={location =>

src/pages/funds/accountfunds/components/Basic.jsx

@@ -3,6 +3,7 @@ import { Button, Modal, Input, Row, Col, message } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import Navigate from '@/components/Navigate';
+import AuthButton from '@/components/AuthButton';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 import Styles from './styles.less';
@@ -32,9 +33,13 @@ function Basic(props) {
 
     const handleOkRecharge = e => {
         console.log(e, '123123')
+        if (e == 0) {
+            message.error('充值金额不能为0')
+            return
+        }
         if (e) {
 
-            request({ ...apis.funds.saveOrder, data: { amount: e } }).then(data => {
+            request({ ...apis.funds.saveOrder, data: { amount: Math.round(e * 100) } }).then(data => {
                 setAmount(data)
                 showModal('pay')
             }).catch(err => {
@@ -47,10 +52,10 @@ function Basic(props) {
     };
     // data: { amount: e }
     const handleOkRefund = e => {
-        console.log(e, '123123')
+        console.log(e, e * 100, '123123')
 
         if (e) {
-            request({ ...apis.funds.saveRefundOrder, data: { amount: e } }).then(data => {
+            request({ ...apis.funds.saveRefundOrder, data: { amount: Math.round(e * 100) } }).then(data => {
                 message.info('申请退款成功')
                 setvisiblea(false)
             }).catch(err => {
@@ -72,7 +77,12 @@ function Basic(props) {
         if (e === 'success') {
             showModal('contact')
         } else {
-            showModal()
+            // showModal()
+            Modal.error({
+                title: '充值失败',
+                // content: 'some messages...some messages...',
+            });
+            setvisiblea(false)
         }
         // setConfirmLoading(true)
         // setTimeout(() => {
@@ -93,7 +103,7 @@ function Basic(props) {
             //   buildingId: rowData.buildingId,
             //   salesBatchId: rowData.salesBatchId,
         })
-        
+
     }
 
 
@@ -146,8 +156,12 @@ function Basic(props) {
                 </div>
             </div>
             <div style={{ textAlign: 'center', marginTop: '272px' }}>
-                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => showModal('recharge')}>充值</Button>
-                <Button className={Styles.btn} style={{ marginLeft: '80px' }} onClick={() => showModal('refund')}>退款</Button>
+                <AuthButton name="admin.funds.account.recharge" noRight={null}>
+                    <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => showModal('recharge')}>充值</Button>
+                </AuthButton>
+                <AuthButton name="admin.funds.account.refund" noRight={null}>
+                    <Button className={Styles.btn} style={{ marginLeft: '80px' }} onClick={() => showModal('refund')}>退款</Button>
+                </AuthButton>
             </div>
 
             <Modal
@@ -162,7 +176,7 @@ function Basic(props) {
             >
                 {title === '线上充值' && <Recharge value={e => handleOkRecharge(e)}></Recharge>}
                 {title === '申请退款' && <Refund balance={data.availableBalance / 100 || 0} value={e => handleOkRefund(e)}></Refund>}
-                {title === '扫码支付' && visible && <Pay amount={amount} visible={visible} value={e => handleOkRepay(e)}></Pay>}
+                {title === '扫码支付' && <Pay amount={amount} visible={visible} value={e => handleOkRepay(e)}></Pay>}
                 {title === '联系我们' && <Contact></Contact>}
 
             </Modal>

src/pages/funds/accountfunds/components/ConsumerOrder.jsx

@@ -5,8 +5,11 @@ import moment from 'moment';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 import Navigate from '@/components/Navigate';
+import AuthButton from '@/components/AuthButton'
 
 const { Option } = Select
+const { RangePicker } = DatePicker
+
 
 function RechargeOrder(props) {
 
@@ -21,14 +24,24 @@ function RechargeOrder(props) {
     // 查询列表
 
     const getList = params => {
-        if (params.startTime) {
-            params.startTime = `${moment(params.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (params.endTime) {
-            params.endTime = `${moment(params.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [startTime, endTime] = LocalDate
+            values.startTime = `${moment(startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.endTime = `${moment(endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.startTime = null
+            values.endTime = null
         }
-        console.log("请求数据", params)
-        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...params, consumeType: 'RedPacket' } }).then(data => {
+        // if (params.startTime) {
+        //     params.startTime = `${moment(params.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.endTime) {
+        //     params.endTime = `${moment(params.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        // console.log("请求数据", params)
+        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...values, consumeType: 'RedPacket' } }).then(data => {
             setData(data)
         })
     }
@@ -78,13 +91,15 @@ function RechargeOrder(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+            render: x => <><span>{x / 100 || ''}</span></>,
         },
         {
             title: '消费方式',
             dataIndex: 'itemType',
             key: 'itemType',
             align: 'center',
-            render: (x, row) => <><span>{`${row.itemType == 'RedPacket' ? '红包' : ''}`}</span></>,
+            // render: () => <>红包</>,
+            render: (x, row) => <><span>{`${row.consumeType === 'RedPacket' ? '红包' : ''}`}</span></>,
         },
         {
             title: '活动名称',
@@ -97,7 +112,7 @@ function RechargeOrder(props) {
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
-            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+            render: (x, row) => <><span>{`${moment(row.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },
         {
             title: '接收人手机号',
@@ -131,13 +146,23 @@ function RechargeOrder(props) {
 
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
-        if (requestParams.startTime) {
-            requestParams.startTime = `${moment(requestParams.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (requestParams.endTime) {
-            requestParams.endTime = `${moment(requestParams.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [startTime, endTime] = LocalDate
+            values.startTime = `${moment(startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.endTime = `${moment(endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.startTime = null
+            values.endTime = null
         }
-        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...requestParams, consumeType: 'redPackage' } }).then(data => {
+        // if (requestParams.startTime) {
+        //     requestParams.startTime = `${moment(requestParams.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.endTime) {
+        //     requestParams.endTime = `${moment(requestParams.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...values, consumeType: 'RedPacket' } }).then(data => {
             download(data)
         }).catch()
     }
@@ -155,6 +180,15 @@ function RechargeOrder(props) {
                         />,
                     )}
                 </Form.Item>
+
+
+                <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['消费开始时间', '消费结束时间']} />,
+                    )}
+                </Form.Item>
+                {/* 
+
                 <Form.Item>
                     {getFieldDecorator('startTime')(
                         <DatePicker placeholder="消费开始时间" />,
@@ -164,7 +198,7 @@ function RechargeOrder(props) {
                     {getFieldDecorator('endTime')(
                         <DatePicker placeholder="消费结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('tradingStatus')(
                         <Select style={{ width: '180px' }} placeholder="消费状态">
@@ -195,7 +229,9 @@ function RechargeOrder(props) {
                 </Form.Item>
             </Form>
             <div style={{ marginTop: '20px' }}>
-                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                <AuthButton name="admin.funds.account.recharge" noRight={null}>
+                    <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                </AuthButton>
             </div>
             <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
@@ -217,17 +253,17 @@ function RechargeOrder(props) {
                 <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }}>
                     <Form.Item label="昵称">
 
-                        <span>{modalData.nickName}</span>
+                        <span>{modalData.nickname}</span>
 
                     </Form.Item>
                     <Form.Item label="头像">
 
-                        <img src={modalData.avatarurl} alt="" />
+                        <img src={modalData.avatarurl} alt="" width="100px" height="100px" />
 
                     </Form.Item>
                     <Form.Item label="姓名">
 
-                        <span>{modalData.name}</span>
+                        <span>{modalData.name || modalData.nickname}</span>
 
                     </Form.Item>
                     <Form.Item label="手机号">

src/pages/funds/accountfunds/components/Contact.jsx

@@ -1,19 +1,12 @@
-import React, { useState } from 'react';
-import { Button, Input, Row, Col } from 'antd';
-import Styles from './styles.less';
-import Navigate from '@/components/Navigate';
+import React from 'react';
+import ContactText from './contactText'
 
-const Recharge = props => {
-
-    const [value, setValue] = useState()
-
-    return (
-        <>
-            <span style={{ fontSize: '22px', color: '#979797', lineHeight: '30px' }}>重要说明：</span>
-            <div style={{ fontSize: '18px', color: '#333', lineHeight: '34px', marginTop: '20px' }}>
-                您已充值成功，微信充值到账为T+7，因此，充值金额7日后才能到账，为不影响客户使用，实际活动金额由橙蕉预先充值垫付，需要在使用预算前和运营人员确认橙蕉余额是否充足， <Navigate>请联系我们</Navigate>
-            </div>
-        </>
-    )
-}
+const Recharge = () => (
+    <>
+        <span style={{ fontSize: '22px', color: '#979797', lineHeight: '30px' }}>重要说明：</span>
+        <div style={{ fontSize: '18px', color: '#333', lineHeight: '34px', marginTop: '20px' }}>
+            您已充值成功，微信充值到账为T+7，因此，充值金额7日后才能到账，为不影响客户使用，实际活动金额由橙蕉预先充值垫付，需要在使用预算前和运营人员确认橙蕉余额是否充足，<ContactText />
+        </div>
+    </>
+)
 export default Recharge

src/pages/funds/accountfunds/components/Pay.jsx

@@ -1,84 +1,61 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { Button, Input, Row, Col, message } from 'antd';
 import QRCode from 'qrcode.react';
 import Styles from './styles.less';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 
+
+let intervalState = true
 const Recharge = props => {
 
-    const { amount, visible } = props
-    console.log(amount, visible, 'amount')
+    const { amount } = props
+    console.log(amount, 'amount')
     const { orderInfo } = amount
     console.log(orderInfo, 'orderInfo')
     useEffect(() => {
-        getByInfo
+        console.log(props.visible, 'props.visible')
+
+        return () => clearInterval(getByInfo);
         // setTimeout(() => { getByInfo() }, 1000)
-    }, [])
+    }, [props.visible])
 
 
     const getByInfo = setInterval(() => {
-
-
-
-        request({ ...apis.funds.getByInfo, params: { orderId: orderInfo.orderId } }).then(data => {
-            if (data.tradingStatus === 'processing') {
-
-                // clearInterval(getByInfo)
-                // props.value()
-                if (!visible) { clearInterval(getByInfo) }
-            } else if (data.tradingStatus === 'success') {
-                mmessage.info('充值成功')
-                
-                props.value('success')
+        if (intervalState) {
+            intervalState = false
+            request({ ...apis.funds.getByInfo, params: { orderId: orderInfo.orderId } }).then(data => {
+                if (data.tradingStatus === 'processing') {
+                    // clearInterval(getByInfo)
+                    // props.value()
+                    // if (!visible) { clearInterval(getByInfo) }
+                    intervalState = true
+                } else if (data.tradingStatus === 'success') {
+                    message.info('充值成功')
+                    clearInterval(getByInfo)
+
+                    props.value('success')
+                } else {
+                    message.info('充值失败')
+                    clearInterval(getByInfo)
+                    props.value('fail')
+                }
+                // tradingStatus
+                // setTimeout(() => { getByInfo() }, 1000)
+            }).catch(err => {
+                console.log(err)
                 clearInterval(getByInfo)
-            } else {
-                mmessage.info('充值失败')
-                
+                message.info('充值失败')
                 props.value('fail')
-                clearInterval(getByInfo)
-            }
-            // tradingStatus
-            // setTimeout(() => { getByInfo() }, 1000)
-        }).catch(err => {
-            console.log(err)
-            clearInterval(getByInfo)
-        })
-    }, 1000)
-
-
-    // {
-    //     request({ ...apis.funds.getByInfo, params: { orderId: orderInfo.orderId } }).then(data => {
-    //         if (data.tradingStatus === 'processing') {
-    //             setTimeout(() => { getByInfo() }, 1000)
-    //         } else if (data.tradingStatus === 'success') {
-    //             mmessage.info('充值成功')
-    //         } else {
-    //             mmessage.info('充值失败')
-    //         }
-
-    //         // tradingStatus
-    //         // setTimeout(() => { getByInfo() }, 1000)
-    //     }).catch(err => {
-    //         console.log(err)
-    //     })
-    // }
-    // getByInfo
-
-
-    // const [value, setValue] = useState()
+            })
+        }
+    }, 2000)
 
-    // function onChange(e) {
-    //     if (e.target.value <= 0) return
-    //     if (e.target.value > 99999.99) { setValue(99999.99); return }
-    //     console.log('changed', e.target.value);
-    //     setValue(e.target.value)
 
-    // }
     return (
         <>
             <div style={{ fontSize: '18px', fontWeight: '400', color: '#333333' }}>
-                <span onClick={props.value}>充值金额{amount.amount}元</span><span style={{ marginLeft: '80px' }}>微信商户手续费率{amount.mchPayRate}</span><span style={{ marginLeft: '80px' }}>手续费{amount.serviceFee}元</span>
+                <span onClick={props.value}>充值金额{amount.amount / 100 || 0}元</span><span style={{ marginLeft: '80px' }}>微信商户手续费率{amount.mchPayRate}</span><span style={{ marginLeft: '80px' }}>手续费{amount.serviceFee / 100 || 0}元</span>
                 {/* <img src="" alt="" width:/> */}
             </div>
             <div style={{ height: '278px', borderRadius: '12px', border: '1px solid rgba(218,218,218,1', margin: '40px 0', display: 'flex' }}>
@@ -92,7 +69,7 @@ const Recharge = props => {
                 </div>
                 <div className={Styles.boxRight}>
                     <div className={Styles.child}>
-                        <p style={{ lineHeight: '43px', height: '43px', marginBottom: '5px' }}><span style={{ fontSize: '32px', fontWeight: '600', color: '#EF273A' }}>￥{amount.realAmount}</span><span style={{ marginLeft: '5px' }}>应付金额</span></p>
+                        <p style={{ lineHeight: '43px', height: '43px', marginBottom: '5px' }}><span style={{ fontSize: '32px', fontWeight: '600', color: '#EF273A' }}>￥{amount.realAmount / 100 || 0}</span><span style={{ marginLeft: '5px' }}>应付金额</span></p>
                         <p>仅支持微信支付</p>
                     </div>
 

src/pages/funds/accountfunds/components/Recharge.jsx

@@ -7,9 +7,17 @@ import ContactText from './contactText'
 const Recharge = props => {
 
     const [value, setValue] = useState()
-
+    // /^1[3456789]\d{9}$/
     function onChange(e) {
-        if (e.target.value <= 0) return
+        // if (e.target.value < 0) return
+        // if (e.target.value == '') { setValue(e.target.value); return }
+        // if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+        // if (e.target.value > balance) { setValue(balance); return }
+        // // console.log('changed', e.target.value);
+        // setValue(e.target.value)
+        if (e.target.value == '') { setValue(e.target.value); return }
+        if (e.target.value < 0) return
+        if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
         if (e.target.value > 99999.99) { setValue(99999.99); return }
         console.log('changed', e.target.value);
         setValue(e.target.value)
@@ -25,7 +33,7 @@ const Recharge = props => {
                     <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px', marginTop: '20px' }}>1.充值流程：输入充值金额-点击确定-扫码支付-支付成功。</p>
                     <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>2.因微信限制，微信充值有手续费，因此充值金额中应包含手续费，费率1%。</p>
                     <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>3.微信充值到账为T+7，因此，充值金额7日后才能到账，为不影响客户使用，实际活动金额由橙蕉预先充值垫付，需要在使用预算前和运营人员确认橙蕉余额是否充足。充值后请联系我们。</p>
-                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>4.您也可使用银行卡转账/支付宝支付/对公账户打款/现金支付等方式充值，具体方式请<ContactText /></p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>4.您也可使用银行卡转账/支付宝支付/对公账户打款/现金支付等方式充值，具体方式<ContactText /></p>
                 </Col>
             </Row>
             <div style={{ textAlign: 'center', marginTop: '40px' }}>

src/pages/funds/accountfunds/components/RechargeOrder.jsx

@@ -5,8 +5,11 @@ import moment from 'moment';
 import Navigate from '@/components/Navigate'
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
+import AuthButton from '@/components/AuthButton';
 import ShowVoucher from './ShowVoucher';
 
+const { RangePicker } = DatePicker
+
 
 const { Option } = Select
 
@@ -28,14 +31,25 @@ function RechargeOrder(props) {
     // 查询列表
 
     const getList = params => {
-        if (params.payStartTime) {
-            params.payStartTime = `${moment(params.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (params.payEndTime) {
-            params.payEndTime = `${moment(params.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [payStartTime, payEndTime] = LocalDate
+            values.payStartTime = `${moment(payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.payEndTime = `${moment(payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.payStartTime = null
+            values.payEndTime = null
         }
+        // if (params.payStartTime) {
+        //     params.payStartTime = `${moment(params.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.payEndTime) {
+        //     params.payEndTime = `${moment(params.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
 
-        request({ ...apis.funds.czlist, params: { ...params } }).then(data => {
+        request({ ...apis.funds.czlist, params: { ...values } }).then(data => {
             setData(data)
         })
     }
@@ -89,6 +103,7 @@ function RechargeOrder(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+            render: x => <><span>{x / 100 || ''}</span></>,
         },
         {
             title: '充值方式',
@@ -109,14 +124,14 @@ function RechargeOrder(props) {
             dataIndex: 'certificateUrlList',
             key: 'certificateUrlList',
             align: 'center',
-            render: (x, row) => <>{`${row.certificateUrlList == null ? '' :<Navigate onClick={() => openImg(x)}>查看</Navigate> }`}</>,
+            render: (x, row) => <>{row.certificateUrlList == null ? '' : <Navigate onClick={() => openImg(x)}>查看</Navigate>}</>,
         },
         {
             title: '充值状态',
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : (row.tradingStatus == 'success' ? '已支付' : '已超时')}</span></>,
+            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : (row.tradingStatus == 'success' ? '已支付' : '失败')}</span></>,
         },
         {
             title: '支付时间',
@@ -145,13 +160,24 @@ function RechargeOrder(props) {
 
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
-        if (requestParams.payStartTime) {
-            requestParams.payStartTime = `${moment(requestParams.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (requestParams.payEndTime) {
-            requestParams.payEndTime = `${moment(requestParams.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [payStartTime, payEndTime] = LocalDate
+            values.payStartTime = `${moment(payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.payEndTime = `${moment(payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.payStartTime = null
+            values.payEndTime = null
         }
-        request({ ...apis.funds.czexportList, responseType: 'blob', params: { ...requestParams } }).then(data => {
+        // if (requestParams.payStartTime) {
+        //     requestParams.payStartTime = `${moment(requestParams.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.payEndTime) {
+        //     requestParams.payEndTime = `${moment(requestParams.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.czexportList, responseType: 'blob', params: { ...values } }).then(data => {
             download(data)
         }).catch()
     }
@@ -167,7 +193,15 @@ function RechargeOrder(props) {
                         />,
                     )}
                 </Form.Item>
+
                 <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['支付开始时间', '支付结束时间']} />,
+                    )}
+                </Form.Item>
+
+
+                {/* <Form.Item>
                     {getFieldDecorator('payStartTime')(
                         <DatePicker placeholder="支付开始时间" />,
                     )}
@@ -176,7 +210,7 @@ function RechargeOrder(props) {
                     {getFieldDecorator('payEndTime')(
                         <DatePicker placeholder="支付结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('isOffline')(
                         <Select style={{ width: '180px' }} placeholder="充值方式">
@@ -192,7 +226,7 @@ function RechargeOrder(props) {
                             <Option value="">全部</Option>
                             <Option value="processing">待支付</Option>
                             <Option value="success">已支付</Option>
-                            <Option value="fail">已超时</Option>
+                            <Option value="fail">失败</Option>
                         </Select>,
                     )}
                 </Form.Item>
@@ -216,7 +250,9 @@ function RechargeOrder(props) {
                 </Form.Item>
             </Form>
             <div style={{ marginTop: '20px' }}>
-                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                <AuthButton name="admin.funds.account.export" noRight={null}>
+                    <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                </AuthButton>
             </div>
             <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/funds/accountfunds/components/Refund.jsx

@@ -1,18 +1,28 @@
 import React, { useState } from 'react';
 import { Button, Input, Row, Col } from 'antd';
 import Styles from './styles.less';
-import Navigate from '@/components/Navigate';
+import ContactText from './contactText'
 
 const Recharge = props => {
-
     const { balance } = props
 
+    // if (e.target.value == 0) { setValue(0); return }
+    // if (e.target.value <= 0) return
+    // if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+    // if (e.target.value > 99999.99) { setValue(99999.99); return }
+    // console.log('changed', e.target.value);
+    // setValue(e.target.value)
+
     const [value, setValue] = useState()
 
     function onChange(e) {
-        // if (e.target.value <= 0) return
-        // if (e.target.value > balance) { setValue(balance); return }
         console.log('changed', e.target.value);
+        // if (e.target.value == 0) { setValue(); return }
+        if (e.target.value < 0) return
+        if (e.target.value == '') { setValue(e.target.value); return }
+        if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
+        if (e.target.value > balance) { setValue(balance); return }
+        // console.log('changed', e.target.value);
         setValue(e.target.value)
 
     }
@@ -23,7 +33,7 @@ const Recharge = props => {
                 <Col span={17} offset={1}>
                     <Input type="number" min={0} step={0.01} value={value} onChange={onChange} style={{ marginBottom: '40px' }}></Input>
                     <span style={{ fontSize: '20px', color: '#979797', lineHeight: '30px' }}>账户余额：{balance}元</span>
-                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px', marginTop: '20px' }}>因微信商户平台限制，需先提交退款申请，提交后会冻结退款额对应余额资金，冻结金额无法使用，若您的平台有正在举办的活动等需要消费的地方，请预留充足的余额。如有疑问， <Navigate>请联系我们</Navigate></p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px', marginTop: '20px' }}>因微信商户平台限制，需先提交退款申请，提交后会冻结退款额对应余额资金，冻结金额无法使用，若您的平台有正在举办的活动等需要消费的地方，请预留充足的余额。如有疑问， <ContactText /></p>
                 </Col>
             </Row>
             <div style={{ textAlign: 'center', marginTop: '40px' }}>

src/pages/funds/accountfunds/components/RefundOrder.jsx

@@ -5,12 +5,15 @@ import moment from 'moment';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
 import apis from '../../../../services/apis';
+import AuthButton from '@/components/AuthButton';
 import request from '../../../../utils/request';
 import Navigate from '@/components/Navigate'
 import ShowVoucher from './ShowVoucher';
 
 const { Option } = Select
 
+const { RangePicker } = DatePicker
+
 function RechargeOrder(props) {
 
     // const [taNoticeList, setTaNoticeList] = useState([])
@@ -24,13 +27,23 @@ function RechargeOrder(props) {
     // 查询列表
 
     const getList = params => {
-        if (params.refundStartTime) {
-            params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (params.refundEndTime) {
-            params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [refundStartTime, refundEndTime] = LocalDate
+            values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.refundStartTime = null
+            values.refundEndTime = null
         }
-        request({ ...apis.funds.refundlist, params: { ...params } }).then(data => {
+        // if (params.refundStartTime) {
+        //     params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.refundEndTime) {
+        //     params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.refundlist, params: { ...values } }).then(data => {
             setData(data)
         })
     }
@@ -84,7 +97,7 @@ function RechargeOrder(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
-        render: (x, row) => <><span>{`${row.amount/100}`}</span></>,
+            render: (x, row) => <><span>{`${row.amount / 100}`}</span></>,
         },
         {
             title: '退款创建时间',
@@ -98,6 +111,7 @@ function RechargeOrder(props) {
             dataIndex: 'auditStatus',
             key: 'auditStatus',
             align: 'center',
+            // width: '20%',
             render: (x, row) => <><span>{row.auditStatus == 'checking' ? '已申请' : (row.auditStatus == 'agree' ? '已退款' : '已驳回')}</span></>,
         },
         {
@@ -105,6 +119,7 @@ function RechargeOrder(props) {
             dataIndex: 'auditResult',
             key: 'auditResult',
             align: 'center',
+            width: '20%',
         },
 
         {
@@ -112,7 +127,7 @@ function RechargeOrder(props) {
             dataIndex: 'certificateUrlList',
             key: 'certificateUrlList',
             align: 'center',
-            render: (x, row) => <>{`${row.certificateUrlList == null ? '' :<Navigate onClick={() => openImg(x)}>查看</Navigate> }`}</>,
+            render: (x, row) => <>{row.certificateUrlList == null ? '' : <Navigate onClick={() => openImg(x)}>查看</Navigate>}</>,
         },
         {
             title: '操作',
@@ -146,13 +161,22 @@ function RechargeOrder(props) {
 
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
-        if (requestParams.refundStartTime) {
-            requestParams.refundStartTime = `${moment(requestParams.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [refundStartTime, refundEndTime] = LocalDate
+            values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.refundStartTime = null
+            values.refundEndTime = null
         }
-        if (requestParams.refundEndTime) {
-            requestParams.refundEndTime = `${moment(requestParams.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
-        }
-        request({ ...apis.funds.refundexportList, responseType: 'blob', params: { ...requestParams } }).then(data => {
+        // if (requestParams.refundStartTime) {
+        //     requestParams.refundStartTime = `${moment(requestParams.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.refundEndTime) {
+        //     requestParams.refundEndTime = `${moment(requestParams.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.refundexportList, responseType: 'blob', params: { ...values } }).then(data => {
             download(data)
         }).catch()
     }
@@ -170,7 +194,13 @@ function RechargeOrder(props) {
                         />,
                     )}
                 </Form.Item>
+
                 <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['退款开始时间', '退款结束时间']} />,
+                    )}
+                </Form.Item>
+                {/* <Form.Item>
                     {getFieldDecorator('refundStartTime')(
                         <DatePicker placeholder="退款开始时间" />,
                     )}
@@ -179,31 +209,26 @@ function RechargeOrder(props) {
                     {getFieldDecorator('refundEndTime')(
                         <DatePicker placeholder="退款结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('auditStatus')(
                         <Select style={{ width: '180px' }} placeholder="退款状态">
                             <Option value="">全部</Option>
                             <Option value="checking">已申请</Option>
-                            <Option value="agree">已驳回</Option>
-                            <Option value="unagree">已退款</Option>
+                            <Option value="unagree">已驳回</Option>
+                            <Option value="agree">已退款</Option>
                         </Select>,
                     )}
                 </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('phone')(
-                        <Input
-                            placeholder="接收人手机号"
-                        />,
-                    )}
-                </Form.Item>
                 <Form.Item>
                     <Button type="primary" htmlType="submit"> 搜索</Button>
                     <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                 </Form.Item>
             </Form>
             <div style={{ marginTop: '20px' }}>
-                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                <AuthButton name="admin.funds.account.export" noRight={null}>
+                    <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                </AuthButton>
             </div>
             <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/funds/accountfunds/components/ShowVoucher.jsx

@@ -1,40 +1,10 @@
-import React, { useState, useRef, useEffect } from "react";
-import { Alert, message } from 'antd';
+import React from 'react';
 import Swiper from 'swiper';
-import router from 'umi/router';
-// import request from '../../utils/request'
 import styles from './styles.less'
-import closeImg from '../../../../assets/close.png';
+import closeImg from '../../../../assets/close2.png';
 import classNames from 'classnames';
 import 'swiper/css/swiper.min.css';
 
-const storageKey = 'showSwiperIndex';
-
-// const ShowVoucher = props => {
-
-
-//     useEffect(()={
-
-//     },[])
-
-//     return <>
-//         <div className={styles.content}>
-//             <img src={closeImg} alt="" className={styles.close} onClick={() => props.closeSwiper} />
-//             <div className={classNames(['swiper-container', styles.carousel])}  >
-//                 <div className={classNames(['swiper-wrapper', styles.carousel])} >
-//                     {props.data.bannerList.map((item, index) =>
-//                         <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >
-//                             <img style={{ width: '100%', height: '100%', borderRadius: '10px' }} src={item.noticeImg} alt="" />
-//                         </div>,
-//                     )}
-//                 </div>
-//                 <div className={classNames(['swiper-pagination', styles.dots])}  ></div>
-//             </div>
-//             {/* 123 */}
-//         </div>
-//     </>
-// }
-
 class ShowVoucher extends React.Component {
     constructor(props) {
         super(props);
@@ -93,8 +63,9 @@ class ShowVoucher extends React.Component {
                         <div className={classNames(['swiper-container', styles.carousel])} >
                             <div className={classNames(['swiper-wrapper', styles.carousel])} >
                                 {bannerList.map((item, index) =>
-                                    <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} onClick={() => this.handleSwiperItem(item)}>
-                                        <img style={{ width: '100%', height: '100%', borderRadius: '10px' }} src={item} alt="" />
+                                    <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >
+                                        {/* <img style={{ width: '100%', borderRadius: '10px' }} src={item} alt="" /> */}
+                                        <img style={{ maxHeight: '504px', borderRadius: '10px' }} src={item} alt="" />
                                     </div>,
                                 )}
                             </div>
@@ -109,3 +80,49 @@ class ShowVoucher extends React.Component {
 
 
 export default ShowVoucher
+
+
+
+
+
+// import React, { useState, useEffect } from 'react';
+// import Carousel, { Modal, ModalGateway } from 'react-images';
+
+// const ShowVoucher = props => {
+//     const { bannerList = [], open, onClose } = props;
+//     const [modalIsOpen, setModalIsOpen] = useState(open)
+//     useEffect(() => {
+//         setModalIsOpen(open)
+//     }, [bannerList, open])
+
+//     const toggleModal = () => {
+//         setModalIsOpen(!modalIsOpen)
+//         if (typeof onClose === 'function') {
+//             onClose()
+//         }
+
+//     }
+//     const styleInit = {
+//         header: (base, state) => ({ //头部样式
+//             position: 'absolute',
+//             top: 90,
+//             right: 90,
+//             zIndex: 9999,
+//         }),
+//         view: (base, state) => ({
+//             textAlign: 'center',
+//             height: state.isFullscreen ? '100%' : 600  //当点击全屏的时候图片样式
+//         })
+//     }
+//     return (
+//         <ModalGateway >
+//             {modalIsOpen ? (
+//                 <Modal onClose={toggleModal} >
+//                     <Carousel views={bannerList} styles={styleInit} />
+//                 </Modal>
+//             ) : null}
+//         </ModalGateway>
+//     );
+
+// }
+

src/pages/funds/accountfunds/components/styles.less

@@ -33,6 +33,17 @@ line-height: 97px;
     }
   }
 
+  .mask{
+    width: 100vw;
+    height: 100vh;
+    // max-height: 600px;
+    background-color: rgba(0,0,0,0.32);
+    position: fixed;
+    z-index: 999;
+    top: 0;
+    left: 0;
+}
+
   .btn {
     width: 140px;
     height: 45px;
@@ -97,4 +108,23 @@ float: left;
         right: -22px;
         z-index: 9;
     }
+}
+
+.carousel {
+  width: 32vw;
+  min-width: 757px;
+  height: 21.3vw;
+  min-height: 504px;
+  border-radius: 10px;
+  text-align: center;
+  
+  .carouselItem{
+      width: 32vw;
+      min-width: 757px;
+      height: 21.3vw;
+      min-height: 504px;
+      position: relative;
+      display: inline-block;
+     
+  }
 }

src/pages/funds/financialContact/index.jsx

@@ -50,13 +50,14 @@ function financialContact(props) {
             dataIndex: 'sex',
             key: 'sex',
             align: 'center',
+            render: x => <span>{x == 1 ? '男' : x === 2 ? '女' : '未知'}</span >,
         },
         {
             title: '头像',
             dataIndex: 'avatar',
             key: 'avatar',
             align: 'center',
-            render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
+            render: (x, row) => <img src={row.avatar} alt="" width="93px" height="93px"></img >,
         },
         {
             title: '固话',

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -7,13 +7,14 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import ImageUploader from '../../../components/XForm/ImageUpload';
-
-const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 
 const header = props => {
     const sampleId = props.location.query.id;
+
+    const [data, setData] = useState({})
+
+    const [visible, setVisible] = useState(false)
     // const sampleName = props.location.query.sampleName;
     // const [sampleData, setSampleData] = useState({})
 
@@ -52,6 +53,8 @@ const header = props => {
                 values.fromH5Sample = true
                 request({ ...apis.activity.addtaDrainage, data: { ...values } }).then(data => {
                     message.info('操作成功')
+                    setData(data)
+                    setVisible(true)
 
                 }).catch(err => {
                     message.error(err.msg || err.message)
@@ -68,8 +71,77 @@ const header = props => {
         });
     }
 
+    function disabledDate(current) {
+        // Can not select days before today and today 
+        // console.log(current, 'current')
+        // return current && current < moment().startOf('day');
+        return current < moment().add(0, 'd');
+    }
+
+    const disabledHours = () => {
+        const hours = [];
+        console.log(moment().hour(), 'moment().hour()')
+        for (let i = 0; i < moment().hour(); i++) {
+            hours.push(i);
+        }
+        return hours;
+    };
+
+    const disabledMinutes = currentDate => {
+        const currentMinute = moment().minute();
+        const currentHour = moment(currentDate).hour();
+        const minutes = [];
+        if (currentHour === moment().hour()) {
+            for (let i = 0; i <= currentMinute; i++) {
+                minutes.push(i);
+            }
+        }
+        return minutes;
+    };
+
+    const disabledTime = dateTime => {
+        if (moment(dateTime).isBefore(moment(), 'day')) {
+            return {
+                disabledHours: () => [],
+                disabledMinutes: () => [],
+            };
+        }
+        console.log(moment(dateTime).isSame(moment(), 'day'), 'moment(dateTime).isSame(moment(), )')
+        console.log(moment(dateTime).isSame(moment().add(1, 'days'), 'day'), 'moment(dateTime).isSame(moment().add(1,  )')
+        if (moment(dateTime).isSame(moment().add(1, 'days'), 'day')) {
+            return {
+                disabledHours: () => disabledHours(dateTime),
+                disabledMinutes: () => disabledMinutes(dateTime),
+            };
+        }
+    };
+
+    const toH5Edit = () => {
+        router.push({
+            pathname: '/activity/drainage/h5edit',
+            query: {
+                id: data.activityId,
+                name: data.name,
+                drainageId: data.drainageId,
+            },
+        });
+    }
+
+    const toDrainageDetail = () => {
+        router.push({
+            pathname: '/activity/drainage/DetailDrainage',
+            query: {
+                drainageId: data.drainageId,
+            },
+        });
+    }
+
     const { getFieldDecorator } = props.form;
 
+    function validatorNum(rule, value, callback) {
+        callback(value < 1 || value > 1000 ? '人数必须大于0 小于 1000' : undefined);
+    }
+
     return (
         <>
             <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
@@ -83,15 +155,30 @@ const header = props => {
                         ],
                     })(<Input placeholder="H5活动名称" />)}
                 </Form.Item>
+                <Form.Item label="选择项目">
+                    {getFieldDecorator('buildingId')(
+                        <BuildSelect />,
+                    )}
+                </Form.Item>
                 <Form.Item label="下架时间">
                     {getFieldDecorator('endDate', {
                         // initialValue: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
                         rules: [
                             { required: true, message: '请输入下架时间' },
+
+                            // {
+                            //     validator: (rule, value, callback) => {
+                            //         callback(moment(value).isSame(moment().add(1, 'days'), 'day') ? '金额最多5位整数 2位小数' : undefined)
+                            //     }
+                            // }
+
                         ]
                     })(
                         <DatePicker
                             showTime={{ format: 'HH:mm:ss' }}
+                            disabledDate={disabledDate}
+                            disabledTime={disabledTime}
+                            showToday={false}
                         />,
                     )}
                 </Form.Item>
@@ -103,7 +190,7 @@ const header = props => {
                         ]
                     })(<ImageUploader />)}
                 </Form.Item>
-                <Form.Item label="活动分享语">
+                <Form.Item label="活动分享语" help="可使用{name}代表用户昵称。">
                     {getFieldDecorator('shareTitle', {
                         // initialValue: formsDate.shareTitle,
                         rules: [
@@ -130,6 +217,23 @@ const header = props => {
             <Button onClick={() => router.go(-1)}>取消</Button>
                 </Form.Item>
             </Form>
+            <Modal
+                title="新增成功"
+                visible={visible}
+                // onOk={handleOk}
+                // confirmLoading={confirmLoading}
+                onCancel={() => setVisible(false)}
+                footer={null}
+            // width="1000px"
+            // maskClosable={false}
+            >
+                建议修改内容以适合您的项目，若有红包等需要消费的内容，请到资金管理中查看余额是否充足
+                <div style={{ width: '300px', margin: '30px auto', display: 'flex', justifyContent: 'space-between' }}>
+                    <Button type="primary" style={{ width: '140px' }} onClick={toH5Edit}>修改配置</Button>
+
+                    <Button style={{ width: '140px' }} onClick={toDrainageDetail}>查看H5活动详情</Button>
+                </div>
+            </Modal>
         </>
     )
 }

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -121,11 +121,11 @@ const header = props => {
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <div style={{ margin: '0.16rem 0 0.06rem' }}>
-            <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+            {!!demandData.h5TemplateId && <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
               <Button type="primary" onClick={toAddH5(sampleId)} style={{ marginRight: '20px' }}>
                 创建H5活动
               </Button>
-            </AuthButton>
+            </AuthButton>}
             <Button type="primary" onClick={toDetail(sampleId)} style={{ marginRight: '20px' }}>
               提交需求
           </Button>
@@ -135,13 +135,13 @@ const header = props => {
           </div>
         </Form.Item>
         <div style={{ position: 'fixed', right: '0.4rem', bottom: '6%' }}>
-          <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between', marginBottom: '20px' }}>样例可直接使用 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
-            <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+          {!!demandData.h5TemplateId && <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+            <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between', marginBottom: '20px' }}>样例可直接使用 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
               <Button type="primary" onClick={toAddH5(sampleId)} >
                 创建H5活动
               </Button>
-            </AuthButton>
-          </div>
+            </div>
+          </AuthButton>}
           <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between' }}>我想办类似活动 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
             <Button type="primary" onClick={toDetail(sampleId)} >
               提交需求