提交

src/pages/activity/editActivity.jsx

@@ -25,6 +25,12 @@ const formItemLayout = {
   wrapperCol: { span: 14 },
 };
 
+const cancelPage = () => {
+  router.push({
+    pathname: '/activity/ActivityList',
+  });
+}
+
 const BasicForm = props => {
   const [isEnlist, setIsEnlist] = useState(1)
   const [activityStatus, setActivityStatus] = useState(1)
@@ -222,7 +228,7 @@ const BasicForm = props => {
             确认
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => router.go(-1)}>
+          <Button onClick={() => cancelPage()}>
             取消
           </Button>
         </Form.Item>
@@ -242,12 +248,7 @@ const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 const Edit = props => {
   const [tab, changeTab] = useState('basic')
   const { dynamicId } = props.location.query
-  
-  const cancelPage = () => {
-    router.push({
-      pathname: '/activity/ActivityList',
-    });
-  }
+
 
   const Poster = (props) => {
     const [inputValue, changeInput] = useState('')
@@ -369,7 +370,9 @@ const Edit = props => {
         </div>
       </div>
       <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => router.go(-1)}>取消</Button>
+      <Button onClick={() => cancelPage()}>
+        取消
+      </Button>
     </div>
 
   }
@@ -436,7 +439,9 @@ const Edit = props => {
       </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={() => router.go(-1)}>取消</Button>
+      <Button onClick={() => cancelPage()}>
+        取消
+      </Button>
     </div>
   }
 

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -20,6 +20,12 @@ import xiaochengxu from '../../../assets/xiaochengxu.png'
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
+const cancelPage = () => {
+  router.push({
+    pathname: '/activity/groupActivity/list',
+  });
+}
+
 /**
  *
  *
@@ -56,11 +62,6 @@ const Edit = props => {
       })
   }
 
-  const cancelPage = () => {
-    router.push({
-      pathname: '/activity/groupActivity/list',
-    });
-  }
   const radioOnChange = e => {
     console.log(e.target.value)
     setDynamicData({ ...dynamicData, isEnlist: e.target.value })
@@ -315,7 +316,7 @@ const Edit = props => {
         </div>
       </div>
       <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => router.go(-1)}>取消</Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
     </div>
 
   }
@@ -382,7 +383,7 @@ const Edit = props => {
       </div>
       <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={() => router.go(-1)}>取消</Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
     </div>
   }
 

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -20,6 +20,12 @@ import xiaochengxu from '../../../assets/xiaochengxu.png'
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
+const cancelPage = () => {
+  router.push({
+    pathname: '/activity/helpActivity/list',
+  });
+}
+
 const header = props => {
   const [isEnlist, setIsEnlist] = useState(1)
   // 新增成功后拿到返回的ID
@@ -71,13 +77,6 @@ const header = props => {
   // })
   // }
 
-  
-  const cancelPage = () => {
-    router.push({
-      pathname: '/activity/helpActivity/list',
-    });
-  }
-
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -274,7 +273,7 @@ const header = props => {
             确认
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => router.go(-1)}>
+          <Button onClick={() => cancelPage()}>
             取消
           </Button>
           </Form.Item>
@@ -314,12 +313,6 @@ const Edit = props => {
       })
     }
   
-
-  const cancelPage = () => {
-    router.push({
-      pathname: '/activity/helpActivity/list',
-    });
-  }
   const radioOnChange = e => {
     console.log(e.target.value)
     setDynamicData({ ...dynamicData, isEnlist: e.target.value })
@@ -436,7 +429,7 @@ const Edit = props => {
         </div>
       </div>
       <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => router.go(-1)}>取消</Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
     </div>
 
   }
@@ -503,7 +496,7 @@ const Edit = props => {
       </div>
       <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={() => router.go(-1)}>取消</Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
     </div>
   }