Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_web into rongxin_dev

 Conflicts:

	view/listingItems/itemsDetail.html

.idea/misc.xml

@@ -9,6 +9,9 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
+  <component name="ProjectRootManager" version="2" default="true">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
   <component name="SuppressionsComponent">
     <option name="suppComments" value="[]" />
   </component>

infoport/static/js/project/discussions.js

@@ -280,7 +280,7 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
 
     searchChange = function () {
         console.log(1111111111);
-        tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8,openName:$("#searchInput").val()}, module.newsList , true);
+        tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8,openName:$("#searchInput").val(), isAsc:'desc', orderByColumn:'createTime'}, module.newsList , true);
     }
 
     submitUser = function () {
@@ -413,7 +413,8 @@ define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools,
                     pageNum:module.data.pageNum4,
                     pageSize:10,
                     bookId: JSON.parse(tools.getCookie('user')).bookId,
-                    deptId: JSON.parse(tools.getCookie('user')).deptId
+                    deptId: JSON.parse(tools.getCookie('user')).deptId,
+                    isAsc:'desc', orderByColumn:'createTime'
                 }, module.newsList4 , true);
                 break;
 

infoport/static/js/project/discussionsDetail.js

@@ -18,7 +18,7 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) {
         //新闻详情
         tools.doGet(siyigongkaiDetail, {id:getQueryVariable('id')}, module.newsDetail , true);
         //新闻列表
-        tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList , true);
+        tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8, isAsc:'desc', orderByColumn:'createTime'}, module.newsList , true);
         tools.doGet(webList, {}, module.webList , true);
     };
 

view/listingItems/itemsDetail.html

@@ -420,7 +420,7 @@
                         <td colspan="6">{{outProjectInformationDetail.linkPhone}}</td>
                     </tr>
                     <tr>
-                        <td rowspan="{{25+outProjectInformationDetail.subjectList.length}}">转出项目<br/>基本情况</td>
+                        <td rowspan="{{26+outProjectInformationDetail.subjectList.length}}">转出项目<br/>基本情况</td>
                         <td colspan="10">项目类型</td>
                         <td colspan="17">{{outProjectInformationDetail.projectNumber}}</td>
                     </tr>

view/login/registerFrom.html

@@ -189,7 +189,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td><span>*</span>身份证(正):</td>
+                    <td><span>*</span>身份证(人像面):</td>
                     <td colspan="3">
                         <div id="cupload-3" class="m-l-10 m-b-5 wid30"></div>
                     </td>
@@ -285,7 +285,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td><span>*</span>法人证件照:</td>
+                    <td><span>*</span>法人证件照（人像面）:</td>
                     <td colspan="3">
                         <div id="cupload-6" class="m-l-10 m-b-5 wid30"></div>
                     </td>