Merge remote-tracking branch 'origin/master'

apps/home/Tpl/default/Home/exams_w3g.html

@@ -194,6 +194,7 @@
 				active: 1,
 				active: 1,
 				tab: 0,
 				tab: 0,
 				myTab: 0,
 				myTab: 0,
+				condition: [],
 				zhenti: [],
 				zhenti: [],
 				download: [],
 				download: [],
 				myYiZuo: [],
 				myYiZuo: [],
@@ -231,6 +232,9 @@
 			onMyTab: function(tab) {
 			onMyTab: function(tab) {
 				this.myTab = tab
 				this.myTab = tab
 			},
 			},
+			onCondition: function(condition) {
+				
+			},
 			//加载真题
 			//加载真题
 			loadZhenti: function() {
 			loadZhenti: function() {
 				let that = this
 				let that = this
@@ -248,7 +252,7 @@
 									price: r.price,
 									price: r.price,
 									count: r.questions_count,
 									count: r.questions_count,
 									time: r.reply_time,
 									time: r.reply_time,
-									person: "0已做"
+									person: r.exams_user + "已做"
 								}
 								}
 							}))
 							}))
 						}
 						}