yuhaitao14 6 years ago
parent
commit
71c7c1e0e8

+ 2 - 2
shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java

@@ -77,7 +77,6 @@ public class BuyOrderController extends AbstractController {
 	}
 	
 	@RequestMapping("/tjorders")
-	@ResponseBody
 	public String tjorders(Model model){
 		UserBean userBean 			= this.getUser();
 		List<TjOrder> orders		= null;
@@ -92,7 +91,8 @@ public class BuyOrderController extends AbstractController {
 			orders = tjCenterService.getTJOrders(userBean.getUserid(), phones);
 		}
 		model.addAttribute("orders", orders);
-		return JSON.toJSONString(orders);
+		this.initUser(model);
+		return "/query_reportv2";
 	}
 	
 	@RequestMapping("/completedorders")

+ 63 - 0
shop/src/main/resource/templates/query_reportv2.html

@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>黑龙江昆仑盛和安体检中心</title>
+<link rel="stylesheet" type="text/css" href="../style/common.css"></link>
+<link rel="stylesheet" type="text/css" href="../style/user.css"></link>
+<!--[if lt IE 9]> 
+<script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script> 
+<![endif]--><!--窗口自适应适配低端IE-->
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+</head>
+
+<body>
+	<div th:include="/fragments :: header"></div>
+	
+    <div class="wp">
+    	<div class="main bgFF">
+            <ul class="subnav l mt20">
+                <li class="u2"><a href="/mypayedorders" >预约体检</a></li>
+                <li class="u3"><a href="/completedorders" class="ca">报告查询</a></li>
+                <li class="u6"><a href="/fqa">常见问题</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>
+            <div class="l" style="width:80%; ">
+                <div class="f12 c999 mt20">已体检项 *</div>
+                <div th:if="${orders.size() eq 0}">
+                    <table class="tab-1-EEE mt20">
+                        <tr>
+                            <td><div class="u-ready-none"><img src="/style/list_none.png" /><p>您的体检报告还没有出来,请耐心等待 <a href="/">体检套餐</a></p></div></td>
+                        </tr>
+                    </table>
+                </div>
+                <table class="tab-1-EEE mt20" th:each="order : ${orders}">
+                    <thead>
+                        <tr>
+                            <td>预约日期:
+                            	<span th:text="${order.maketime}"></span>
+                            </td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr >
+                            <td>
+                            	<div class="l">
+                            		<strong class="f12" th:text="${order.package_name}"></strong>
+                            		<div class="cBlue mt10" >体检人:<span th:text="${order.role_name}"></span> 体检日期:<span th:text="${order.signtime}"></span></div>
+                            	</div>
+                            	<a th:if="${order.status eq -1}" href="#" class="btn-blue y" >已预约</a>
+                            	<a th:if="${order.status eq 0}" href="#" class="btn-blue y" >已签到</a>
+                            	<a th:if="${order.status eq 1}" href="#" class="btn-blue y" >体检结束(报告生成中)</a>
+                            	<a th:if="${order.status eq 2}" th:attr="href='http://kunlun.pacsonline.cn/public/api.php/shop/reportDetails?id=' + ${order.id}" class="btn-blue y" target="_blank" >查看报告</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div th:replace="/fragments :: footer"></div>
+</body>
+</html>