XSLu08042 hace 3 semanas
padre
commit
050abea80e

+ 3 - 1
pages_course/components/ques.vue

@@ -5,7 +5,9 @@
 			<view class="ques-content-tit" v-if="showTreatment==0" :style="{ color: currentId==2? '#FF5C03':'#222',fontSize: fontSize(36)}" @click="choose(2)">活动</view>
 			<view class="ques-content-tit" v-if="showNote==1&&courseNote" :style="{ color: currentId==1 ? '#FF5C03':'#222',fontSize: fontSize(36)}" @click="choose(1)">笔记</view>
 		</view>
-		<view v-if="currentId==1&&showNote==1&&courseNote" class="note" :style="{ fontSize: fontSize(32)}">{{courseNote}}</view>
+		<view v-if="currentId==1&&showNote==1&&courseNote" class="note" :style="{ fontSize: fontSize(32)}"><text>{{courseNote}}</text></view>
+		<view><text>单选单选单选单选单
+		选单选单选</text></view>
 		<template v-if="currentId==2&&showTreatment==0">
 			<goodsList ref="goodsList" :treatmentPackage="treatmentPackage" :urlOption="urlOption"></goodsList>
 		</template>

+ 3 - 4
pages_course/components/yk-screenRecord/yk-screenRecord.vue

@@ -16,10 +16,6 @@
 			this.AllowScreenshots()
 		},
 		beforeDestroy() {
-			uni.showToast({
-				title: '2223',
-				icon: 'error'
-			})
 			this.AllowScreenshots()
 		},
 		methods: {
@@ -97,6 +93,7 @@
 			},
 			//安卓端允许截屏  
 			AllowScreenshots() {
+				let _this = this;
 				uni.getSystemInfo({
 					success: function(e) {
 						// #ifdef MP-WEIXIN
@@ -141,11 +138,13 @@
 						// #endif
 					}
 				})
+				// #ifdef APP-PLUS
 				let osname = plus.os.name;
 				if (osname == "Android") {
 					var activity = plus.android.runtimeMainActivity();
 					plus.android.invoke(plus.android.invoke(activity, "getWindow"), "clearFlags", 0x00002000);
 				}
+				// #endif
 			}
 		}
 	}

+ 2 - 2
pages_course/videoDetail.vue

@@ -127,7 +127,7 @@
 					<descInfo ref="descInfo" :isLogin="isLogin" :isAddKf="isAddKf" :courseInfo="courseInfo"></descInfo>
 				</template>
 				<!-- 问题 -->
-				<template v-if="isLogin&&isAddKf==1">
+				<template v-if="isLogin&&isAddKf==1&&linkType!=1">
 					<ques ref="ques" :urlOption="urlOption" :courseNote="courseNote" :showNote="showNote" :treatmentPackage="treatmentPackage" :showTreatment="showTreatment" :quesList="quesList" :openCommentStatus="openCommentStatus" @handleAnswer="handleAnswer" @showBtnType="showBtnType"></ques>
 				</template>
 			</view>
@@ -237,7 +237,7 @@
 			<view class="footer-btn" v-if="!isLogin || isAddKf !=1" @click="submit">
 				<text>立即学习</text>
 			</view>
-			<view v-if="isLogin&&isAddKf==1&&currentTab==1&&quesList&&quesList.length>0&&showBtn==0" class="footer-btn footer-btn-border" @click="submit">
+			<view v-if="isLogin&&isAddKf==1&&linkType!=1&&currentTab==1&&quesList&&quesList.length>0&&showBtn==0" class="footer-btn footer-btn-border" @click="submit">
 				<!-- <image class="footer-btn-img" :src="baseUrl+'/images/red_envelope_btnimg.png'" mode="aspectFill"></image> -->
 				<text>提交答案领取奖励</text>
 			</view>