样式修改

src/AppConfig.js

@@ -39,7 +39,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
     window.location.search.indexOf('debug=s') != -1 ? 'student' :
-      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || ''
+      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 // 超管
 // debugType="admin";

src/forge/Merge/MergeDetail.js

@@ -251,7 +251,7 @@ class MergeDetail extends Component{
             由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
           </p>
         </div>
-     
+      
   
         <div className="detailHeader-wrapper">
           <div className="normal f-wrap-between">

src/forge/Order/Milepost.js

@@ -41,6 +41,7 @@ class Milepost extends Component{
       }
     }).then((result)=>{
       if(result){
+
         this.setState({
           data:result.data
         })
@@ -173,24 +174,10 @@ class Milepost extends Component{
        if(data && data.versions && data.versions.length>0 ){
         return(
           <div>
-            <div className="topWrapper">
-              <div className="topWrapper_type">
-                <li className={openselect ? "active":""} onClick={()=>this.opneMilelist(1)}>{data && data.open_count}个开启中</li>
-                <li className={closeselect ? "active":""} onClick={()=>this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
-                {/* <span onClick={this.opneMilelist}>{ data && data.open_count }开启中</span>
-                <span onClick={this.closeMilelist}>{ data && data.closed_count }已关闭</span> */}
-              </div>
-              <ul className="topWrapper_select">
-                <li>
-                  <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
-                    <span>排序<Icon type="caret-down" className="ml5" /></span>
-                  </Dropdown>
-                </li>
-              </ul>
-            </div>
             <div className="tagList">
               {
-                data.versions.map((item,key)=>{
+                   
+                  data.versions.length===0?<NoneData></NoneData>:data.versions.map((item,key)=>{
                   return(
                     <div style={{display:'block'}}>
                       <div className="milepostdiv">
@@ -292,6 +279,21 @@ class Milepost extends Component{
             <span>里程碑{ data && data.issue_tags_count }已创建</span>
             </div>
           </div>
+          <div className="topWrapper">
+              <div className="topWrapper_type">
+                <li className={openselect ? "active":""} onClick={()=>this.opneMilelist(1)}>{data && data.open_count}个开启中</li>
+                <li className={closeselect ? "active":""} onClick={()=>this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
+                {/* <span onClick={this.opneMilelist}>{ data && data.open_count }开启中</span>
+                <span onClick={this.closeMilelist}>{ data && data.closed_count }已关闭</span> */}
+              </div>
+              <ul className="topWrapper_select">
+                <li>
+                  <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
+                    <span>排序<Icon type="caret-down" className="ml5" /></span>
+                  </Dropdown>
+                </li>
+              </ul>
+            </div>
 
           { renderList()}
           { Paginations }

src/forge/Order/Milepostitem.js

@@ -0,0 +1,106 @@
+import React , { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+class OrderItem extends Component{
+  set_issue_tags =(issue_tags)=>{
+    if(issue_tags && issue_tags.length > 0){
+      return(
+        issue_tags.map((item,key)=>{
+          return(
+            <span className="issue-tag-show" style={{background: item.color}}>{item.name}</span>
+          )
+        })
+      )
+    }else{
+      return("--")
+    }
+  }
+
+  render(){
+    const { issues , search_count , page , limit } = this.props;
+    const { projectsId } = this.props.match.params;
+
+    const renderList =()=>{
+        data.versions.map((item,key)=>{
+            return(
+              <div style={{display:'block'}}>
+                <div className="milepostdiv">
+                  <div className="milepostwidth">
+                    <div className="grid-item width100">
+                      <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
+                      <Link to={`/projects/${projectsId}/orders/${item.id}/MilepostDetail`} className="font-16">{item.name}</Link>
+                    </div>
+
+                  </div>
+                </div>
+                <div className="milepostdiv" style={{marginTop:5}}>
+                  <div className="milepostrighe">
+
+                    <div className="grid-item mr10">
+                      <i className="iconfont icon-rili font-14 mr5">
+                      </i>
+                      {
+                        item.effective_date ?
+                          <span className="color-red">{item.effective_date}</span>
+                          :
+                          <span className="color-grey-c">暂无截止时间</span>
+                      }
+                    </div>
+                    <div className="grid-item mr10 color-grey-9">
+                      <i className="iconfont icon-issue font-14 mr5"></i>
+                      <span>
+                        {item.open_issues_count}个开启
+                      </span>
+                    </div>
+                    <div className="grid-item mr10 color-grey-9">
+                      <i className="iconfont icon-shanchudiao font-14 mr5"></i>
+                      <span>
+                        {item.close_issues_count}个关闭
+                      </span>
+                    </div>
+                  </div>
+                  {
+                    data && data.user_admin_or_member ?
+                      <div className="milepostleft">
+                        <div className="grid-item mr15 color-grey-9">
+                          <i className="iconfont icon-bianji3 font-14 mr5"></i>
+                          <Link to={`/projects/${projectsId}/orders/${item.id}/meilpost`} className="color-grey-9">编辑</Link>
+                        </div>
+                        <div className="grid-item mr15 color-grey-9">
+                          <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
+                          <a onClick={()=>this.updatestatusemile(this.state.status==="closed"?"open":"closed",item)} className="color-grey-9">{this.state.status==="closed"?"开启":"关闭"}</a>
+                        </div>
+                        <div className="grid-item mr15 color-grey-9">
+                          <i className="iconfont icon-lajitong font-14 mr5" ></i>
+                          <Popconfirm placement="bottom" title={'是否删除里程碑？'}  okText="是" cancelText="否" onConfirm={()=>this.closemile(item)}>
+                            <a className="color-grey-9">删除</a>
+                          </Popconfirm>
+                        </div>
+
+                      </div>
+                      : ''
+                  }
+
+                </div>
+                <div className="milepostdiv"style={{marginTop:5}}>
+                  <div className="textwidth">
+                    <Text
+                      type="secondary"
+                      ellipsis={{rows: 30, expandable: false, onExpand: Function}}
+                    >
+                      {item.description}</Text>
+                  </div>
+                </div>
+              </div>
+            )
+          })
+    }
+    return(
+      <div>
+        {renderList()}
+      </div>
+    )
+  }
+}
+
+export default OrderItem;

src/forge/Order/order.js

@@ -217,12 +217,14 @@ class order extends Component{
 
   openorder=(type)=>{
     if(type){
-
+      console.log(this.state.closeselect+"|"+this.state.openselect)
       const { current_user } = this.props;
       if(type===1){
         this.setState({
           status_type:'1',
           closeselect:undefined,
+          openselect:1,
+
           issue_tag_ids:'标签',
           tracker_ids:'所有分类',
           author_ids:'发布人',
@@ -237,6 +239,8 @@ class order extends Component{
         this.setState({
           status_type:'2',
           openselect:undefined,
+          closeselect:1,
+
           issue_tag_ids:'标签',
           tracker_ids:'所有分类',
           author_ids:'发布人',
@@ -260,12 +264,13 @@ class order extends Component{
     this.setState({
       isSpin:true
     })
+    console.log(current_user)
+
     if(type){
       if(current_user===undefined){
         this.setState({
           isSpin:false
         })
-        alert("请登录后查看")
         return;
       }
       if(type===1){
@@ -373,8 +378,8 @@ class order extends Component{
             <ul className="topWrapper_type">
               <li className={!author_id && !assigned_to_id ? "active":""} onClick={()=>this.ChangeAssign()}>全部</li>
               {}
-              <li style={{display:current_user===undefined?'none':'flex'}} className={assigned_to_id ? "active":""} onClick={ ()=>this.ChangeAssign(1)}>指派给我</li>
-              <li style={{display:current_user===undefined?'none':'flex'}} className={author_id ? "active":""} onClick={()=>this.ChangeAssign(2)}>由我创建</li>
+              <li style={{display:current_user&&current_user.login===""?'none':'flex'}} className={assigned_to_id ? "active":""} onClick={ ()=>this.ChangeAssign(1)}>指派给我</li>
+              <li style={{display:current_user&&current_user.login===""?'none':'flex'}} className={author_id ? "active":""} onClick={()=>this.ChangeAssign(2)}>由我创建</li>
               {/* <li>@我的</li> */}
             </ul>
             <ul className="topWrapper_select">