同上-update

src/forge/Main/Diff.jsx

@@ -36,8 +36,9 @@ const Infos = styled.div`
   }
   & > .f-wrap-between {
     padding: 14px 20px 14px 16px;
-    border-radius: 3px 3px 0px 0px;
+    border-radius: 0px 0px 3px 3px;
     border: 1px solid #D0D0D0;
+    border-top: none;
     .df{
       align-items: center;
       & .underline:hover{

src/forge/Order/order.js

@@ -6,7 +6,7 @@ import moment from 'moment';
 
 import NoneData from "../Nodata";
 import OrderItem from "./OrderItem";
-import CheckProfile from '../Component/ProfileModal/Profile';
+import cookie from 'react-cookies';
 
 import axios from "axios";
 
@@ -76,6 +76,14 @@ class order extends Component {
   }
 
   componentDidMount = () => {
+    // const selectParams = cookie.load('selectParams');
+    // let states = selectParams.select_params;
+    // this.setState({
+    //   ...states
+    // },()=>{
+    //   this.getSelectList();
+    //   this.getIssueList('1');
+    // })
     this.getSelectList();
     this.getIssueList('1');
   };
@@ -102,11 +110,11 @@ class order extends Component {
 
   // 获取列表数据
   getIssueList = (status_type, begin, end) => {
+    cookie.remove('selectParams');
     this.setState({
       isSpin: true
     })
     const { select_params } = this.state;
-    console.log(select_params);
     const { projectsId, owner } = this.props.match.params;
     const url = `/${owner }/${projectsId}/issues.json`;
     axios
@@ -120,7 +128,9 @@ class order extends Component {
       })
       .then((result) => {
         if (result) {
-          const issues = result.data.issues
+          const issues = result.data.issues;
+          // let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);
+          // cookie.save('selectParams', {states:this.state},{ expires: inFifteenMinutes,path:`/${owner}/${projectsId}/issues` });
           this.setState({
             data: result.data,
             issues: issues,
@@ -193,11 +203,12 @@ class order extends Component {
       select_params,
       author_id,
       assigned_to_id
+    },()=>{
+      if (!toGet) {
+        const { status_type } = this.state;
+        this.getIssueList(status_type);
+      }
     });
-    if (!toGet) {
-      const { status_type } = this.state;
-      this.getIssueList(status_type);
-    }
   };
 
   renderMenu = (array, name, id, toGet) => {

src/forge/Settings/Webhooks/Index.jsx

@@ -76,10 +76,8 @@ function Index(props) {
         subTitle={`删除后未来事件将不会推送至此Webhook地址：${url}`}
       />
       <Banner>
-        <FlexAJ>
-          <span>Webhooks(网络钩子)</span>
-          <Button type="primary" size="large" onClick={addFunc}>添加Webhook</Button>
-        </FlexAJ>
+        <span>Webhooks(网络钩子)</span>
+        <Button type="primary" size="large" onClick={addFunc}>添加Webhook</Button>
       </Banner>
       <div className="hookpanel">
         <p className="color-grey-3">每当特定事件（如push代码，合并请求被编辑）发生时，我们将通过webhook给您提供的远程URL发送post请求。您可以在我们的<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a>中了解更多信息</p>

src/forge/Settings/Webhooks/New.jsx

@@ -287,10 +287,10 @@ function New({ form , match , showNotification , history }) {
                   <Checkbox value="pull_request_label">合并请求标签</Checkbox>
                   <span>合并请求的标签被更新或清除</span>
                 </span> */}
-                <span>
+                {/* <span>
                   <Checkbox value="pull_request_review">合并请求审查</Checkbox>
                   <span>合并请求被批准、拒绝或提出审查意见，审查人员的修改，审查线程已解决或未解决</span>
-                </span>
+                </span> */}
                 {/* <span>
                   <Checkbox value="pull_request_sync">合并请求被同步</Checkbox>
                   <span>合并请求被同步</span>

src/forge/Team/Component/AddMemberBox.jsx

@@ -28,7 +28,7 @@ function AddMemberBox({className,orzId,history,OIdentifier}){
   }
 
   function chooseGroup(id){
-    history.push(`/${OIdentifier}/teams/${id}/setting`);
+    history.push(`/${OIdentifier}/teams/${id}/setting/member`);
   }
   return(
     <div>

src/forge/Team/Index.scss

@@ -407,7 +407,7 @@
       line-height: 40px;
       width: 130px;
       text-align: center;
-      &.active,&:active{
+      &.active,&:hover{
         color: #fff;
         background-color: rgba(65, 84, 241, 1);
       }