bug fix

src/pages/activity/drainage/detailDrainage.jsx

@@ -69,10 +69,10 @@ const BasicForm = props => {
         <span>{data.shareTitle}</span>
         </Form.Item>}
         {data.isMiniapp && <Form.Item label="分享图：">
-        <img src={data.shareImg} width="75px" height="60px" />
+        <img src={data.shareImg} width="75px" height="60px" alt="" />
         </Form.Item>}
         {data.isMiniapp && <Form.Item label="中间页飞机图：">
-        <img src={data.middleImg} width="75px" height="166.7px" />
+        <img src={data.middleImg} width="75px" height="166.7px" alt="" />
         </Form.Item>}
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button onClick={() => cancelPage()}>

src/pages/activity/editActivity.jsx

@@ -48,15 +48,15 @@ const BasicForm = props => {
 
   // 查询详情
   const getDynamicData = dynamicId => {
-    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
-      console.log(data)
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+ 
       data.activityTime = [moment(data.startDate), moment(data.endDate)]
       data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
       // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
       setData(data)
       setIsEnlist(data.isEnlist)
       setActivityStatus(data.activityStatus)
-      setDisable(data.activityStatus === 0 ? true : false)
+      setDisable(data.activityStatus === 0)
       props.form.setFieldsValue(data)
     })
   }
@@ -70,15 +70,9 @@ const BasicForm = props => {
   }, [])
   const checkTime = () => {
     function compareDate(dateTime1, dateTime2) {
-      var formatDate1 = new Date(dateTime1)
-      var formatDate2 = new Date(dateTime2)
-      if (formatDate1 > formatDate2) {
-        return true;
-      }
-      else {
-        return false;
-      }
+      return new Date(dateTime1) > new Date(dateTime2)
     }
+    
     // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
 
     // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
@@ -169,8 +163,6 @@ const BasicForm = props => {
     // console.log('-------1--------')
   }
 
-
-
   const { getFieldDecorator } = props.form;
   return (
     <>
@@ -310,211 +302,209 @@ 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 Poster = props => {
+  const { dynamicId } = props
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
 
-  const Poster = props => {
-    const [inputValue, changeInput] = useState('')
-    const [textAreaValue, changeTextArea] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [posterId, setPosterId] = useState('')
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).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()
+  }, [])
+  
+  // 获取小程序名称
+  // const [miniappName, setMiniappName] = useState('')
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     console.log(res, "0000000000000")
+  //     setMiniappName(res)
+  //   })
+  // }
+
+  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)
-          }
-        }).catch((err) => {
+      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' }}>进入活动查看详情</p>
-              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
-            </div>
-          </div>
-          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-        </div>
-
-        <div >
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</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)} />
+  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 || 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>
-          <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} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          <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 || '海报标题'}</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 || '海报描述'}</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>
+            <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
           </div>
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+      </div>
 
+      <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</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} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+        </div>
+
       </div>
-      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>
-        取消
-      </Button>
     </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('')
 
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' } }).then(data => {
 
-  const Share = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [shareContentId, setShareContentId] = useState('')
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }, [dynamicId])
 
+  const submitShare = () => {
     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)
-          }
-        }).catch((err) => {
+      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)
         })
-      }, [dynamicId])
-    }
-
-    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>
-        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
-      </div>
-      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
-        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+  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' }} alt=""/>橙蕉互动</p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
       </div>
-      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：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>
-  }
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
+      <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+    </div>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：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>
+}
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { dynamicId } = props.location.query
 
   return (
     <div>
@@ -527,13 +517,13 @@ const Edit = props => {
       </div>
       <div>
         {tab === 'basic' && <Basic dynamicId={dynamicId} />}
-        {tab === 'poster' && <Poster />}
-        {tab === 'share' && <Share />}
+        {tab === 'poster' && <Poster dynamicId={dynamicId}/>}
+        {tab === 'share' && <Share dynamicId={dynamicId}/>}
       </div>
       <Prompt message={location =>
-        location.pathname.startsWith("/activity/ActivityList")
+        (location.pathname.startsWith('/activity/ActivityList')
           ? true
-          : location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")} />
+          : (location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")))} />
     </div>
   );
 }