调整

shop/src/main/java/com/zskk/shop/controller/h5/H5BuyOrderController.java

@@ -96,4 +96,24 @@ public class H5BuyOrderController extends AbstractController{
 		this.initUser(model);
 		return "/h5/mypayedorders";
 	}
+	
+	@RequestMapping("/completedorders")
+	public String completedorders(Model model){
+		UserBean userBean 		= this.getUser();
+		List<Long> ids 	  		= familyPeopleService.queryCompletedBids(userBean.getUserid());
+		List<BuyOrder> orders 	= null;
+		if (ids.isEmpty()){
+			orders = new ArrayList<>(0);
+		}else{
+			orders = buyOrderService.queryBuyOrders(ids);
+		}
+		List<BuyOrderBean> beans 	= new ArrayList<>(orders.size());
+		for (BuyOrder order: orders){
+			BuyOrderBean bean = buyOrderService.toBuyOrderBean(order);
+			beans.add(bean);
+		}
+		model.addAttribute("orders", beans);
+		this.initUser(model);
+		return "/h5/mypayedorders";
+	}
 }

shop/src/main/java/com/zskk/shop/controller/h5/H5IndexController.java

@@ -53,8 +53,8 @@ public class H5IndexController extends AbstractController {
 	private String myhost;
 	
 	@RequestMapping("/index")
-	public String index(Model model, @RequestParam(name="label", required=false) Integer label){
-		List<GoodBean> beans 		= this.getGoodList(label);
+	public String index(Model model, @RequestParam(name="search", required=false) String search, @RequestParam(name="label", required=false) Integer label){
+		List<GoodBean> beans 		= this.getGoodList(label, search);
 		List<SysLabel> labels		= this.queryAllSysLabel();
 		List<Banner> banners		= bannerService.queryAllOnline();
 		
@@ -80,16 +80,16 @@ public class H5IndexController extends AbstractController {
 		return "/h5/detail";
 	}
 	
-	private List<GoodBean> getGoodList(Integer lid){
+	private List<GoodBean> getGoodList(Integer lid, String search){
 		List<GoodBase> goodList = null;
 		if (lid == null){
-			goodList = goodService.queryGoodBases(null, GoodService.GOOD_ONLINE, 1, 10);
+			goodList = goodService.queryAllGoodBases(search, GoodService.GOOD_ONLINE, null);
 		}else{
 			List<Integer> gids = sysLabelService.queryLabelGoods(lid).stream().map(obj -> obj.getGid()).collect(Collectors.toList());
 			if (gids.isEmpty()){
 				goodList = new ArrayList<>();
 			}else{
-				goodList = goodService.queryGoodBases(gids, GoodService.GOOD_ONLINE);
+				goodList = goodService.queryAllGoodBases(search, GoodService.GOOD_ONLINE, gids);
 			}
 		}
 		List<GoodBean> beans = new ArrayList<>();

shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java

@@ -53,13 +53,13 @@ public class IndexController extends AbstractController {
 	private List<GoodBean> getGoodList(Integer lid){
 		List<GoodBase> goodList = null;
 		if (lid == null){
-			goodList = goodService.queryGoodBases(null, GoodService.GOOD_ONLINE, 1, 10);
+			goodList = goodService.queryAllGoodBases(null, GoodService.GOOD_ONLINE, null);
 		}else{
 			List<Integer> gids = sysLabelService.queryLabelGoods(lid).stream().map(obj -> obj.getGid()).collect(Collectors.toList());
 			if (gids.isEmpty()){
 				goodList = new ArrayList<>();
 			}else{
-				goodList = goodService.queryGoodBases(gids, GoodService.GOOD_ONLINE);
+				goodList = goodService.queryAllGoodBases(null, GoodService.GOOD_ONLINE, gids);
 			}
 		}
 		List<GoodBean> beans = new ArrayList<>();

shop/src/main/java/com/zskk/shop/dao/GoodMapper.java

@@ -45,6 +45,15 @@ public interface GoodMapper {
 	 */
 	public int delGoodAd(Integer id);
 	
+	/**
+	 * 获取全部商品
+	 * @param status
+	 * @param search
+	 * @param gids
+	 * @return
+	 */
+	public List<GoodBase> queryAllGoodBases(@Param("status") Integer status, @Param("search") String search, @Param("gids") List<Integer> gids);
+	
 	/**
 	 * 查询商品
 	 * @param status

shop/src/main/java/com/zskk/shop/service/GoodService.java

@@ -44,6 +44,10 @@ public class GoodService {
 	@Autowired
 	private GoodMapper goodMapper;
 	
+	public List<GoodBase> queryAllGoodBases(String search, Integer status, List<Integer> gids){
+		return goodMapper.queryAllGoodBases(status, search, gids);
+	}
+	
 	/**
 	 * 查询商品基本信息
 	 * @param search

shop/src/main/resource/mapper/GoodMapper.xml

@@ -23,6 +23,25 @@
 	<sql id="selectGoodBase">
 		select gid, name, `describe`, icon, sort, status, packageid, package_name as packageName, uid, ctime
 	</sql>
+	
+	<select id="queryAllGoodBases" resultType="com.zskk.shop.dao.entry.GoodBase">
+		<include refid="selectGoodBase"></include>
+		from good_base
+		where 1=1
+		<if test="status != null">
+			and status=#{status}
+		</if>
+		<if test="search != null">
+			and name like concat('%', #{search}, '%')
+		</if>
+		<if test="gids != null">
+			and gid in 
+			<foreach collection="gids" open="(" close=")" item="gid" separator=",">
+				#{gid}
+			</foreach>
+		</if>
+		order by sort
+	</select>
 	<select id="queryGoodBases" resultType="com.zskk.shop.dao.entry.GoodBase">
 		<include refid="selectGoodBase"></include>
 		from good_base

shop/src/main/resource/templates/h5/index.html

@@ -11,10 +11,16 @@
 
 <body>
 	<!--顶部-->
+	
 	<div class="index-top">
     	<button class="l left"></button>
-        <div class="txt"><input name="" type="search" placeholder="搜索商品" /></div>
+        <div class="txt">
+        	<form id="searchForm" action="/h5/index" method="post">
+        		<input id="search" name="search" type="search" placeholder="搜索商品" />
+        	 </form>
+        </div>
     </div>
+   
     <div class="bgDiv"></div>
     <div class="leftNav">
     	<h3>商品分类</h3>
@@ -30,9 +36,9 @@
     <div class="line-1-EEE ml10 mr10"></div>
 	<!--入口-->
     <ul class="nav ml10 mr10">
-    	<li><a href="##"><img src="style/index-tj-icon.png" /><p>体检套餐</p></a></li>
-        <li><a href="##"><img src="style/index-yx-icon.png" /><p>影像检查</p></a></li>
-        <li><a href="##"><img src="style/index-bg-icon.png" /><p>报告查询</p></a></li>
+    	<li><a href="/h5/index"><img src="style/index-tj-icon.png" /><p>体检套餐</p></a></li>
+        <li><a href="/h5/index"><img src="style/index-yx-icon.png" /><p>影像检查</p></a></li>
+        <li><a href="/h5/buy/completedorders"><img src="style/index-bg-icon.png" /><p>报告查询</p></a></li>
         <li><a href="/h5/buy/mypayedorders"><img src="style/index-yy-icon.png" /><p>我的预约</p></a></li>
     </ul>
     <div class="line-10-EEE"></div>
@@ -56,9 +62,17 @@
 	<table class="n-tab">
     	<tr>
         	<td><a href="/h5/index" class="n-1-c">首页</a></td>
-            <td><a href="#" class="n-2">报告</a></td>
+            <td><a href="/h5/buy/completedorders" class="n-2">报告</a></td>
             <td><a href="#" class="n-3">我的</a></td>
         </tr>
     </table>
+    
+    <script th:inline="javascript">
+    	$("#search").keyup(function(event){
+    		 if(event.keyCode ==13){
+    			 $("#searchForm").submit();
+    		 }
+    	});
+    </script>
 </body>
 </html>

shop/src/main/resource/templates/h5/mypayedorders.html

@@ -10,9 +10,9 @@
 <script src="/h5/js/nav.js"></script>
 </head>
 
-<body style="background-color: #EEE;">
+<body style="background-color:#EEE; ">
 	<div class="shopOrder">
-		<div th:each="order : ${orders}">
+		<div th:if="${orders.size() gt 0}" th:each="order : ${orders}">
 			<div class="date" th:text="${order.ctime}"></div>
 			<div th:each="item : ${order.items}">
 				<a href="#" class="li"> 
@@ -36,5 +36,11 @@
 			</div>
 		</div>
 	</div>
+	
+	
+	<div class="shopOrder_none" th:if="${orders.size() eq 0}">
+	    	<p>暂无有效订单</p>
+	        <p>如已购买请稍后刷新重试</p>
+	    </div>
 </body>
 </html>

shop/static/h5/style/style.css

@@ -106,9 +106,18 @@ a{ text-decoration:none; }
 .shopOrder a.btnRed{ background-color:#E05656; border:1px solid #E05656; color:#FFF; }
 .shopOrder a.btnBlue{ background-color:#0DC6E4; border:1px solid #0DC6E4; color:#FFF; }
 .shopOrder a.cancel{ background-color:#FFF; border:1px solid #CCC; color:#999; }
+/*暂无订单*/
+.shopOrder_none{ width:100%; margin:30px 0; padding-top:130px; background:url(shopOrder_none.png) no-repeat top center; background-size:128px; }
+.shopOrder_none p{ text-align:center; font-size:1rem; color:#666; line-height:150%; }
 
 /*180630新增——预约体检*/
-.
+.registerBar{ width:100%; padding:15px 0; background-color:#EEE; overflow:hidden; }
+.registerBar img{ width:100%; }
+.registerBar dt, .registerBar dd{ width:33.3%; font-size:.8rem; float:left; text-align:center; }
+.registerBar dt{ color:#0DC6E4; }
+.registerBar dd{ color:#999; }
+.registerPost{ padding:0 15px; }
+.registerPost h6{ color:#333; font-size:.8rem; padding:10px 0; }
 
 
 

shop/static/h5/新增-商城订单.html

@@ -23,7 +23,7 @@
             <div class="price">¥600</div>
             <div class="title"><h3>大师傅士大大师傅士大夫大大师傅士大夫大师师傅夫大大师傅士大夫大师师傅<!--控制在20个汉字内--></h3><span>×1</span></div>
         </a>
-        <p><button class="cancel">取消订单</button><button class="btnRed">立即支付</button></p>
+        <p><a class="cancel">取消订单</a><a class="btnRed">立即支付</a></p>
         <!--end-->
         <!--begin-->
         <div class="date">2018-02-06</div>
@@ -32,7 +32,7 @@
             <div class="price">¥600</div>
             <div class="title"><h3>大师傅士大大师傅士大夫大大师傅士大夫大师师傅夫大大师傅士大夫大师师傅<!--控制在20个汉字内--></h3><span>×1</span></div>
         </a>
-        <p><a href="###" class="btnBlue">立即预约</a></p>
+        <p><a class="btnBlue">立即预约</a></p>
         <!--end-->
         <!--begin-->
         <div class="date">2018-02-05</div>
@@ -44,5 +44,9 @@
         <p><span>预约时间：2018年8月1日 10:00</span></p>
         <!--end-->
     </div>
+    <div class="shopOrder_none">
+    	<p>暂无有效订单<br />如已购买请稍后刷新重试</p>
+        <p></p>
+    </div>
 </body>
 </html>