diff --git a/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java b/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java
index 514f2b1..419bd09 100644
--- a/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java
+++ b/bjyy-core/src/main/java/com/wmeimob/bjyy/common/SumScore.java
@@ -3,20 +3,20 @@ package com.wmeimob.bjyy.common;
 @SuppressWarnings("unused")
 public class SumScore {
 
-	public static final String memoryScore = "55";
+	public static final String memoryScore = "54";
 	
-	public static final String expressScore = "61";
+	public static final String expressScore = "53";
 	
-	public static final String viewScore = "42";
+	public static final String viewScore = "29";
 	
-	public static final String attentionScore = "73";
+	public static final String attentionScore = "66";
 	
-	public static final String directionScore = "18";
+	public static final String directionScore = "11";
 	
-	public static final String countScore = "48";
+	public static final String countScore = "41";
 	
-	public static final String logicScore ="41";
+	public static final String logicScore ="37";
 	
-	public static final String sumScore = "338";
+	public static final String sumScore = "291";
 	
 }
diff --git a/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp b/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp
index 2c6117c..f19ed44 100644
--- a/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp
+++ b/bjyy-weixin/src/main/webapp/WEB-INF/pages/mental/mental_result.jsp
@@ -41,7 +41,7 @@
                    </div>
 
                 </div>
-                <button class="nextstep">查看训练跟踪</button>
+                <button class="nextstep">查看训练方案</button>
              </div>
           </section>
        </div>
@@ -66,11 +66,17 @@
         	  $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
         	  $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
         	  $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
-          }else{
+          }else if(${mentalTest.gradeResult==4}){
         	  $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
         	  $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
         	  $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
         	  $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
+          }else{
+              $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
+              $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
+              $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
+              $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
+              $(".result em").append("<span><img src='${contextPath}/static/images/star.png' width='100%'></span>");
           }
     });
 
diff --git a/bjyy-weixin/src/main/webapp/static/exam1/test18.html b/bjyy-weixin/src/main/webapp/static/exam1/test18.html
index ef66ca2..d4f9b96 100644
--- a/bjyy-weixin/src/main/webapp/static/exam1/test18.html
+++ b/bjyy-weixin/src/main/webapp/static/exam1/test18.html
@@ -23,7 +23,6 @@
             <div class="wrapper" id="wrapperIndex">
                 <div class="scroller">
                     <!-- 头部 -->
-                    
                     <div class="header mt">
                       <div class="return"><img src="../images/return.png" width="100%"></div>
                       <div class="title">脑力测评</div>
@@ -31,20 +30,18 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>18.如果您去这家医院看病，请您根据地图确定，请问医技楼在学生公寓的什么位置？</h2>
-                       <ul>
-                         <li>南面</li>
-                         <li>北面</li>
-                         <li class="right">西面</li>
-                         <li>东面</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1">南面</li>
+                         <li style="flex:1">北面</li>
+                         <li style="flex:1" class="right">西面</li>
+                         <li style="flex:1">东面</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/38.jpg" width="100%"></div>
+                       <div><img src="../images/38.jpg" width="100%"></div>
                    </div>
-
                 </div>
                  <button class="nextstep nextquestion">下一题</button>
              </div>
-            </div>
           </section>
        </div>
     </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam1/test19.html b/bjyy-weixin/src/main/webapp/static/exam1/test19.html
index 6692b9e..abc8f40 100644
--- a/bjyy-weixin/src/main/webapp/static/exam1/test19.html
+++ b/bjyy-weixin/src/main/webapp/static/exam1/test19.html
@@ -31,14 +31,14 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>19.如果您去这家医院看病，请您根据地图确定，请问5号楼和哪个楼距离最远？</h2>
-                       <ul>
-                         <li>4号楼</li>
-                         <li>行政楼</li>
-                         <li>食堂</li>
-                         <li class="right">精神卫生楼</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1">4号楼</li>
+                         <li style="flex:1">行政楼</li>
+                         <li style="flex:1">食堂</li>
+                         <li style="flex:1" class="right">精神卫生楼</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/39.jpg" width="100%"></div>
+                    <div><img src="../images/39.jpg" width="100%"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam1/test28.html b/bjyy-weixin/src/main/webapp/static/exam1/test28.html
index 83e9c5d..1a5f83a 100644
--- a/bjyy-weixin/src/main/webapp/static/exam1/test28.html
+++ b/bjyy-weixin/src/main/webapp/static/exam1/test28.html
@@ -23,7 +23,7 @@
             <div class="wrapper" id="wrapperIndex">
                 <div class="scroller">
                     <!-- 头部 -->
-                    
+
                     <div class="header mt">
                       <div class="return"><img src="../images/return.png" width="100%"></div>
                       <div class="title">脑力测评</div>
@@ -50,14 +50,13 @@
                     </div>
 
                 </div>
-                 <button class="nextstep nextquestion">下一题</button>
+                <button class="nextstep answer">答题</button>
+                 <button class="nextstep nextquestion"  style="display: none;">下一题</button>
              </div>
-            </div>
           </section>
        </div>
     </div>
 </div>
-
 <script src="../js/swiper.animate.min.js"></script>
 <script src="../js/iscroll.js"></script>
 <script src="../js/main.js"></script>
diff --git a/bjyy-weixin/src/main/webapp/static/exam1/test29.html b/bjyy-weixin/src/main/webapp/static/exam1/test29.html
index b77ddef..4c07bda 100644
--- a/bjyy-weixin/src/main/webapp/static/exam1/test29.html
+++ b/bjyy-weixin/src/main/webapp/static/exam1/test29.html
@@ -33,7 +33,7 @@
                                 <h2>29.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p> 3     8      4</p>
+                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">384</p>
                           </div>
                    </div>
                   
diff --git a/bjyy-weixin/src/main/webapp/static/exam1/test30.html b/bjyy-weixin/src/main/webapp/static/exam1/test30.html
index efbef42..1d54d6b 100644
--- a/bjyy-weixin/src/main/webapp/static/exam1/test30.html
+++ b/bjyy-weixin/src/main/webapp/static/exam1/test30.html
@@ -46,7 +46,7 @@
                             <h2>30.请记住以下数字：</h2>
                         </div>
                         <div class="basicinfo">
-                            <p>3     7     1     5</p>
+                            <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">3715</p>
                         </div>
                     </div>
 
@@ -62,7 +62,8 @@
                         </div>
                     </div>
                 </div>
-                 <button class="nextstep nextquestion">下一题</button>
+                <button class="nextstep answer">答题</button>
+                <button class="nextstep nextquestion"  style="display: none;">下一题</button>
                  
                   <form name="firstBasicForm" onsubmit="return false;">
                     <input type="hidden" name="chooseIds">
diff --git a/bjyy-weixin/src/main/webapp/static/exam2/test18.html b/bjyy-weixin/src/main/webapp/static/exam2/test18.html
index e5d8cbd..2855765 100644
--- a/bjyy-weixin/src/main/webapp/static/exam2/test18.html
+++ b/bjyy-weixin/src/main/webapp/static/exam2/test18.html
@@ -31,14 +31,14 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>18.如果您去这家医院看病，请您根据地图确定，请问精神卫生楼在行政楼的什么位置？</h2>
-                       <ul>
-                         <li>东北</li>
-                         <li>西北</li>
-                         <li class="right">东南</li>
-                         <li >西南</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1">东北</li>
+                         <li style="flex:1">西北</li>
+                         <li style="flex:1" class="right">东南</li>
+                         <li style="flex:1">西南</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/38.jpg" width="100%"></div>
+                    <div><img src="../images/38.jpg" width="100%"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam2/test19.html b/bjyy-weixin/src/main/webapp/static/exam2/test19.html
index 749814d..8e457ba 100644
--- a/bjyy-weixin/src/main/webapp/static/exam2/test19.html
+++ b/bjyy-weixin/src/main/webapp/static/exam2/test19.html
@@ -31,14 +31,14 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>19.如果您去这家医院看病，请您根据地图确定，请问从大门口去4号楼，最近的路线应该经过哪里？</h2>
-                       <ul>
-                         <li class="right">查体楼</li>
-                         <li>学生公寓</li>
-                         <li>精神卫生楼</li>
-                         <li>3号楼</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1" class="right">查体楼</li>
+                         <li style="flex:1">学生公寓</li>
+                         <li style="flex:1">精神卫生楼</li>
+                         <li style="flex:1">3号楼</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/38.jpg" width="100%"></div>
+                    <div><img src="../images/38.jpg" width="100%"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam2/test24.html b/bjyy-weixin/src/main/webapp/static/exam2/test24.html
index 497435b..9900b35 100644
--- a/bjyy-weixin/src/main/webapp/static/exam2/test24.html
+++ b/bjyy-weixin/src/main/webapp/static/exam2/test24.html
@@ -32,14 +32,13 @@
                       <div class="basicinfo">
                        <h2>24.一斤黄瓜1.2元，一斤桔子3.5元，各买1斤需要多少钱？</h2>
                        <ul>
-                         <li>5元</li>
-                         <li class="right">4.7元</li>
-                         <li>8.5元</li>
-                         <li >10元</li>
+                           <li>5元</li>
+                           <li class="right">4.7元</li>
+                           <li>8.5元</li>
+                           <li >10元</li>
                        </ul>
-<!--                    </div>-->
-<!--                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/40.jpg" width="100%"></div>-->
-<!--                   </div>-->
+                    </div>
+                   </div>
 
                 </div>
                  <button class="nextstep nextquestion">下一题</button>
@@ -57,39 +56,37 @@
 
 <!-- 配置滚动条 -->
 <script type="text/javascript">
-$(function(){
-    setTimeout(function(){
-      loadedScroll("#wrapperIndex",false,true);  
-    },500);
-    if(sessionStorage.choose.indexOf("24")!=-1){
-  	  sessionStorage.choose=sessionStorage.choose.replace("24,","");  
-     }
-});
-  $(".nextquestion").click(function(){
-		   if($(".basicinfo .active").length==0){
-    		alert("请选择");
-    		return;
-    	  }else{
-			  if(typeof(Storage) !== "undefined") {
-				      sessionStorage.num=24;
-				     if($(".active").hasClass("right")){
-				    	 if(sessionStorage.choose.indexOf("24,")==-1){
-		       			   sessionStorage.choose=sessionStorage.num+","+sessionStorage.choose;
-				    	 }
-		       		  }else{
-		       			if(sessionStorage.choose.indexOf("24")!=-1){
-		            	   sessionStorage.choose=sessionStorage.choose.replace("24,",""); 
-		                  }
-		       			 sessionStorage.choose=sessionStorage.choose;
-		       		  }
-		       			 console.log(sessionStorage.choose);
+        $(function(){
+         // setTimeout(function(){          //   loadedScroll("#wrapperIndex",false,true);            // },500);
+          if(sessionStorage.choose.indexOf("24")!=-1){
+        	  sessionStorage.choose=sessionStorage.choose.replace("24,","");
+           }
+    });
+        $(".nextquestion").click(function(){
+ 		   if($(".basicinfo .active").length==0){
+        		alert("请选择");
+        		return;
+        	  }else{
+ 			  if(typeof(Storage) !== "undefined") {
+ 				      sessionStorage.num=24;
+ 				     if($(".active").hasClass("right")){
+ 				    	 if(sessionStorage.choose.indexOf("24,")==-1){
+ 		       			   sessionStorage.choose=sessionStorage.num+","+sessionStorage.choose;
+ 				    	 }
+ 		       		  }else{
+ 		       			if(sessionStorage.choose.indexOf("24")!=-1){
+ 		            	   sessionStorage.choose=sessionStorage.choose.replace("24,","");
+ 		                  }
+ 		       			 sessionStorage.choose=sessionStorage.choose;
+ 		       		  }
+ 		       			 console.log(sessionStorage.choose);
                   let a = Math.floor(Math.random()*4) + 1;
                   window.location.href = "../exam"+a+"/test25.html";
-			     }else{
-			        document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
-			    }
-       	}
-	   });
+ 			     }else{
+ 			        document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
+ 			    }
+           	}
+ 	   });
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/bjyy-weixin/src/main/webapp/static/exam2/test29.html b/bjyy-weixin/src/main/webapp/static/exam2/test29.html
index 8af946f..95d9f56 100644
--- a/bjyy-weixin/src/main/webapp/static/exam2/test29.html
+++ b/bjyy-weixin/src/main/webapp/static/exam2/test29.html
@@ -33,9 +33,7 @@
                                 <h2>29.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p>1</p>
-                             <p>8</p>
-                             <p>6</p>
+                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">186</p>
                           </div>
                    </div>
                   
diff --git a/bjyy-weixin/src/main/webapp/static/exam2/test30.html b/bjyy-weixin/src/main/webapp/static/exam2/test30.html
index a92da27..de6d834 100644
--- a/bjyy-weixin/src/main/webapp/static/exam2/test30.html
+++ b/bjyy-weixin/src/main/webapp/static/exam2/test30.html
@@ -33,10 +33,7 @@
                                 <h2>30.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p>3</p>
-                             <p>8</p>
-                             <p>4</p>
-                             <p>6</p>
+                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">3846</p>
                           </div>
                    </div>
                   
diff --git a/bjyy-weixin/src/main/webapp/static/exam3/test18.html b/bjyy-weixin/src/main/webapp/static/exam3/test18.html
index e3c4a1c..721bdd8 100644
--- a/bjyy-weixin/src/main/webapp/static/exam3/test18.html
+++ b/bjyy-weixin/src/main/webapp/static/exam3/test18.html
@@ -31,14 +31,14 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>18.如果您去这家医院看病，请您根据地图确定，请问行政楼在5号楼的什么位置？</h2>
-                       <ul>
-                         <li>北面</li>
-                         <li>南面</li>
-                         <li>西面</li>
-                         <li class="right">东面</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1">北面</li>
+                         <li style="flex:1">南面</li>
+                         <li style="flex:1">西面</li>
+                         <li style="flex:1" class="right">东面</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/38.jpg" width="100%"></div>
+                    <div><img src="../images/38.jpg" width="100%"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam3/test19.html b/bjyy-weixin/src/main/webapp/static/exam3/test19.html
index 6c807a4..aed15af 100644
--- a/bjyy-weixin/src/main/webapp/static/exam3/test19.html
+++ b/bjyy-weixin/src/main/webapp/static/exam3/test19.html
@@ -31,14 +31,14 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>19.如果您去这家医院看病，请您根据地图确定，请问从3号楼去4号楼，最近的路线应该经过哪里</h2>
-                       <ul>
-                         <li>查体楼</li>
-                         <li>学生公寓</li>
-                         <li>精神卫生楼</li>
-                         <li class="right">5号楼</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1">查体楼</li>
+                         <li style="flex:1">学生公寓</li>
+                         <li style="flex:1">精神卫生楼</li>
+                         <li style="flex:1" class="right">5号楼</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/38.jpg" width="100%"></div>
+                    <div><img src="../images/38.jpg" width="100%"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam3/test24.html b/bjyy-weixin/src/main/webapp/static/exam3/test24.html
index df7d66f..fb1e8ad 100644
--- a/bjyy-weixin/src/main/webapp/static/exam3/test24.html
+++ b/bjyy-weixin/src/main/webapp/static/exam3/test24.html
@@ -32,13 +32,12 @@
                       <div class="basicinfo">
                        <h2>24.一斤黄瓜1.2元，买6斤需要多少钱？</h2>
                        <ul>
-                         <li>5元</li>
-                         <li class="right">7.2元</li>
-                         <li>8.5元</li>
-                         <li >10元</li>
+                           <li>5元</li>
+                           <li class="right">7.2元</li>
+                           <li>8.5元</li>
+                           <li >10元</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/40.jpg" width="100%"></div>
                    </div>
 
                 </div>
@@ -57,39 +56,37 @@
 
 <!-- 配置滚动条 -->
 <script type="text/javascript">
-$(function(){
-    setTimeout(function(){
-      loadedScroll("#wrapperIndex",false,true);  
-    },500);
-    if(sessionStorage.choose.indexOf("24")!=-1){
-  	  sessionStorage.choose=sessionStorage.choose.replace("24,","");  
-     }
-});
-  $(".nextquestion").click(function(){
-		   if($(".basicinfo .active").length==0){
-    		alert("请选择");
-    		return;
-    	  }else{
-			  if(typeof(Storage) !== "undefined") {
-				      sessionStorage.num=24;
-				     if($(".active").hasClass("right")){
-				    	 if(sessionStorage.choose.indexOf("24,")==-1){
-		       			   sessionStorage.choose=sessionStorage.num+","+sessionStorage.choose;
-				    	 }
-		       		  }else{
-		       			if(sessionStorage.choose.indexOf("24")!=-1){
-		            	   sessionStorage.choose=sessionStorage.choose.replace("24,",""); 
-		                  }
-		       			 sessionStorage.choose=sessionStorage.choose;
-		       		  }
-		       			 console.log(sessionStorage.choose);
+        $(function(){
+         // setTimeout(function(){          //   loadedScroll("#wrapperIndex",false,true);            // },500);
+          if(sessionStorage.choose.indexOf("24")!=-1){
+        	  sessionStorage.choose=sessionStorage.choose.replace("24,","");
+           }
+    });
+        $(".nextquestion").click(function(){
+ 		   if($(".basicinfo .active").length==0){
+        		alert("请选择");
+        		return;
+        	  }else{
+ 			  if(typeof(Storage) !== "undefined") {
+ 				      sessionStorage.num=24;
+ 				     if($(".active").hasClass("right")){
+ 				    	 if(sessionStorage.choose.indexOf("24,")==-1){
+ 		       			   sessionStorage.choose=sessionStorage.num+","+sessionStorage.choose;
+ 				    	 }
+ 		       		  }else{
+ 		       			if(sessionStorage.choose.indexOf("24")!=-1){
+ 		            	   sessionStorage.choose=sessionStorage.choose.replace("24,","");
+ 		                  }
+ 		       			 sessionStorage.choose=sessionStorage.choose;
+ 		       		  }
+ 		       			 console.log(sessionStorage.choose);
                   let a = Math.floor(Math.random()*4) + 1;
                   window.location.href = "../exam"+a+"/test25.html";
-			     }else{
-			        document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
-			    }
-       	}
-	   });
+ 			     }else{
+ 			        document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
+ 			    }
+           	}
+ 	   });
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/bjyy-weixin/src/main/webapp/static/exam3/test29.html b/bjyy-weixin/src/main/webapp/static/exam3/test29.html
index 9aecbfa..5638fa4 100644
--- a/bjyy-weixin/src/main/webapp/static/exam3/test29.html
+++ b/bjyy-weixin/src/main/webapp/static/exam3/test29.html
@@ -33,9 +33,7 @@
                                 <h2>29.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p>3</p>
-                             <p>9</p>
-                             <p>4</p>
+                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">394</p>
                           </div>
                    </div>
                   
diff --git a/bjyy-weixin/src/main/webapp/static/exam3/test30.html b/bjyy-weixin/src/main/webapp/static/exam3/test30.html
index 2ccf0ae..2e26c70 100644
--- a/bjyy-weixin/src/main/webapp/static/exam3/test30.html
+++ b/bjyy-weixin/src/main/webapp/static/exam3/test30.html
@@ -33,10 +33,7 @@
                                 <h2>30.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p>1</p>
-                             <p>9</p>
-                             <p>2</p>
-                             <p>6</p>
+                             <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">1926</p>
                           </div>
                    </div>
                   
diff --git a/bjyy-weixin/src/main/webapp/static/exam3/test4.html b/bjyy-weixin/src/main/webapp/static/exam3/test4.html
index 02edd50..fcd2f1e 100644
--- a/bjyy-weixin/src/main/webapp/static/exam3/test4.html
+++ b/bjyy-weixin/src/main/webapp/static/exam3/test4.html
@@ -1,72 +1,75 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8"><meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /><meta http-equiv="Pragma" content="no-cache" /><meta http-equiv="Expires" content="0" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta content="black" name="apple-mobile-web-app-status-bar-style">
-<meta name="format-detection" content="telephone=no">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<title>北京燕园</title>
-<script src="../js/flexible.js"></script>
-<script src="../js/jquery.js"></script>
-<script src="../js/swiper.min.js"></script>
-<link rel="stylesheet" href="../css/swiper.min.css">
-<link rel="stylesheet" type="text/css" href="../css/style.css"/>
+    <meta charset="utf-8">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
+    <meta http-equiv="Pragma" content="no-cache"/>
+    <meta http-equiv="Expires" content="0"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>北京燕园</title>
+    <script src="../js/flexible.js"></script>
+    <script src="../js/jquery.js"></script>
+    <script src="../js/swiper.min.js"></script>
+    <link rel="stylesheet" href="../css/swiper.min.css">
+    <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 </head>
 <body>
 <div class="iphone4 swiper-container" id="indexSwiper">
     <div class="swiper-wrapper">
-       <div class="swiper-slide">
-          <section class="sectionBox">
-            <div class="wrapper" id="wrapperIndex">
-                <div class="scroller">
-                    <!-- 头部 -->
-                    
-                    <div class="header mt">
-                      <div class="return"><img src="../images/return.png" width="100%"></div>
-                      <div class="title">脑力测评</div>
-                   </div>
-                   <div class="question">
-                          <div class="basicinfo">
-                       <h2>4.请记住以下物品（图示）</h2>
-                          </div>
-                          <div class="showimg clearfix showimg-six">
-                               <ul>
-                                 <li><img src="../images/10.jpg" width="100%"></li>
-                                 <li><img src="../images/11.jpg" width="100%"></li>
-                                 <li><img src="../images/3-4-老虎.jpeg" width="100%"></li>
-                                 <li><img src="../images/3-4-haibao.jpeg" width="100%"></li>
-                                   <li><img src="../images/15.jpg" width="100%"></li>
-                                 <li><img src="../images/14.jpg" width="100%"></li>
-                               </ul>
-                          </div>
-                   </div>
-                  
-                   <div class="resulttip" style="display: none;">
-                      <div class="basicinfo">
-                       <h2>刚刚出现的物品有?</h2>
-                       <ul>
-                         <li>猫</li>
-                         <li>牛</li>
-                         <li>兔</li>
-                         <li class="right">鸭</li>
-                         <li>鸽子</li>
-                         <li>猴</li>
-                       </ul>
-                    </div>
-                   </div>
+        <div class="swiper-slide">
+            <section class="sectionBox">
+                <div class="wrapper" id="wrapperIndex">
+                    <div class="scroller">
+                        <!-- 头部 -->
+
+                        <div class="header mt">
+                            <div class="return"><img src="../images/return.png" width="100%"></div>
+                            <div class="title">脑力测评</div>
+                        </div>
+                        <div class="question">
+                            <div class="basicinfo">
+                                <h2>4.请记住以下物品（图示）</h2>
+                            </div>
+                            <div class="showimg clearfix showimg-six">
+                                <ul>
+                                    <li style="flex:1"><img src="../images/10.jpg" width="100%"></li>
+                                    <li style="flex:1"><img src="../images/11.jpg" width="100%"></li>
+                                    <li style="flex:1"><img src="../images/3-4-老虎.jpeg" width="100%" height="158"></li>
+                                    <li style="flex:1"><img src="../images/3-4-haibao.jpeg" width="100%" height="158"></li>
+                                    <li style="flex:1"><img src="../images/15.jpg" width="100%"></li>
+                                    <li style="flex:1"><img src="../images/14.jpg" width="100%"></li>
+                                </ul>
+                            </div>
+                        </div>
+
+                        <div class="resulttip" style="display: none;">
+                            <div class="basicinfo">
+                                <h2>刚刚出现的物品有?</h2>
+                                <ul>
+                                    <li>猫</li>
+                                    <li>牛</li>
+                                    <li>兔</li>
+                                    <li class="right">鸭</li>
+                                    <li>鸽子</li>
+                                    <li>猴</li>
+                                </ul>
+                            </div>
+                        </div>
 
+                    </div>
+                    <button class="nextstep answer">答题</button>
+                    <button class="nextstep nextquestion" style="display: none;">下一题</button>
                 </div>
-                <button class="nextstep answer">答题</button>
-                 <button class="nextstep nextquestion" style="display: none;">下一题</button>
-             </div>
-            </div>
-          </section>
-       </div>
+        </div>
+        </section>
     </div>
 </div>
+</div>
 
 <script src="../js/swiper.animate.min.js"></script>
 <script src="../js/iscroll.js"></script>
@@ -75,39 +78,39 @@
 
 <!-- 配置滚动条 -->
 <script type="text/javascript">
-$(function(){
-    setTimeout(function(){
-      loadedScroll("#wrapperIndex",false,true);  
-    },500);
-    if(sessionStorage.choose.indexOf("4")!=-1){
-  	  sessionStorage.choose=sessionStorage.choose.replace("4,","");  
-     }
-});
-  $(".nextquestion").click(function(){
-		   if($(".basicinfo .active").length==0){
-    		alert("请选择");
-    		return;
-    	  }else{
-			  if(typeof(Storage) !== "undefined") {
-				      sessionStorage.num=4;
-				     if($(".active").hasClass("right")){
-				    	 if(sessionStorage.choose.indexOf("4,")==-1){
-		       			   sessionStorage.choose=sessionStorage.num+","+sessionStorage.choose;
-				    	 }
-		       		  }else{
-		       			if(sessionStorage.choose.indexOf("4")!=-1){
-		            	   sessionStorage.choose=sessionStorage.choose.replace("4,",""); 
-		                  }
-		       			 sessionStorage.choose=sessionStorage.choose;
-		       		  }
-		       			 console.log(sessionStorage.choose);
-                  let a = Math.floor(Math.random()*4) + 1;
-                  window.location.href = "../exam"+a+"/test5.html";
-			     }else{
-			        document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
-			    }
-       	}
-	   });
+    $(function () {
+        setTimeout(function () {
+            loadedScroll("#wrapperIndex", false, true);
+        }, 500);
+        if (sessionStorage.choose.indexOf("4") != -1) {
+            sessionStorage.choose = sessionStorage.choose.replace("4,", "");
+        }
+    });
+    $(".nextquestion").click(function () {
+        if ($(".basicinfo .active").length == 0) {
+            alert("请选择");
+            return;
+        } else {
+            if (typeof (Storage) !== "undefined") {
+                sessionStorage.num = 4;
+                if ($(".active").hasClass("right")) {
+                    if (sessionStorage.choose.indexOf("4,") == -1) {
+                        sessionStorage.choose = sessionStorage.num + "," + sessionStorage.choose;
+                    }
+                } else {
+                    if (sessionStorage.choose.indexOf("4") != -1) {
+                        sessionStorage.choose = sessionStorage.choose.replace("4,", "");
+                    }
+                    sessionStorage.choose = sessionStorage.choose;
+                }
+                console.log(sessionStorage.choose);
+                let a = Math.floor(Math.random() * 4) + 1;
+                window.location.href = "../exam" + a + "/test5.html";
+            } else {
+                document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
+            }
+        }
+    });
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test16.html b/bjyy-weixin/src/main/webapp/static/exam4/test16.html
index 6ebf407..a7d75b9 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test16.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test16.html
@@ -36,7 +36,7 @@
                          <li class="right">右脚</li>
                        </ul>
                     </div>
-                    <div class="img"><img src="../images/4-16脚印.jpeg" width="100%"></div>
+                    <div class="img" style="width: 80px"><img src="../images/4-16脚印.jpeg"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test18.html b/bjyy-weixin/src/main/webapp/static/exam4/test18.html
index 6ebb64d..80d5a56 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test18.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test18.html
@@ -31,14 +31,14 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>18.如果您去这家医院看病，请您根据地图确定，请问门诊楼在行政楼的什么位置？</h2>
-                       <ul>
-                         <li>东北</li>
-                         <li>东南</li>
-                         <li class="right">西南</li>
-                         <li>西北</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1">东北</li>
+                         <li style="flex:1">东南</li>
+                         <li style="flex:1" class="right">西南</li>
+                         <li style="flex:1">西北</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/38.jpg" width="100%"></div>
+                    <div><img src="../images/38.jpg" width="100%"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test19.html b/bjyy-weixin/src/main/webapp/static/exam4/test19.html
index 6692b9e..abc8f40 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test19.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test19.html
@@ -31,14 +31,14 @@
                    <div class="resulttip">
                       <div class="basicinfo">
                        <h2>19.如果您去这家医院看病，请您根据地图确定，请问5号楼和哪个楼距离最远？</h2>
-                       <ul>
-                         <li>4号楼</li>
-                         <li>行政楼</li>
-                         <li>食堂</li>
-                         <li class="right">精神卫生楼</li>
+                       <ul style="width:100%;overflow: hidden;display: flex;">
+                         <li style="flex:1">4号楼</li>
+                         <li style="flex:1">行政楼</li>
+                         <li style="flex:1">食堂</li>
+                         <li style="flex:1" class="right">精神卫生楼</li>
                        </ul>
                     </div>
-                    <div class="img" style="width: 55%;top: 2.1rem;"><img src="../images/39.jpg" width="100%"></div>
+                    <div><img src="../images/39.jpg" width="100%"></div>
                    </div>
 
                 </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test21.html b/bjyy-weixin/src/main/webapp/static/exam4/test21.html
index 5e40617..ef6b332 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test21.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test21.html
@@ -31,12 +31,12 @@
                    <div class="resulttip">
                       <div class="basicinfo  clearfix basicinfoexplame">
                        <h2>21.下图的时间，经过2个小时，应该到几点？对应的是哪副图?</h2>
-                       <div class="explame" style="margin-top: 0.3rem;"><img src="../images/4-21-0.jpeg" width="100%"></div>
+                       <div class="explame" style="margin-top: 0.3rem;"><img src="../images/4-21-0.jpg" width="100%"></div>
                        <ul>
-                         <li><img src="../images/43.jpg" width="100%"></li>
-                         <li><img src="../images/44.jpg" width="100%"></li>
-                         <li><img src="../images/4-21-3.jpeg" width="100%"></li>
-                         <li class="right"><img src="../images/46.jpg" width="100%"></li>
+                         <li><img src="../images/43.jpg" width="100%" height="100"></li>
+                         <li><img src="../images/44.jpg" width="100%" height="100"></li>
+                         <li><img src="../images/4-21-3.jpg" width="100%" height="100"></li>
+                         <li class="right"><img src="../images/46.jpg" width="100%" height="100"></li>
                        </ul>
                     </div>
                    </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test24.html b/bjyy-weixin/src/main/webapp/static/exam4/test24.html
index 6447666..5ad4007 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test24.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test24.html
@@ -81,7 +81,6 @@
  		       		  }
  		       			 console.log(sessionStorage.choose);
                   let a = Math.floor(Math.random()*4) + 1;
-                  let a = Math.floor(Math.random()*4) + 1;
                   window.location.href = "../exam"+a+"/test25.html";
  			     }else{
  			        document.getElementById("result").innerHTML = "抱歉！您的浏览器不支持 Web Storage ...";
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test28.html b/bjyy-weixin/src/main/webapp/static/exam4/test28.html
index 00d652f..da21530 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test28.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test28.html
@@ -50,9 +50,9 @@
                     </div>
 
                 </div>
-                 <button class="nextstep nextquestion">下一题</button>
+                <button class="nextstep answer">答题</button>
+                <button class="nextstep nextquestion"  style="display: none;">下一题</button>
              </div>
-            </div>
           </section>
        </div>
     </div>
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test29.html b/bjyy-weixin/src/main/webapp/static/exam4/test29.html
index 0b2bb15..6df3b6b 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test29.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test29.html
@@ -33,7 +33,7 @@
                                 <h2>29.请记住以下数字：</h2>
                           </div>
                           <div class="basicinfo">
-                             <p> 3     7      1</p>
+                              <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">371</p>
                           </div>
                    </div>
                   
diff --git a/bjyy-weixin/src/main/webapp/static/exam4/test30.html b/bjyy-weixin/src/main/webapp/static/exam4/test30.html
index 9f3a434..1e1d7f2 100644
--- a/bjyy-weixin/src/main/webapp/static/exam4/test30.html
+++ b/bjyy-weixin/src/main/webapp/static/exam4/test30.html
@@ -46,7 +46,7 @@
                             <h2>30.请记住以下数字：</h2>
                         </div>
                         <div class="basicinfo">
-                            <p>3     9     2     5</p>
+                            <p style="font-size: 80px;font-weight: bold;letter-spacing: 80px">3925</p>
                         </div>
                     </div>
 
@@ -62,7 +62,8 @@
                         </div>
                     </div>
                 </div>
-                 <button class="nextstep nextquestion">下一题</button>
+                <button class="nextstep answer">答题</button>
+                <button class="nextstep nextquestion"  style="display: none;">下一题</button>
                  
                   <form name="firstBasicForm" onsubmit="return false;">
                     <input type="hidden" name="chooseIds">
diff --git a/bjyy-weixin/src/main/webapp/static/images/4-16脚印.jpeg b/bjyy-weixin/src/main/webapp/static/images/4-16脚印.jpeg
index 1f33c9b..bac8b75 100644
Binary files a/bjyy-weixin/src/main/webapp/static/images/4-16脚印.jpeg and b/bjyy-weixin/src/main/webapp/static/images/4-16脚印.jpeg differ
diff --git a/bjyy-weixin/src/main/webapp/static/images/4-21-0.jpeg b/bjyy-weixin/src/main/webapp/static/images/4-21-0.jpeg
deleted file mode 100644
index 34cf05c..0000000
Binary files a/bjyy-weixin/src/main/webapp/static/images/4-21-0.jpeg and /dev/null differ
diff --git a/bjyy-weixin/src/main/webapp/static/images/4-21-0.jpg b/bjyy-weixin/src/main/webapp/static/images/4-21-0.jpg
new file mode 100644
index 0000000..2c97029
Binary files /dev/null and b/bjyy-weixin/src/main/webapp/static/images/4-21-0.jpg differ
diff --git a/bjyy-weixin/src/main/webapp/static/images/4-21-3.jpeg b/bjyy-weixin/src/main/webapp/static/images/4-21-3.jpeg
deleted file mode 100644
index 34cf05c..0000000
Binary files a/bjyy-weixin/src/main/webapp/static/images/4-21-3.jpeg and /dev/null differ
diff --git a/bjyy-weixin/src/main/webapp/static/images/4-21-3.jpg b/bjyy-weixin/src/main/webapp/static/images/4-21-3.jpg
new file mode 100644
index 0000000..18818cf
Binary files /dev/null and b/bjyy-weixin/src/main/webapp/static/images/4-21-3.jpg differ