合并请求-判断条件改成user_admin_or_member

src/forge/Merge/MergeItem.js

@@ -49,7 +49,7 @@ class MergeItem extends Component {
   };
 
   render() {
-    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
     const { projectsId , owner } = this.props.match.params;
     const { current_user } = this.props;
     const renderList = () => {
@@ -183,7 +183,7 @@ class MergeItem extends Component {
                     ) : (
                       ""
                     )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {user_admin_or_developer && item.pull_request_status === 0 ? (
                       <div
                         className="milepostleft"
                         style={{

src/forge/Merge/merge.js

@@ -4,7 +4,7 @@ import "./merge.css";
 import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
-import OrderItem from "./MergeItem";
+import MergeItem from "./MergeItem";
 import './Index.scss';
 
 import axios from "axios";
@@ -387,7 +387,7 @@ class merge extends Component {
           <Spin spinning={isSpin}>
             {data && data.search_count && data.search_count > 0 ? (
               <div>
-                <OrderItem
+                <MergeItem
                   issues={issues}
                   search_count={search_count}
                   page={select_params.page}
@@ -396,8 +396,8 @@ class merge extends Component {
                   project_author_name={data.project_author_name}
                   {...this.props}
                   {...this.state}
-                  user_admin_or_member={data && data.user_admin_or_member}
-                ></OrderItem>
+                  user_admin_or_developer={data && data.user_admin_or_developer}
+                ></MergeItem>
               </div>
             ):""}
             {search_count > select_params.limit ? (