备案、众包调整

app/views/layouts/_footer.html.erb

@@ -16,8 +16,10 @@
       </ul>
     </div>
     <div>
-      <p class="footer_con-p inline lineh-30"><span class="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<a style="color: #888;" target="_blank" href="http://beian.miit.gov.cn/" class="ml15 mr15">湘ICP备17009477号</a>
+      <p class="footer_con-p inline lineh-30"><span class="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder
-        <a href="https://team.trustie.net" style="color: #888;" target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&&nbsp;&nbsp;&nbsp;IntelliDE inside.  <span class="ml15 mr15">版权所有 湖南智擎科技有限公司</span></p>
+        <a style="color: #888;" target="_blank" href="http://beian.miit.gov.cn/" class="ml15 mr15">湘ICP备17009477号</a>
+        <a style="color: #888;" target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962" class="mr15"><img class="vertical4" src="/images/educoder/beian.png"/>湘公网安备 43019002000962号</a>
+        <a href="https://team.trustie.net" style="color: #888;" target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&&nbsp;&nbsp;&nbsp;IntelliDE inside.  <span class="mr15">版权所有 湖南智擎科技有限公司</span></p>
     </div>
     <div class="cl"></div>
   </div>

public/react/src/index.js

@@ -39,7 +39,7 @@ window.__useKindEditor = false;
 // TODO 读取到package.json中的配置？
 var proxy = "http://localhost:3000"
 // proxy = "http://testbdweb.trustie.net"
-//    proxy = "http://testbdweb.educoder.net"
+// proxy = "http://testbdweb.educoder.net"
    // proxy ="http://192.168.2.63:3000"
 // proxy='https://www.educoder.net'
 const requestMap={};

public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js

@@ -244,18 +244,18 @@ class PackageConcent extends Component {
 
 														<div className=" item-other">
 															<div className=" item-group item-other-visit">
-																<span className=" item-group-icon"><i className="fa fa-eye"></i></span>
+																<span className=" item-group-icon mr10"><i className="fa fa-eye"></i></span>
 																<span className=" item-group-text">{item.visit_count}人浏览</span>
 															</div>
 															<div className=" item-group item-other-deadline">
 
-																<span className=" item-group-icon"><i className="fa fa-clock-o"></i></span>
+																<span className=" item-group-icon mr10"><i className="fa fa-clock-o"></i></span>
 																<span className=" item-group-text">{moment(item.deadline_at).endOf('day').fromNow()}竞标截止</span>
 
 															</div>
 															<div className=" item-group item-other-bidding pd35">
 
-																<span className=" item-group-icon"><i className="fa fa-user" ></i></span>
+																<span className=" item-group-icon mr10"><i className="fa fa-user" ></i></span>
 																<span className=" item-group-text">{item.bidding_users_count}人竞标</span>
 
 															</div>

public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js

@@ -244,11 +244,11 @@ class PackageIndexNEITaskDetails extends Component {
 				 <div className={"educontent mt20 mb50"}>
 
 					 <Breadcrumb separator={'>'} className={"fl"}>
-						 <Breadcrumb.Item>{this.props.current_user.username}</Breadcrumb.Item>
+						 {/*<Breadcrumb.Item>{this.props.current_user.username}</Breadcrumb.Item>*/}
 						 <Breadcrumb.Item>
-							 <a href="/project_packages">任务大厅</a>
+							 <a href="/project_packages">众包社区</a>
 						 </Breadcrumb.Item>
-						 <Breadcrumb.Item>详情</Breadcrumb.Item>
+						 <Breadcrumb.Item><span className={"tabelcli"} title={data&&data.title}>{data&&data.title}</span></Breadcrumb.Item>
 
 					 </Breadcrumb>
 					 <a className="color-grey-6 fr font-15 mr20" onClick={this.goback}>返回</a>

public/react/src/modules/projectPackages/packageconcnet.css

@@ -312,4 +312,11 @@
 
 .pd35{
     padding-left: 35px;
+}
+.tabelcli{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 850px;
+    display: table-cell;
 }

public/react/src/modules/tpm/NewFooter.js

@@ -55,12 +55,19 @@ class NewFooter extends Component {
             </ul>
           </div>
           <div>
-          <p className="footer_con-p inline lineh-30 font-14">
+              <div>
-              <span class="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<span class="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;<span>&</span>&nbsp;&nbsp;&nbsp;IntelliDE inside.</p>
+                  <p className="footer_con-p inline lineh-30 font-14">
-          </div>
+                      <span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder
+                      <a style={{color: '#888'}} target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
+                      <a style={{color: '#888'}} target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962" className="mr15">
+                          <img className="vertical4" src={require('./beian.png')} />湘公网安备43019002000962号</a>
+                      <a href="https://team.trustie.net" style={{color: '#888'}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&&nbsp;&nbsp;&nbsp;IntelliDE inside. <span className="mr15">版权所有 湖南智擎科技有限公司</span>
+                      </p>
+              </div>
           <div className="cl"></div>
         </div>
         </div>
+        </div>
       );
     }
 }

public/stylesheets/educoder/edu-all.css

@@ -3510,4 +3510,8 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
     white-space: nowrap;
     width: 412px;
     display: inline-block;
+}
+
+.vertical4{
+    vertical-align: -4px;
 }