Bläddra i källkod

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

anderx 7 år sedan
förälder
incheckning
273abb839b

+ 0 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -113,7 +113,6 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
 			return res;
 		}
-
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					AdminFields.getFieldDesc(bindingResult.getFieldError().getField())));

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

@@ -22,7 +22,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>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/adviser/adviserList.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>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/search.html

@@ -20,7 +20,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>

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


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


+ 8 - 4
src/main/webapp/WEB-INF/views/portal/service/safeguarding.html

@@ -21,16 +21,20 @@
                     <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>
             </div>
             <span th:if="${userType != 1}">我要成为法律顾问</span>
         </div>
-        <div class="safeIndexPic">
+        <!-- <div class="safeIndexPic">
             <img th:src="${portalHost+'/img/newMenu/safeIndex_1.png'}" alt="">
-        </div>
+        </div> -->
+         <div class="RecommendTitle">
+                <h2>专属律师</h2>
+                <span></span>
+            </div>
         <div class="safeList">
             <ul>
                 <li th:each="s:${slist}">
@@ -39,7 +43,7 @@
 	                    	<img  th:src="${s.personPortraitUrl} != null and  ${s.personPortraitUrl} != '' ? ${avatarUploadHost+s.personPortraitUrl}:${portalHost + '/img/newMenu/policyBanner.png'}" alt="">
 	                    </div>
 	                    <h3 th:text="${s.username}">李四光</h3>
-	                    <span th:text="${s.workUnit}">长沙市律师长沙市律师</span>
+	                    <!-- <span th:text="${s.workUnit}">长沙市律师长沙市律师</span> -->
 	                    <p th:text="${#strings.abbreviate(s.professionalTitle,16)}">专注于商标、版权、专利、不正当竞争...</p>
 	                </a>
                 </li>

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

@@ -28,7 +28,7 @@
                 </div>
                 <div class="portraitRight">
                     <h4><span th:text="${sd.username}">李四光</span><img th:src="${portalHost + '/img/newMenu/sadeRezh.png'}" alt="">平台认证</h4>
-                    <p th:text="${sd.workUnit}">湖南好的噜律师事务所</p>
+                    <!-- <p th:text="${sd.workUnit}">湖南好的噜律师事务所</p> -->
                     <p th:text="${sd.professionalTitle}">湖南好的噜律师事务所委员职称</p>
                     <a href="javascript:;" onclick="openZoosUrl('chatwin');">立即咨询</a>
                 </div>

+ 1 - 1
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>

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


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -57,7 +57,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>

+ 12 - 6
src/main/webapp/WEB-INF/views/portal/service/services.html

@@ -97,13 +97,14 @@
                     <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>
             </div>
         </div>
-        <div class="applicationTitle" id="Md2">
+        <div class="applicationTitle" >
+        <div id="Md2" class="dingwei"></div>
             <h4>没有知识产权保护的品牌是沙画</h4>
             <span>品牌建设</span><a href="/portal/service/brandBuild">进入品牌建设专区</a>
         </div>
@@ -140,7 +141,8 @@
         </div>
     </div>
     <div class="applicationSC">
-        <div class="applicationTitle" id="Md3">
+        <div class="applicationTitle" >
+        <div id="Md3" class="dingwei"></div>
             <h4>有了核心的知识产权,企业有实力进军任何一个未知的市场</h4>
             <span>市场开拓</span><a href="/portal/service/marketOpen">进入市场开拓专区</a>
         </div>
@@ -223,7 +225,8 @@
         </div>
     </div>
     <div class="applicationZf" >
-        <div class="applicationTitle active" id="Md4">
+        <div class="applicationTitle active" >
+        <div id="Md4" class="dingwei"></div>
             <h4>政府资金优先支持拥有核心专利的企业</h4>
             <span>政府扶持</span><a href="/portal/service/governmentSupport">进入政府扶持专区</a>
         </div>
@@ -252,7 +255,8 @@
         </div>
     </div>
     <div class="applicationMS" >
-        <div class="applicationTitle active" id="Md5">
+        <div class="applicationTitle active" >
+        <div id="Md5" class="dingwei"></div>
             <h4>知识产权的保护和租售可以享受减免税优惠</h4>
             <span>减税免税</span><!-- <a href="#">进入减税免税专区</a> -->
         </div>
@@ -269,7 +273,8 @@
         </div>
     </div>
     <div class="applicationMS applicationRZ" >
-        <div class="applicationTitle active" id="Md6">
+        <div class="applicationTitle active" >
+        <div id="Md6" class="dingwei"></div>
             <h4>可以融资或者直接降低融资成本</h4>
             <span>融资租售</span><!-- <a href="#">进入融资租售专区</a> -->
         </div>
@@ -287,6 +292,7 @@
         </div>
     </div>
     <div class="applicationGf" id="Md7">
+    <div id="Md6" class="dingwei"></div>
         <div class="container">
             <div class="gfLeft">
                     <div class="applicationTitle active">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -35,7 +35,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 class="txtVal"></div>

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


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -36,7 +36,7 @@
 							placeholder="输入你感兴趣的内容"> <span class="input-group-btn">
 							<button class="btn btn-default searchBtn" type="button">
 								<img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}"
-									alt=""> 搜索
+									alt=""> 
 							</button>
 						</span>
 						<div class="txtVal"></div>

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