调整

shop/src/main/java/com/zskk/shop/controller/api/ApiController.java

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.zskk.shop.controller.bean.ControllerResult;
 import com.zskk.shop.service.BuyOrderService;
 
@@ -23,6 +25,7 @@ public class ApiController {
 	
 	@RequestMapping("/refund")
 	public ControllerResult refund(@RequestParam("extend") String extend){
+		JSONObject obj = JSON.parseObject(extend);
 		buyOrderService.refund(Long.parseLong(extend));
 		return new ControllerResult(Boolean.TRUE);
 	}

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

@@ -184,7 +184,12 @@ public class FamilyPeopleService {
 		//重新预约
 		BuyOrder order = buyOrderService.queryBuyOrder(appointment.getBid());
 		BuyOrderItem item = buyOrderService.queryItem(appointment.getItemid());
-		String tjid = tjCenterService.appointment(people, order, goodService.queryOneGoodBase(item.getGid()), appointment.getAtime(), appointment.getExtend());
+		
+		Map<String, String> extendMap = new HashMap<>();
+		extendMap.put("extend", appointment.getExtend());
+		extendMap.put("aid", appointment.getId().toString());
+		
+		String tjid = tjCenterService.appointment(people, order, goodService.queryOneGoodBase(item.getGid()), appointment.getAtime(), JSON.toJSONString(extendMap));
 		appointment.setTjaid(tjid);
 		familyPeopleMapper.updateAppointment(appointment);
 		return appointment;

shop/src/main/resource/templates/appointment.html

@@ -20,6 +20,9 @@
 	.hidden {
 		display: none;
 	}
+	.error {
+		border: 1px solid red !important;
+	}
 </style>
 </head>
 
@@ -129,7 +132,7 @@
 	                    	<dd>
 	                    		<input id="atime" name="" type="text" class="txt" style="width:160px;" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd'})" readonly="readonly" placeholder="请选择体检日期"/>
 	                    		<select id="extend" name="extend" class="slt" style="width:130px; ">
-	                    			<option>预约时间</option>
+	                    			<option value="">预约时间</option>
 	                    			<option value="08:00">08:00</option>
 	                    			<option value="08:30">08:30</option>
 	                    			<option value="09:00">09:00</option>
@@ -221,6 +224,9 @@
 			var atime	= $("#atime").val();
 			var extend	= $("#extend").val();
 			var birth 	= $("#birth").val();
+			
+			var validate = check();
+			
 			$.post("/appointment/save", {
 				"bid":bid, 
 				"itemid":itemid, 
@@ -251,18 +257,36 @@
 		}
 		
 		function clearStep(){
-			
 			for(var i = 1; i < 3; ++i){
 				$("#step" + i).removeClass("ed");
 				$("#step" + i).removeClass("ing");
 				$("#step" + i).removeClass("soon");
 				
-				
 				$("#step" + i + "Content").addClass("hidden");
 				$("#step" + i + "Content").addClass("hidden");
 				$("#step" + i + "Content").addClass("hidden");
 			}	
 		}
+		
+		function check(){
+			var idValidates = [/^\d{17}[\dXx]$/, /^.+$/, /^1\d{10}$/, /^.+$/, /^.+$/, /^.+$/]
+			var ok = true;
+			var ids = ["idcard", "name", "phone", "birth", "atime", "extend"]
+			for (var i = 0; i < ids.length; ++i){
+				var id 	= ids[i]
+				var obj	= $("#" + id)
+				var val = obj.val()
+				
+				var validate = idValidates[i]
+				if (validate && validate.test(val)){
+					obj.removeClass("error")
+				}else{
+					obj.addClass('error')
+					ok = false
+				}
+			}
+			return ok;
+		}
 		/* ]]> */
 	</script>
 </body>

shop/src/main/resource/templates/changeappointment.html

@@ -20,6 +20,9 @@
 	.hidden {
 		display: none;
 	}
+	.error {
+		border: 1px solid red !important;
+	}
 </style>
 </head>
 
@@ -106,9 +109,9 @@
 	                    <dl>
 	                    	<dt>预约体检日期：</dt>
 	                    	<dd>
-	                    		<input id="atime" name="atime" type="text" class="txt" style="width:160px;" th:attr="value=${appointment.atime}" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd'})" readonly="readonly"/>
+	                    		<input id="atime" name="atime" type="text" class="txt" style="width:160px;" th:attr="value=${appointment.atime}" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd'})" readonly="readonly" placeholder="请选择体检日期"/>
 	                    		<select id="extend" name="extend" class="slt" style="width:130px; ">
-	                    			<option>预约时间</option>
+	                    			<option value="">预约时间</option>
 	                    			<option value="08:00">08:00</option>
 	                    			<option value="08:30">08:30</option>
 	                    			<option value="09:00">09:00</option>
@@ -161,7 +164,30 @@
 		});
 		
 		function save(){
-			$("#form1").submit();
+			var validate = check();
+			if (validate){
+				$("#form1").submit();
+			}
+		}
+		
+		function check(){
+			var idValidates = [/^\d{17}[\dXx]$/, /^.+$/, /^1\d{10}$/, /^.+$/, /^.+$/, /^.+$/]
+			var ok = true;
+			var ids = ["idcard", "name", "phone", "birth", "atime", "extend"]
+			for (var i = 0; i < ids.length; ++i){
+				var id 	= ids[i]
+				var obj	= $("#" + id)
+				var val = obj.val()
+				
+				var validate = idValidates[i]
+				if (validate && validate.test(val)){
+					obj.removeClass("error")
+				}else{
+					obj.addClass('error')
+					ok = false
+				}
+			}
+			return ok;
 		}
 		/* ]]> */
 	</script>

shop/src/main/resource/templates/fqa.html

@@ -7,35 +7,42 @@
 <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-->
+<![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">报告查询</a></li>
-                <li class="u6"><a href="/fqa" class="ca">常见问题</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>
-                <table class="tab-1-EEE mt20" >
-                    <thead>
-                        <tr>
-                            <td>您有任何问题，请拨打400电话，我们有专业的人员为您服务。
-                            </td>
-                        </tr>
-                    </thead>
-                </table>
-            </div>
-        </div>
-    </div>
-    <div th:replace="/fragments :: footer"></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">报告查询</a></li>
+				<li class="u6"><a href="/fqa" class="ca">常见问题</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>
+				<table class="tab-1-EEE mt20">
+					<thead>
+						<tr>
+							<td>1:如何退款？</td>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>请拨打400电话进行退款</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+	<div th:replace="/fragments :: footer"></div>
 </body>
 </html>