bug

src/forge/Main/IndexItem.js

@@ -34,13 +34,14 @@ class IndexItem extends Component {
                       : ""
                   }
                   {
-                    item.type && item.type !==0 && item.type ==2 ? 
+                    item.type && item.type !==0 ? 
+                    item.type ==2?
                     <Tooltip title="该项目是一个镜像" className="ml5">
                       <i className="iconfont icon-banbenku font-18 color-green" />
                     </Tooltip>:
                     <span className="ml5">
                       <i className="iconfont icon-jingxiang font-18 color-green" />
-                    </span>
+                    </span>:""
                   }
                 </Link>
                 {

src/forge/Merge/merge.js

@@ -273,7 +273,7 @@ class merge extends Component {
     return (
       <div className="main">
         <div className="topWrapper" style={{ borderBottom: "none" }}>
-          <p className="topWrapper_type">
+          <p className="topWrapper_type_infos">
             <li className={status_type === "1" ? "active" : ""} onClick={() => this.openorder("1")}>{data && data.open_count ? data.open_count : 0}个开启中</li>
             <li className={status_type === "2" ? "active" : ""} onClick={() => this.openorder("2")}>{data && data.close_count ? data.close_count : 0}个已关闭</li>
           </p>

src/forge/Order/Milepost.js

@@ -177,7 +177,6 @@ class Milepost extends Component {
           <div>
             <div className="tagList">
               {
-
                 data.versions.length === 0 ? <NoneData></NoneData> : data.versions.map((item, key) => {
                   return (
                     <div style={{ display: 'block' }}>
@@ -272,7 +271,7 @@ class Milepost extends Component {
             </div>
           </div>
           <div className="topWrapper">
-            <div className="topWrapper_type">
+            <div className="topWrapper_type_infos">
               <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>
             </div>

src/forge/Order/MilepostDetail.js

@@ -42,7 +42,6 @@ class MilepostDetail extends Component {
       //设置选择高亮
       openselect: 1,
       closeselect: undefined,
-      // status_type: undefined
       issue_tag_ids: '标签',
       tracker_ids: '所有分类',
       author_ids: '发布人',
@@ -279,7 +278,7 @@ class MilepostDetail extends Component {
     )
     return (
       <div className="main">
-        <div className="miledetail">
+        <div className="miledetail mb20">
           <div className="topmilepost">
             <p>{data && data.name}</p>
             <div className="milepostdiv">
@@ -303,16 +302,12 @@ class MilepostDetail extends Component {
           </span>
           </div>
         </div>
-        <div className="topWrapper" style={{ borderBottom: "none" }}>
-          {/* <p className="topWrapper_type">
-          </p> */}
-        </div>
+        
         <Spin spinning={isSpin}>
-          <div className="f-wrap-between mb20">
-            <ul className="topWrapper_type">
+          <div className="f-wrap-between pb20 bor-bottom-greyE">
+            <ul className="topWrapper_type_infos">
               <li className={openselect ? "active" : ""} onClick={() => this.openorder(1)}>{data && data.open_issues_count}个开启中</li>
               <li className={closeselect ? "active" : ""} onClick={() => this.openorder(2)}>{data && data.close_issues_count}个已关闭</li>
-              {/* <li>@我的</li> */}
             </ul>
             <ul className="topWrapper_select">
               <li>
@@ -320,11 +315,6 @@ class MilepostDetail extends Component {
                   <span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span>
                 </Dropdown>
               </li>
-              {/*<li>*/}
-              {/*<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_type,'所有类型','issue_type')} trigger={['click']} placement="bottomCenter">*/}
-              {/*<span>类型<Icon type="caret-down" className="ml5" /></span>*/}
-              {/*</Dropdown>*/}
-              {/*</li>*/}
               <li>
                 <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.tracker, '所有分类', 'tracker_id')} trigger={['click']} placement="bottomCenter">
                   <span>{this.state.tracker_ids}<Icon type="caret-down" className="ml5" /></span>
@@ -361,7 +351,11 @@ class MilepostDetail extends Component {
             search_count === 0 ?
               <NoneData _html="暂时还没有相关数据哦!" />
               :
-              <OrderItem issues={issues} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
+              issues && issues.length>0 && issues.map((item,key)=>{
+                return(
+                  <OrderItem item={item} mile search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
+                )
+              })
           }
           {Paginations}
         </Spin>

src/forge/Order/OrderItem.js

@@ -44,7 +44,7 @@ class OrderItem extends Component {
     })
   }
   render() {
-    const { item, key, checkbox } = this.props;
+    const { item, key, checkbox , mile } = this.props;
     const { projectsId } = this.props.match.params;
     const { current_user } = this.props
 
@@ -55,8 +55,8 @@ class OrderItem extends Component {
             {current_user && current_user.login && checkbox}
             <div className="flex-1">
               <p className="mb15 df" style={{alignItems:"center"}}>
-                <Link to={`/projects/${projectsId}/orders/${item.id}/detail`} className="hide-1 font-16 color-grey-3 lineh-30" style={{maxWidth:"300px"}}>{item.name}</Link>
-                {TagInfo(item.priority,"ml10 mr10")}
+                <Link to={`/projects/${projectsId}/orders/${item.id}/detail`} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"300px"}}>{item.name}</Link>
+                {TagInfo(item.priority,"mr10")}
               </p>
               <p className="color-grey-6 font-12">
                 <span>{item.format_time}</span><span className="ml5">发布</span>
@@ -87,7 +87,7 @@ class OrderItem extends Component {
                 }
               </li>
               <li>{item.tracker || "--"}</li>
-              <li>{item.version || "--"}</li>
+              { !mile ?<li>{item.version || "--"}</li>:""}
               <li>{item.issue_status || "--"}</li>
               <li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li>
               <li>

src/forge/Order/order.css

@@ -139,7 +139,22 @@
   line-height: 32px;
   border-radius: 4px;
 }
-.topWrapper_type {
+.topWrapper_type_infos{
+  border:1px solid #eee;
+  border-radius: 3px;
+  height: 35px;
+  line-height: 35px;
+}
+.topWrapper_type_infos li{
+  padding:0px 10px;
+}
+.topWrapper_type_infos li.active{
+  color: #4cacff
+}
+.topWrapper_type_infos li:last-child{
+  border-left: 1px solid #eee;
+}
+.topWrapper_type,.topWrapper_type_infos {
   display: flex;
 }
 .topWrapper_type li {