合并主分支的视频播放

pages/course/courseDetail.vue

@@ -51,7 +51,7 @@
                       align-items: center;
                     " @click="isHideCourseInfo = !isHideCourseInfo">
 									<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`"
-										style="width: calc(100% - 50rpx)" v-html="course.content">
+										style="width: calc(100% - 50rpx); font-size: 30rpx;" v-html="course.content">
 									</view>
 									<text
                     style="
@@ -462,7 +462,47 @@
 				fatherIndex: null,
 				supportFlag: false,
 				selectGoodsData: {},
+<<<<<<< .mine
 				buyOptions: [],
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+				
+				buyOptions: [
+					// {
+					// 		icon: 'chat',
+					// 		text: '客服'
+					// 	},
+					// {
+					//     icon: 'shop',
+					//     text: '店铺',
+					//     // info: 2,
+					//     infoBackgroundColor: '#007aff',
+					//     infoColor: "#f5f5f5"
+					// },
+					//  {
+					// 	icon: 'cart',
+					// 	text: '购物车',
+					// 	info: 2
+					// }
+				],
+>>>>>>> .theirs
 				customButtonGroup1: [{
 					with: 200,
 					text: "立即购买",
@@ -687,12 +727,8 @@
 				this.$forceUpdate();
 			},
 			onHandleClickBuy(e) {
-				console.log("this.selectGoodsData at line 589:", this.selectGoodsData);
-
-				// if (e.index == 0) {
-				//   this.handleClickClose();
-				// }
-				// if (e.index == 0) {
+				console.log("this.selectGoodsData at line 589:", this.selectGoodsData);				
+				
 				var mynavData = JSON.stringify({
 					goods: [this.selectGoodsData],
 					typeId: 0,
@@ -712,7 +748,7 @@
 			//获取相关关联课程商品
 			handleClickGetGoodsList(v) {
 				// console.log("data at line 313:", data);
-
+				
 				if (v.type == 0) {
 					//免费
 
@@ -729,12 +765,17 @@
 							},
 						})
 						.then(async (res) => {
-							console.log("res at line 493:", res);
+							console.log("res at line 493:", res);							
 							if (res.code == 0) {
 								this.getCourseDescriptionData();
 								// this.$commonJS.showToast("");
+<<<<<<< .mine
 							}					
 
+=======
+							}
+
+>>>>>>> .theirs
 							this.$forceUpdate();
 						});
 				} else {
@@ -750,7 +791,7 @@
 								"Content-Type": "application/json",
 							},
 						})
-						.then(async (res) => {
+						.then(async (res) => {							
 							if (res.productList.length > 0) {
 								this.goodsList = res.productList;
 								this.selectGoodsData = this.goodsList[0];
@@ -761,7 +802,7 @@
 							}
 
 							this.$forceUpdate();
-						});
+						})
 				}
 			},
 			getUserInfo() {
@@ -1946,6 +1987,7 @@
 		}
 
 		.price {
+			
 			// text-align: center;
 			font-size: 26rpx;
 			font-weight: bold;
@@ -2235,7 +2277,7 @@
 	/deep/.u-icon__icon--warning {
 		color: #fff !important;
 	}
-
+	/deep/.uni-tag{border-width: 2rpx !important;}
 	/deep/.uni-section {
 		background: transparent !important;
 	}