暂存

pages.json

@@ -378,7 +378,7 @@
 			"path": "pages/course/chapterDetailAndorid",
 			"style": {
 				"navigationBarTitleText": "章节详情",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false
 			}
 		},
 		{

pages/course/courseDetail.vue

@@ -462,47 +462,7 @@
 				fatherIndex: null,
 				supportFlag: false,
 				selectGoodsData: {},
-<<<<<<< .mine
+				buyOptions: [],				
-				buyOptions: [],
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-				
-				buyOptions: [
-					// {
-					// 		icon: 'chat',
-					// 		text: '客服'
-					// 	},
-					// {
-					//     icon: 'shop',
-					//     text: '店铺',
-					//     // info: 2,
-					//     infoBackgroundColor: '#007aff',
-					//     infoColor: "#f5f5f5"
-					// },
-					//  {
-					// 	icon: 'cart',
-					// 	text: '购物车',
-					// 	info: 2
-					// }
-				],
->>>>>>> .theirs
 				customButtonGroup1: [{
 					with: 200,
 					text: "立即购买",
@@ -769,13 +729,8 @@
 							if (res.code == 0) {
 								this.getCourseDescriptionData();
 								// this.$commonJS.showToast("");
-<<<<<<< .mine
 							}					
 
-=======
-							}
-
->>>>>>> .theirs
 							this.$forceUpdate();
 						});
 				} else {

pages/miniClass/taskDetail.vue

@@ -141,6 +141,7 @@
 </template>
 
 <script>
+	import permission from "@/js_sdk/wa-permission/permission.js"
 	import $http from '@/config/requestConfig.js';
 	import {
 		mapState