init

common/httpList/bank.js

@@ -7,7 +7,7 @@ export default {
 			url: '/app/common/bank/list',
 			method: 'get',
 			data: data,
-			noToken:true
+			noToken: true
 		})
 	},
 	//题库推荐列表
@@ -16,7 +16,7 @@ export default {
 			url: '/app/common/bank/recommendList',
 			method: 'get',
 			data: data,
-			noToken:true
+			noToken: true
 		})
 	},
 	bankInfo(data) {
@@ -32,7 +32,7 @@ export default {
 			url: '/app/common/bank/chapter/list',
 			method: 'get',
 			data: data,
-			noToken:true
+			noToken: true
 		})
 	},
 	//获取题库大章详细信息
@@ -45,7 +45,7 @@ export default {
 	//查询题库小节列表
 	banklistsectionlist(data) {
 		return myRequest({
-			url:'/bank/section/list',
+			url: '/bank/section/list',
 			method: 'get',
 			data: data,
 		})
@@ -60,7 +60,7 @@ export default {
 	//查询题库试卷列表
 	banklistexam(data) {
 		return myRequest({
-			url:'/bank/exam/list',
+			url: '/bank/exam/list',
 			method: 'get',
 			data: data,
 		})
@@ -75,7 +75,7 @@ export default {
 	//查询题目详情列表
 	questiondetailList(data) {
 		return myRequest({
-			url:'/bank/question/list',
+			url: '/bank/question/list',
 			method: 'get',
 			data: data,
 		})
@@ -90,7 +90,7 @@ export default {
 	//新增用户的做题历史
 	questiondetailrecord(data) {
 		return myRequest({
-			url:'/bank/record',
+			url: '/bank/record',
 			method: 'post',
 			data: data,
 		})
@@ -98,7 +98,7 @@ export default {
 	//查询用户的做题历史列表
 	questiondetailrecordlist(data) {
 		return myRequest({
-			url:'/bank/record/list',
+			url: '/bank/record/list',
 			method: 'get',
 			data: data,
 		})
@@ -109,5 +109,20 @@ export default {
 			url: '/bank/record/' + data,
 			method: 'get',
 		})
+	},
+	//查询模拟题库列表
+	questiondetailsimulatelist(data) {
+		return myRequest({
+			url: '/bank/simulate/list',
+			method: 'get',
+			data: data,
+		})
+	},
+	//获取模拟题库详细信息
+	questionsimulate(data) {
+		return myRequest({
+			url: '/bank/simulate/' + data,
+			method: 'get',
+		})
 	}
 }

common/httpList/collect.js

@@ -50,7 +50,7 @@ export default {
 			url: '/collect/bank/delete/' + data,
 			method: 'post',
 		})
-	}, 
+	},
 	//查询收藏题库列表
 	bankCollectList(data) {
 		return myRequest({
@@ -59,7 +59,7 @@ export default {
 			data: data,
 		})
 	},
-	 //判断是否收藏题库
+	//判断是否收藏题库
 	bankCollects(data) {
 		return myRequest({
 			url: '/collect/bank/' + data,
@@ -77,11 +77,11 @@ export default {
 			data: data,
 		})
 	},
-	
+
 	//新增收藏题目
 	questionsystemadd(data) {
 		return myRequest({
-			url: '/system/question',
+			url: '/collect/question',
 			method: 'post',
 			data: data,
 		})
@@ -89,40 +89,39 @@ export default {
 	//删除收藏题目
 	questionsystemdelete(data) {
 		return myRequest({
-			url: '/system/question/delete/' + data,
+			url: '/collect/question/delete/' + data,
 			method: 'post',
 		})
-	}, 
+	},
 	//查询收藏题目列表
 	systemquestionList(data) {
 		return myRequest({
-			url: '/system/question/list',
+			url: '/collect/question/list',
 			method: 'get',
 			data: data,
 		})
 	},
-	 //获取收藏题目详细信息
+	//获取收藏题目详细信息
 	questionsystems(data) {
 		return myRequest({
-			url: '/system/question/' + data,
+			url: '/collect/question/' + data,
 			method: 'get',
 		})
 	},
-	
-	//查询用户做历史列表
-	questionListrecordDoneList(data) {
+	//查询用户错题历史列表
+	questionListrecord(data) {
 		return myRequest({
-			url: '/bank/question/record/doneList',
+			url: '/bank/question/record/list',
 			method: 'get',
 			data: data,
 		})
 	},
-	//查询用户错题历史列表
-	questionListrecord(data) {
+	//查询用户的做题历史列表
+	questionListrecordDoneList(data) {
 		return myRequest({
-			url: '/bank/question/record/list',
+			url: '/bank/question/record/doneList',
 			method: 'get',
 			data: data,
 		})
-	},
+	}
 }

common/request.js

@@ -1,6 +1,6 @@
 
-const BASE_URL = 'http://192.168.0.222:8088'
-// const BASE_URL = 'http://192.168.0.145:8088'   //
+const BASE_URL = 'http://192.168.1.222:8088'
+// const BASE_URL = 'http://192.168.1.20'   //
 // const BASE_URL = 'https://api.xyyxt.net'  //
 import store from '@/store/index.js'
 import api from './api.js'

pages/login/login.vue

@@ -16,6 +16,25 @@ export default {
 	mounted() {},
 	methods: {
 		getPhoneNumber(e) {
+			let that = this;
+			uni.checkSession({
+			  success () {
+			    //session_key 未过期，并且在本生命周期一直有效
+				that.putInfo(e)
+			  },
+			  fail () {
+			    // session_key 已经失效，需要重新执行登录流程
+			    uni.login({
+			    	provider: 'weixin',
+			    	success: function(loginRes) {
+			    		that.code = loginRes.code;
+						that.putInfo(e)
+			    	}
+			    });
+			  }
+			})
+		},
+		putInfo(e){
 			let that = this;
 			if (e.detail.encryptedData) {
 				//用户同意授权

pages2/bank/detail.vue

@@ -14,7 +14,13 @@
 												<canvas class="progress_bg" canvas-id="canvasProgressbg"></canvas>
 												<canvas class="progress_canvas" canvas-id="canvasProgress"></canvas>
 												<view class="progress_text">
-													<view class="u-progress-dot">{{isDoneListsLenght === 0 && pageData.questionNum === 0 ? 0 :((isDoneListsLenght / pageData.questionNum) * 100).toFixed(0) }}</view>
+													<view class="u-progress-dot">
+														{{
+															isDoneListsLenght === 0 && pageData.questionNum === 0
+																? 0
+																: ((isDoneListsLenght / pageData.questionNum) * 100).toFixed(0)
+														}}
+													</view>
 													<text class="u-progress-info">%</text>
 												</view>
 											</view>
@@ -257,6 +263,7 @@ export default {
 		this.$api.bankInfo(option.id).then(res => {
 			options = res.data.data;
 			this.pageData = options;
+			console.log(options);
 			if (res.data.data.typeId === 1) {
 				this.getBankDList(options);
 			} else {
@@ -284,9 +291,10 @@ export default {
 				bankId: self.id
 			};
 			self.$api.questionListrecordDoneList(data).then(res => {
+				console.log(res,99999)
 				self.isDoneListsLenght = res.data.rows.length;
 				if (res.data.rows.length === 0 && self.pageData.questionNum === 0) {
-					self.drawCircle(0)
+					self.drawCircle(0);
 				} else {
 					self.drawCircle(((res.data.rows.length / self.pageData.questionNum) * 2).toFixed(1)); // 0-2
 				}

pages2/bank/question.vue

@@ -185,7 +185,8 @@ export default {
 			collecStatus: false,
 			isWrites: [], //已做的题目id
 			sc: false, //收藏集进来的?
-			ct: false //错题进来的？
+			ct: false, //错题进来的？
+			simulateId: 0,
 		};
 	},
 	onLoad(option) {
@@ -360,6 +361,7 @@ export default {
 				}
 				var objList = {
 					bankId: self.bankId,
+					isRight: -1,
 					questionId: self.nowPageData.questionId,
 					replyStr: self.replyL,
 					selectIds: self.selects
@@ -448,48 +450,50 @@ export default {
 				});
 				return;
 			}
-
-			if (option.bankSectionId) {
-				var data = {
-					bankSectionId: option.bankSectionId
-				};
-			}
-			if (option.examId) {
-				var data = {
-					examId: option.examId
-				};
-			}
-			if (option.bankSectionId === undefined && option.examId === undefined) {
-				uni.showModal({
-					title: '提示',
-					content: '没有题目',
-					showCancel: false,
-					confirmText: '返回上级',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateBack({
-								delta: 1
-							});
-						}
-					}
-				});
-				return;
-			}
-			self.$api.questiondetailList(data).then(res => {
-				if (res.data.rows.length) {
-					res.data.rows.forEach((items, indexs) => {
-						items.jsonStr = JSON.parse(items.jsonStr);
-					});
-					if (res.data.rows[self.numIndex].type === 4) {
-						self.replyL = [];
-						for (var i = 0; i < res.data.rows[self.numIndex].jsonStr.length; i++) {
-							self.replyL.push({ selectId: [] });
+			if (this.typeId === '1') {
+				self.$api.questionsimulate(self.bankId).then(res => {
+					self.simulateId = res.data.data.simulateId
+					if (res.data.data.list.length) {
+						res.data.data.list.forEach((items, indexs) => {
+							items.jsonStr = JSON.parse(items.jsonStr);
+						});
+						if (res.data.data.list[self.numIndex].type === 4) {
+							self.replyL = [];
+							for (var i = 0; i < res.data.data.list[self.numIndex].jsonStr.length; i++) {
+								self.replyL.push({ selectId: [] });
+							}
 						}
+						self.nowPageData = res.data.data.list[self.numIndex];
+						self.favoritesStatus(res.data.data.list[self.numIndex].questionId);
+						self.list = res.data.data.list;
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: '没有题目',
+							showCancel: false,
+							confirmText: '返回上级',
+							success: function(res) {
+								if (res.confirm) {
+									uni.navigateBack({
+										delta: 1
+									});
+								}
+							}
+						});
 					}
-					self.nowPageData = res.data.rows[self.numIndex];
-					self.favoritesStatus(res.data.rows[self.numIndex].questionId);
-					self.list = res.data.rows;
-				} else {
+				})
+			} else {
+				if (option.bankSectionId) {
+					var data = {
+						bankSectionId: option.bankSectionId
+					};
+				}
+				if (option.examId) {
+					var data = {
+						examId: option.examId
+					};
+				}
+				if (option.bankSectionId === undefined && option.examId === undefined) {
 					uni.showModal({
 						title: '提示',
 						content: '没有题目',
@@ -503,8 +507,40 @@ export default {
 							}
 						}
 					});
+					return;
 				}
-			});
+				console.log(option);
+				self.$api.questiondetailList(data).then(res => {
+					if (res.data.rows.length) {
+						res.data.rows.forEach((items, indexs) => {
+							items.jsonStr = JSON.parse(items.jsonStr);
+						});
+						if (res.data.rows[self.numIndex].type === 4) {
+							self.replyL = [];
+							for (var i = 0; i < res.data.rows[self.numIndex].jsonStr.length; i++) {
+								self.replyL.push({ selectId: [] });
+							}
+						}
+						self.nowPageData = res.data.rows[self.numIndex];
+						self.favoritesStatus(res.data.rows[self.numIndex].questionId);
+						self.list = res.data.rows;
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: '没有题目',
+							showCancel: false,
+							confirmText: '返回上级',
+							success: function(res) {
+								if (res.confirm) {
+									uni.navigateBack({
+										delta: 1
+									});
+								}
+							}
+						});
+					}
+				});
+			}
 		},
 		activeList(data, int) {
 			var self = this;
@@ -659,7 +695,7 @@ export default {
 							data.examId = self.examId;
 						}
 						if (self.simulateId !== null) {
-							data.simulateId = self.bankSectionId;
+							data.simulateId = self.simulateId;
 						}
 						if (self.sc === 'true') {
 							var num = 0;
@@ -671,7 +707,9 @@ export default {
 							uni.redirectTo({
 								url: `/pages2/bank/endBG?bankId=${self.bankId}&type=${
 									self.typeId
-								}&allIndex=${num}&correct=${correct}&error=${errorz}&errorArrayList=${errorArrays.toString()}&bankSectionId=${self.bankSectionId}&examId=${self.examId}`
+								}&allIndex=${num}&correct=${correct}&error=${errorz}&errorArrayList=${errorArrays.toString()}&bankSectionId=${self.bankSectionId}&examId=${
+									self.examId
+								}`
 							});
 						} else {
 							self.$api.questiondetailrecord(data).then(res => {
@@ -685,7 +723,9 @@ export default {
 									uni.redirectTo({
 										url: `/pages2/bank/endBG?bankId=${self.bankId}&type=${
 											self.typeId
-										}&allIndex=${num}&correct=${correct}&error=${errorz}&errorArrayList=${errorArrays.toString()}&bankSectionId=${self.bankSectionId}&examId=${self.examId}`
+										}&allIndex=${num}&correct=${correct}&error=${errorz}&errorArrayList=${errorArrays.toString()}&bankSectionId=${self.bankSectionId}&examId=${
+											self.examId
+										}`
 									});
 								} else {
 									uni.showToast({