Merge branch 'xqy_h5' of http://120.79.166.78:19005/zhongzheng-edu/saas_miniprogram into xqy_h5

common/httpList/course.js

@@ -31,6 +31,7 @@ export default {
 		})
 	},
 	reChapterList(data) {
+		
 		return myRequest({
 			url: '/course/chapterList',
 			method: 'get',
@@ -63,10 +64,10 @@ export default {
 		})
 	},
 	chapterList(data) {
+		
 		return myRequest({
 			url: '/app/common/course/chapterList/'+data,
 			method: 'get',
-			data: data,
 			noToken: true
 		})
 	},
@@ -74,7 +75,6 @@ export default {
 		return myRequest({
 			url: '/app/common/course/sectionList/'+data,
 			method: 'get',
-			data: data,
 			noToken: true
 		})
 	},

common/httpList/exam.js

@@ -7,7 +7,6 @@ export default {
 		return myRequest({
 			url: '/bank/exam/'+data,
 			method: 'get',
-			data: data
 		})
 	}
 }

common/httpList/goods.js

@@ -155,7 +155,6 @@ export default {
 	goodsBankQuestionNum(data) {
 		return myRequest({
 			url: '/goods/bank/questionNum/'+data,
-			data:data,
 			method: 'get',
 		})
 	},
@@ -442,8 +441,7 @@ export default {
 	deleteCart(data) {
 		return myRequest({
 			url: '/base/cart/delete/'+data,
-			method: 'post',
-			data: data
+			method: 'post'
 		})
 	},
 	

components/course/courseChapter.vue

@@ -524,6 +524,7 @@ export default {
       if (!this.down && this.list.length == 0) {
         // console.log(item.id, 69);
         //获取章下面所有节试卷列表-course/sectionExamList
+        
         await this.$api.reSectionExamList({
           chapterId: item.chapterId || item.menuId,
           courseId: item.courseId,
@@ -544,7 +545,7 @@ export default {
             //				this.getMenuExamList(item.id,item.courseId,moduleId)
           }
         } else {
-          this.getSectionList(chapterId);
+          this.getSectionList(item.chapterId);
         }
       }
     },

pages2/bank/detail.vue

@@ -475,6 +475,9 @@ export default {
 			})
 		},
 		getIsBuy() {
+			if (this.$method.isGoLogin()) {
+				return;
+			}
 			this.$http({
 				url: '/order/buyGoodsNotExpired',
 				method: 'get',

pages2/register/register.vue

@@ -504,7 +504,9 @@ export default {
 	},
 	onLoad(option) {
 		let that = this;
-		this.$refs.uForm.setRules(this.rules)
+		this.$nextTick(() => {
+			this.$refs.uForm.setRules(this.rules)
+		});
 		// option.scanCode && (this.scanCode = option.scanCode)
 		uni.login({
 			provider: 'weixin',

pages3/course/detail.vue

@@ -705,6 +705,9 @@ export default {
 			})
 		},
 		getIsBuy() {
+			if (this.$method.isGoLogin()) {
+				return;
+			}
 			this.$http({
 				url: '/order/buyGoodsNotExpired',
 				method: 'get',