Browse Source

Merge branch 'test' of jishutao/jitao-server into prod

anderx 3 years ago
parent
commit
ab63e2c558

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

@@ -615,11 +615,11 @@ public class WebpageController extends BaseController {
 		modelview.addObject("owner", owner);
 		modelview.addObject("pj", jtBusinessProject);
 		//判断是否是个人还是组织
-		if (jtBusinessProject!=null){
-			if(0 == jtBusinessProject.getType()){//个人
+		if (jtBusinessProject!=null &&jtBusinessProject.getType()!=null){
+			if(jtBusinessProject.getType()==0 ){//个人
 				UserIdentity uide =  userIdentityService.selectUserIdentityByUserId(jtBusinessProject.getOwnerId());
 				modelview.addObject("uide", uide);
-			}else if(1 == jtBusinessProject.getType()){//企业
+			}else if(jtBusinessProject.getType() ==1  ){//企业
 				String oide =  organizationIdentityService.selectOrgIdentityBoByUserId(jtBusinessProject.getOwnerId()).getUid();
 				modelview.addObject("oide", oide);
 			}

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/adviser/adviserDetail.html

@@ -69,7 +69,7 @@
                         </div>
                         <time>124/121/12</time>
                         <div class="satisfiedContent">
-                            <p>dsadsadsadasdasd</p> 
+                            <p>dsadsadsadasdasd</p>
                         </div>
                     </li>
                 </ul>
@@ -102,7 +102,7 @@
     	<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
     	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/adviserDetail.js'}"></script>
-		<script> document.querySelectorAll(".nav>ul>li")[3].className="active" 
+		<script>
 			  document.querySelector(".adviser_list").style.display = "none"
 				  document.querySelector(".evaluateList").style.display = "none"</script>
 	</div>

+ 4 - 5
src/main/webapp/WEB-INF/views/portal/service/safeguardingDetail.html

@@ -39,7 +39,7 @@
             </div>
         </div>
     </div>
-    <!--主体内容--> 
+    <!--主体内容-->
     <div class="container safeBody">
         <div class="safeBodyLeft">
             <div class="safeIntroduce">
@@ -104,7 +104,7 @@
                         </div>
                         <time>124/121/12</time>
                         <div class="satisfiedContent">
-                            <p>dsadsadsadasdasd</p> 
+                            <p>dsadsadsadasdasd</p>
                         </div>
                     </li>
                 </ul>
@@ -154,9 +154,8 @@
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/safeguardingDetail.js'}"></script>
 		<script>
-  			document.querySelectorAll(".nav>ul>li")[5].className="active"
-  			  document.querySelector(".adviser_list").style.display = "none"
+  			document.querySelector(".adviser_list").style.display = "none"
   				  document.querySelector(".evaluateList").style.display = "none"
 		</script>
 	</div>
-</html>
+</html>

+ 2 - 5
src/main/webapp/WEB-INF/views/portal/service/safeguardingList.html

@@ -21,7 +21,7 @@
                     <input type="text" class="form-control demandSearch" placeholder="搜索您要找的律师">
                     <span class="input-group-btn">
                         <button class="btn btn-default searchBtn" type="button">
-                            <img th:src="${portalHost + '/img/newMenu/search-icon.jpg'}" alt=""> 
+                            <img th:src="${portalHost + '/img/newMenu/search-icon.jpg'}" alt="">
                         </button>
                     </span>
                 </div>
@@ -65,9 +65,6 @@
 		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/safeguardingList.js'}"></script>
-		<script>
-  			document.querySelectorAll(".nav>ul>li")[5].className="active"
-		</script>
 	</div>
 </body>
-</html>
+</html>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html