冲突修改

pages2/wd/class.vue

@@ -43,7 +43,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 export default {
 	data() {
 		return {
@@ -63,20 +62,6 @@ export default {
 					self.goodsList = res.data.rows;
 				}
 			});
-=======
-	export default {
-		data() {
-			return {
-				goodsList:[]
-				
-			}
-		},
-		onLoad(option) {
-			 this.courseGoodsList()
-		},
-		onShow(){
-			
->>>>>>> 4a93964cbb34c8e446d0e60cb99d616e47507617
 		},
 		studyIn() {
 			this.$navTo.togo('/pages2/verify/input');