解决问题 0156

.idea/workspace.xml

@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/NewsManagerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/NewsManagerController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/changeappointment.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/changeappointment.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/static/style/nHeader.css" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/style/nHeader.css" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -194,7 +194,11 @@
       <workItem from="1585463032539" duration="590000" />
       <workItem from="1585555338136" duration="1722000" />
       <workItem from="1585557305130" duration="1742000" />
-      <workItem from="1585559119845" duration="1102000" />
+      <workItem from="1585559119845" duration="1755000" />
+      <workItem from="1585561193841" duration="1751000" />
+      <workItem from="1585563019513" duration="1726000" />
+      <workItem from="1585564862133" duration="1232000" />
+      <workItem from="1585566712176" duration="1533000" />
     </task>
     <servers />
   </component>
@@ -206,73 +210,73 @@
       <screen x="0" y="23" width="1440" height="822" />
     </state>
     <state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.822@0.23.1440.822" timestamp="1584449391479" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585560222114">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585568481547">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.0.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585559250784" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585559832318" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560222114" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585560222113">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585568481546">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.0.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827@0.23.1440.827" timestamp="1585559250783" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585559832317" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560222113" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585560222113">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481546" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585568481545">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.0.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827@0.23.1440.827" timestamp="1585559250783" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585559832316" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560222113" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585560222114">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481545" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585568481547">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.0.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827@0.23.1440.827" timestamp="1585559250784" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585559832317" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560222114" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585560222116">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326116" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585568481549">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.1.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585559250786" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585559832319" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560222116" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585560222115">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481549" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681678" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585568481548">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.1.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827@0.23.1440.827" timestamp="1585559250785" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.828@0.23.1440.828" timestamp="1585559832318" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.829@0.23.1440.829" timestamp="1585560222115" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585560222115">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585568481548">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.1.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827@0.23.1440.827" timestamp="1585559250785" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.828@0.23.1440.828" timestamp="1585559832318" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.829@0.23.1440.829" timestamp="1585560222115" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585560222115">
-      <screen x="0" y="23" width="1440" height="829" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585568481548">
+      <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state width="1398" height="232" key="GridCell.Tab.1.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827@0.23.1440.827" timestamp="1585559250785" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.828@0.23.1440.828" timestamp="1585559832319" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.829@0.23.1440.829" timestamp="1585560222115" />
-    <state x="794" y="313" key="com.intellij.ide.util.TipDialog" timestamp="1585557324210">
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681678" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
+    <state x="794" y="313" key="com.intellij.ide.util.TipDialog" timestamp="1585564861137">
       <screen x="0" y="23" width="1440" height="827" />
     </state>
     <state x="794" y="312" key="com.intellij.ide.util.TipDialog/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1584499814791" />
-    <state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.827@0.23.1440.827" timestamp="1585557324210" />
+    <state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.827@0.23.1440.827" timestamp="1585564861137" />
     <state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.829@0.23.1440.829" timestamp="1585363207913" />
     <state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.830@0.23.1440.830" timestamp="1585360101388" />
-    <state x="520" y="85" width="837" height="550" key="find.popup" timestamp="1585556808136">
+    <state x="520" y="85" width="837" height="550" key="find.popup" timestamp="1585561388202">
       <screen x="0" y="23" width="1440" height="827" />
     </state>
-    <state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.827@0.23.1440.827" timestamp="1585556808136" />
+    <state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.827@0.23.1440.827" timestamp="1585561388202" />
     <state x="603" y="159" width="837" height="550" key="find.popup/0.23.1440.830@0.23.1440.830" timestamp="1585360905858" />
   </component>
   <component name="masterDetails">

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

@@ -137,6 +137,7 @@
 		if (extend != ''){
 			$("#extend").val(extend);
 		}
+
 		$("input[name=fid]").click(function(){
 			var id = $(this).val();
 			console.log(id)
@@ -159,12 +160,37 @@
 				}
 			}
 		});
+
+		$("#idcard").on('input',function(e){
+			var idcard = $("#idcard").val();
+			if(/^\d{17}[\dXx]$/.test(idcard)) {
+				var sex = parseInt(idcard.substr(16, 1)) % 2;
+				var birthday = idcard.substr(6, 4) + '-' + idcard.substr(10, 2) + '-' + idcard.substr(12, 2);
+				if(Date.parse(birthday)) {
+					$("#birth").val(birthday)
+				}
+				$("input[name=sex]").get(1 - sex).checked = true
+			}
+		});
 		
 		function save(){
 			var validate = check();
 			if (validate){
-				$("#form1").submit();
+				if(confirmIdCard()) {
+					$("#form1").submit();
+				}
+			} else  {
+				alert("请填写正确的身份信息")
+			}
+		}
+		
+		function confirmIdCard() {
+			var idcard = $("#idcard").val();
+			var birth = $("#birth").val().replace(/-/g, '');
+			if(idcard.substr(6, 8) !== birth || parseInt(idcard.substr(16, 1)) % 2 != $('input[name=sex]:checked').val()) {
+				return confirm("填写信息和身份证信息不符,是否继续?")
 			}
+			return true;
 		}
 		
 		function check(){

shop/static/style/nHeader.css

@@ -169,6 +169,7 @@ body,
     color: #02273a;
 }
 .zskk-box .zskk-footer .zskk-content .zskk-weixin img {
+    margin-top: 20px;
     width: 110px;
 }
 .zskk-box .zskk-footer .zskk-content .zskk-weixin .zskk-weixinname img {