yuhaitao14 7 years ago
parent
commit
514e5ead7a

+ 1 - 0
shop/src/main/java/com/zskk/shop/controller/web/IndexController.java

@@ -44,6 +44,7 @@ public class IndexController extends AbstractController {
 		model.addAttribute("goods", beans);
 		model.addAttribute("goods", beans);
 		model.addAttribute("labels", labels);
 		model.addAttribute("labels", labels);
 		model.addAttribute("olabel", label);
 		model.addAttribute("olabel", label);
+		model.addAttribute("count", beans.size());
 		this.initUser(model);
 		this.initUser(model);
 		
 		
 		return "/shop";
 		return "/shop";

+ 2 - 2
shop/src/main/resource/templates/fqa.html

@@ -20,8 +20,8 @@
                 <li class="u2"><a href="/mypayedorders" >预约体检</a></li>
                 <li class="u2"><a href="/mypayedorders" >预约体检</a></li>
                 <li class="u3"><a href="/completedorders">报告查询</a></li>
                 <li class="u3"><a href="/completedorders">报告查询</a></li>
                 <li class="u6"><a href="/fqa" class="ca">常见问题</a></li>
                 <li class="u6"><a href="/fqa" class="ca">常见问题</a></li>
-                <li class="u7"><a href="#">修改密码</a></li>
-                <li class="u8"><a href="#">退出登录</a></li>
+               	<li class="u7"><a th:attr="href=${ucweb} + '#/resetPwd'" target="_blank">修改密码</a></li>
+                <li class="u8"><a th:attr="href=${uccenter} + 'login/loginout?redirect=' + ${outredirect}">退出登录</a></li>
             </ul>
             </ul>
             <div class="l" style="width:80%; ">
             <div class="l" style="width:80%; ">
                 <div class="f12 c999 mt20">常见问题:</div>
                 <div class="f12 c999 mt20">常见问题:</div>

+ 2 - 2
shop/src/main/resource/templates/mypayedorders.html

@@ -20,8 +20,8 @@
                 <li class="u2"><a href="/mypayedorders" class="ca">预约体检</a></li>
                 <li class="u2"><a href="/mypayedorders" class="ca">预约体检</a></li>
                 <li class="u3"><a href="/completedorders">报告查询</a></li>
                 <li class="u3"><a href="/completedorders">报告查询</a></li>
                 <li class="u6"><a href="/fqa">常见问题</a></li>
                 <li class="u6"><a href="/fqa">常见问题</a></li>
-                <li class="u7"><a href="#">修改密码</a></li>
-                <li class="u8"><a href="#">退出登录</a></li>
+                <li class="u7"><a th:attr="href=${ucweb} + '#/resetPwd'" target="_blank">修改密码</a></li>
+                <li class="u8"><a th:attr="href=${uccenter} + 'login/loginout?redirect=' + ${outredirect}">退出登录</a></li>
             </ul>
             </ul>
             <div class="l" style="width:80%; ">
             <div class="l" style="width:80%; ">
                 <div class="f12 c999 mt20">请选择已购套餐项 *</div>
                 <div class="f12 c999 mt20">请选择已购套餐项 *</div>

+ 1 - 1
shop/src/main/resource/templates/query_report.html

@@ -20,7 +20,7 @@
                 <li class="u2"><a href="/mypayedorders" >预约体检</a></li>
                 <li class="u2"><a href="/mypayedorders" >预约体检</a></li>
                 <li class="u3"><a href="/completedorders" class="ca">报告查询</a></li>
                 <li class="u3"><a href="/completedorders" class="ca">报告查询</a></li>
                 <li class="u6"><a href="/fqa">常见问题</a></li>
                 <li class="u6"><a href="/fqa">常见问题</a></li>
-                <li class="u7"><a th:attr="href=${ucweb} + '#/resetPwd'">修改密码</a></li>
+                <li class="u7"><a th:attr="href=${ucweb} + '#/resetPwd'" target="_blank">修改密码</a></li>
                 <li class="u8"><a th:attr="href=${uccenter} + 'login/loginout?redirect=' + ${outredirect}">退出登录</a></li>
                 <li class="u8"><a th:attr="href=${uccenter} + 'login/loginout?redirect=' + ${outredirect}">退出登录</a></li>
             </ul>
             </ul>
             <div class="l" style="width:80%; ">
             <div class="l" style="width:80%; ">

+ 1 - 1
shop/src/main/resource/templates/shop.html

@@ -48,7 +48,7 @@
 						<a href="####">热销</a>
 						<a href="####">热销</a>
 					</dt>
 					</dt>
 					
 					
-					<dd class="mr20 y f12 cCCC lh40">共为您找到xx件商品</dd>
+					<dd class="mr20 y f12 cCCC lh40" th:text="'共为您找到'+${count}+'件商品'"></dd>
 				</dl>
 				</dl>
 				<div class="s-list">
 				<div class="s-list">
 					<ul th:if="${goods.size() > 0}">
 					<ul th:if="${goods.size() > 0}">