'commit'

WebRoot/html/dangjian/view/exam.html

@@ -202,7 +202,7 @@
                     <div class="mui-card-header" style="font-size:18px;line-height: 1.8;padding-top: 25px;"><font style="color:#DD524D;">[{{:type_name}}]</font>&nbsp{{:content}}</div>
                     <div class="mui-card-content" style="font-size:16px;color:#576574">
                         <div class="mui-card-content-inner mui-input-group" style="background-color: #FFF5E1;padding-bottom: 15px;">
-                            {{if type_id == 3}}
+                            {{if type_id == 2}}
                                 {{for xuanxiang}}					
                                 <div class="mui-input-row mui-checkbox mui-left">
                                     <label>{{:key}}. {{:value}}</label>

WebRoot/html/dangjian/view/login.html

@@ -13,7 +13,7 @@
 		body {
 			background-image: url("../images/bg_img.png");
 		}
-
+		
 		.title2_div {
 			text-align: center;
 		}
@@ -57,7 +57,7 @@
 		.title1_p {
 			font-weight: 400;
 			font-style: normal;
-			font-size: 22px;
+			font-size: 20px;
 			color: #F4D7A1;
 			line-height: 30px;
 			word-wrap: break-word;
@@ -213,8 +213,6 @@
 		<div class="input_div">
 			<button id='login' type="button" class="button">开始答题</button>
 		</div>
-
-
 	</div>
 
 	<div class="tam_div">

WebRoot/html/dangjian/view/login_old.html

@@ -64,7 +64,6 @@
 
 		<div class="mui-content-padded">
 			<button id='login' type="button" class="mui-btn mui-btn-block mui-btn-primary">开始答题</button>
-
 		</div>
 
 
@@ -102,7 +101,6 @@
 						} else {
 							mui.alert(res.message, '提示');
 						}
-
 					},
 					error: function (xhr, type, errorThrown) {
 						//异常处理；

WebRoot/html/dangjian/view/result.html

@@ -202,7 +202,7 @@
                 {{/if}}
                 <span style="margin-left:50px">正确答案：<span style="color:#27ae60;">{{:answer}}</span></span>
             </div>
-            <div class="mui-card-footer">解析：{{:memo}}</div>
+            <!-- <div class="mui-card-footer">解析：{{:memo}}</div> -->
         </script>
     </div>
 

src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java

@@ -154,7 +154,7 @@ public class ExamModel {
      * 功能：获取整体信息，比如有几种题型，都是啥，每种题型有几道题
      */
     public List<Record> getExamInfo() {
-        String sql = "select t1.type_id,t2.type_name,count(1) as count from t_exam_question as t1 inner join t_exam_question_type as t2 on t1.type_id=t2.type_id group by t1.type_id,t2.type_name";
+        String sql = "select t1.type_id,t2.type_name,t2.count from t_exam_question as t1 inner join t_exam_question_type as t2 on t1.type_id=t2.type_id group by t1.type_id,t2.type_name,t2.count";
         List<Record> list = Db.find(sql);
         return list;
     }