bug

src/pages/activity/detailActivity.jsx

@@ -58,39 +58,13 @@ const newQrcode = row => {
 }
 
 const BasicForm = props => {
-  const [isEnlist, setIsEnlist] = useState(1)
-  const [activityStatus, setActivityStatus] = useState(1)
-  const [disable, setDisable] = useState(false)
-  const [detailData, setDetailData] = useState(false)
+  const detailData = props.detailData || {}
 
   const radioOnChange = e => {
-    setIsEnlist(e.target.value)
+    // setIsEnlist(e.target.value)
   }
 
   const { dynamicId } = props
-
-  // 查询详情
-  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)]
-
-      setIsEnlist(data.isEnlist)
-      setActivityStatus(data.activityStatus)
-      setDisable(data.activityStatus === 0 ? true : false)
-      props.form.setFieldsValue(data)
-      setDetailData(data)
-    })
-  }
-
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      props.form.setFieldsValue({ isEnlist })
-      if (dynamicId) {
-        getDynamicData(dynamicId);
-      }
-    }, [])
  
   const handleSubmit = e => {
     e.preventDefault();
@@ -161,7 +135,7 @@ const BasicForm = props => {
           <span>{detailData.title}</span>
         </Form.Item>
         <Form.Item label="活动时间">
-          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD')} —— ${moment(detailData.endDate).format('YYYY-MM-DD')}`}</span>
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm')}`}</span>
         </Form.Item>
         <Form.Item label="活动地点">
           <span>{detailData.address}</span>
@@ -185,20 +159,11 @@ const BasicForm = props => {
           <div style={{ maxHeight: '500px', overflowY: 'auto' }} dangerouslySetInnerHTML={{ __html: detailData.desc}}></div>
         </Form.Item>
         <Form.Item label="报名时间">
-          <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD')}`}</span>
+          <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
         </Form.Item>  
         <Form.Item label="权重">
           <span>{detailData.heavy}</span>
         </Form.Item>
-        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
-          <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>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
-          <Button onClick={() => cancelPage()}>
-            取消
-          </Button>
-        </Form.Item>
       </Form>
     </>
   )
@@ -215,6 +180,24 @@ const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 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);
+      }
+    }, [])
 
 
   const Poster = (props) => {
@@ -421,10 +404,19 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
         {tab === 'poster' && <Poster />}
         {tab === 'share' && <Share />}
       </div>
+      <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>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
+          <Button onClick={() => cancelPage()}>
+            取消
+          </Button>
+      </div>
     </div>
   );
 }

src/pages/activity/drainage/DrainageList.jsx

@@ -306,6 +306,7 @@ const header = (props) => {
           ]})(
           <Input
             placeholder="请输入H5活动链接地址"
+            disabled={formsDate.isMiniapp}
           />,
         )}
       </Form.Item>)}
@@ -321,8 +322,8 @@ const header = (props) => {
             { required: true, message: '请输入活动分享语' },
           ]})(
           <Input
-            placeholder="H5活动分享标题，不超过30字符"
-            maxLength="30"
+            placeholder="分享语，不超过15个字"
+            maxLength="15"
           />,
         )}
       </Form.Item>)}