Bläddra i källkod

Merge remote-tracking branch 'origin/test' into patch

anderx 7 år sedan
förälder
incheckning
272346a2da

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1176,7 +1176,7 @@ public class WebpageController extends BaseController {
 		OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
 		modelAndView.addObject("org", org);
 		List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
-				.getProjects(null,null, null, null, 4, 1, 0, 2, null, null, 0, 0, uid).getList();
+				.getProjects(null,null, null, null, 12, 1, 0, 2, null, null, 0, 0, uid).getList();
 		modelAndView.addObject("jtProjects", projectResults);
 		String honor = org.getHonorPicture();
 		if (honor != null && honor.contains(".")) {

+ 1 - 0
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -627,6 +627,7 @@ and layer=#{0}
     where layer=2
     and module=#{0}
     and home_index=#{1}
+    order by sort
   </select>
   
   

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -57,7 +57,7 @@ app.mobile.website=http://muat.jishutao.com
 template.cacheable=false
 
 static.host=//statics.jishutao.com/client/1.0.0
-portal.host=//statics.jishutao.com/portal/1.0.0
+portal.host=//statics.jishutao.com/portal/1.0.1
 avatar.host=//statics.jishutao.com
 avatar.upload.host=//statics.jishutao.com/upload
 

+ 8 - 4
src/main/webapp/WEB-INF/views/common.html

@@ -18,6 +18,7 @@
 
 <body>
 	<th:block th:fragment="nav(mainM,subM)">
+	
 	<div class="topFixHeight">
         <div class="topNav">
 	
@@ -56,11 +57,11 @@
 					<span class="webkitDown"></span>
 				</a>
 				<div class="xialaewm">
-					<div class="cont_rightapp">
+					<div class="cont_rightapps" id="iPhone">
 						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="">
 						<p>iPhone版</p>
 					</div>
-					<div class="cont_right android">
+					<div class="cont_rights android" id="Android">
 						<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
 						<p>Android版</p>
 					</div>
@@ -540,7 +541,7 @@
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">
-	 	<script src="https://s22.cnzz.com/z_stat.php?id=1274334487&web_id=1274334487" language="JavaScript"></script>
+		<script src="https://s22.cnzz.com/z_stat.php?id=1274334487&web_id=1274334487" language="JavaScript"></script>
 		<script>
 			var _hmt = _hmt || [];
 			(function() {
@@ -550,7 +551,7 @@
 				s.parentNode.insertBefore(hm, s);
 			})();
 		</script>
-		 <script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script> 
+		  
 		<script th:inline="javascript">
 			/*<![CDATA[*/
 			window.globalConfig = {};
@@ -609,8 +610,11 @@
 				lvl : /*[[${userData == null} ? null : ${userData.lvl}]]*/''
 			}
 			/*]]>*/
+			
 		</script>
 		<th:block th:replace="${scripts}" />
+		<script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script>
+		
 	</th:block>
 
 </body>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 4 - 3
src/main/webapp/WEB-INF/views/portal/adviser/adviserDetail.html


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/companyProfile.html