Browse Source

取消忘记密码,成果页政策修改,服务首页修改

liliang4869 7 years ago
parent
commit
de5e211e05

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

@@ -548,6 +548,7 @@
   p.title,
   p.author,
   p.audit_status as auditStatus,
+  p.edit_time as editTime,
   p.id,
   p.source,
   p.release_date as releaseDate,

File diff suppressed because it is too large
+ 1172 - 1171
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml


+ 1 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -248,8 +248,7 @@
 							<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 						</div>
 						<div class="login_check">
-							
-							<a href="">忘记密码?</a>
+						
 						</div>
 						<input type="submit" value="登 陆" class="login_submit"/>
 					</form>

+ 4 - 4
src/main/webapp/WEB-INF/views/portal/index.html

@@ -220,13 +220,13 @@
 					<div class="indexServe_bots">
 					<div class="wrapper">
 						<h3 th:text="${'什么是'+pj.name+'?'}"></h3>
-						<p th:text="${#strings.abbreviate(pj.introduce,128)}"></p>
+						<p th:text="${#strings.abbreviate(pj.introduce,90)}"></p>
 						</div>
 						<img th:src="${pj.maxImgUrl}==null?${portalHost+'/img/indexNew8.jpg'}:${avatarUploadHost+pj.maxImgUrl}" alt="" />
 					</div>
 					<div class="indexServe_bot">
 						<div>认定好处</div>
-						<p th:text="${#strings.abbreviate(pj.value,128)}"></p>
+						<p th:text="${#strings.abbreviate(pj.value,90)}"></p>
 					</div>
 					<a th:href="@{/portal/service/serviceDetail(id=${pj.id})}">
 					<div class="indexServe_img">
@@ -239,11 +239,11 @@
 					<img th:src="${pj1.maxImgUrl}==null?${portalHost+'/img/indexNew8.jpg'}:${avatarUploadHost+pj1.maxImgUrl}" alt="" />
 					<div class="indexServe_bots">
 							<h3 th:text="${'什么是'+pj1.name+'?'}"></h3>
-						<p th:text="${#strings.abbreviate(pj1.introduce,100)}"></p>
+						<p th:text="${#strings.abbreviate(pj1.introduce,90)}"></p>
 					</div>
 					<div class="indexServe_bot">
 						<div>认定好处</div>
-							<p th:text="${#strings.abbreviate(pj1.value,100)}"></p>
+							<p th:text="${#strings.abbreviate(pj1.value,90)}"></p>
 							<a th:href="@{/portal/service/serviceDetail(id=${pj1.id})}">
 					<div class="indexServe_img">
 						<p>

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


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

@@ -139,7 +139,7 @@
                     </div>
                 </li>
             </ul>
-        </div>
+        </div></div>
          <div class="container">
         <div class="study" id="patentTitle">
                 <h4>专利技术