init

pages2/course/detail.vue

@@ -227,8 +227,8 @@ export default {
 			boxList: [], //章节弹窗列表
 			payStatus: true, //是否购买该课程
 			commendList: [], //推荐课程列表
-			collecStatus: false ,//收藏状态
-			initH4:0,
+			collecStatus: false, //收藏状态
+			initH4: 0
 		};
 	},
 	onLoad(option) {
@@ -271,20 +271,18 @@ export default {
 		}
 	},
 	methods: {
-<<<<<<< HEAD
 		getHeight() {
 			let that = this;
-=======
-		swipStatus(){
-			this.activeStatus = !this.activeStatus
-			let self = this
-			self.$nextTick(function(){
-				self.getHeight()
-			})
 		},
-		getHeight(){
-			let that = this
->>>>>>> c898b804880395c574ce3bf89d1ccb16f1214c95
+		swipStatus() {
+			this.activeStatus = !this.activeStatus;
+			let self = this;
+			self.$nextTick(function() {
+				self.getHeight();
+			});
+		},
+		getHeight() {
+			let that = this;
 			const query = uni.createSelectorQuery().in(this);
 			query
 				.select('#modules1')
@@ -311,15 +309,12 @@ export default {
 			query
 				.select('#modules4')
 				.boundingClientRect(data => {
-<<<<<<< HEAD
 					that.h4 = data.height;
 					console.log(data.height, 4444);
-=======
-				//	that.h4 = data.height;
-					if(that.h4==0){
-						that.h4 = data.height
+					//	that.h4 = data.height;
+					if (that.h4 == 0) {
+						that.h4 = data.height;
 					}
->>>>>>> c898b804880395c574ce3bf89d1ccb16f1214c95
 					that.countHeight(that);
 				})
 				.exec();
@@ -378,10 +373,9 @@ export default {
 			};
 			this.$api.courseInforecommendList(data).then(res => {
 				self.commendList = res.data.data;
-				self.$nextTick(function(){
-					self.getHeight()
-				})
-				
+				self.$nextTick(function() {
+					self.getHeight();
+				});
 			});
 		},
 		activeList(item, index) {