Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

components/question/panduan.vue

@@ -7,11 +7,11 @@
 		<!-- 选项区域 -->
 		<radio-group @change="radioChange" class="danxuan-option-box">
 			<label class="option-question" :class="formatClass('1')">
-				<radio value="1" :checked="question.reply == '1'"/>
+				<radio value="1" :disabled="showError" :checked="question.reply == '1'"/>
 				<view>正确</view>
 			</label>
 			<label class="option-question" :class="formatClass('0')"> 
-				<radio value="0" :checked="question.reply == '0'"/>
+				<radio value="0" :disabled="showError" :checked="question.reply == '0'"/>
 				<view>错误</view>
 			</label>
 		</radio-group>

components/question/tiankong.vue

@@ -92,6 +92,12 @@
 
 <script module="TK" lang="renderjs">
 	export default {
+		props: {
+			showError: {
+				type: Boolean,
+				default: false
+			}
+		},
 		data() {
 			return {
 				myQ: null
@@ -117,6 +123,11 @@
 				if (!question) {
 					return;
 				}
+				
+				if (this.showError) {
+					return;
+				}
+				
 				question.result.forEach((item, index) => {
 					const dom = document.getElementById(`t_${question.stId}_${index}`)
 					dom && dom.addEventListener('focus', (e) => this.updateFn(e))

components/questionJiexi/questionJiexi.vue

@@ -105,7 +105,7 @@
 		mounted() {
 			console.log("renderScript1")
 			// 在适合的生命周期，通过script和link标签引入播放器sdk、css
-			this.loadWebPlayerSDK()
+			
 		},
 		data() {
 			return {
@@ -121,7 +121,7 @@
 			receiveMsg(newValue, oldValue, ownerInstance, instance) {
 				if (newValue) {
 					this.playAuth = newValue
-					this.playAli()
+					this.loadWebPlayerSDK()
 				}
 			},
 			videoIdFun(newValue, oldValue, ownerInstance, instance) {
@@ -222,7 +222,7 @@
 					s_tag.src = 'https://g.alicdn.com/de/prismplayer/2.9.6/aliplayer-min.js';
 					s_tag.charset = 'utf-8';
 					s_tag.onload = () => {
-						//	this.checkValue();
+						this.playAli()
 						resolve();
 					}
 					document.body.appendChild(s_tag);

pages/study/lookShipin.vue

@@ -119,6 +119,8 @@
 				this.cacheZhangInfo = cacheManager.get('zhangInfo')
 
 				let currentObject = this.cacheZhangInfo.jieList.find(item => item.jieId == options.jieId);
+				
+				console.log(currentObject);
 				this.shipinTitle = this.cacheZhangInfo.numberStr + ' ' + this.cacheZhangInfo.zhangName
 
 				this.pageData = {
@@ -244,7 +246,7 @@
 		mounted() {
 			console.log("renderScript1")
 			// 在适合的生命周期，通过script和link标签引入播放器sdk、css
-			this.loadWebPlayerSDK()
+		//	this.loadWebPlayerSDK()
 		},
 		data() {
 			return {
@@ -269,7 +271,8 @@
 				if (newValue) {
 					this.playAuth = ''
 					this.playAuth = newValue
-					this.playAli()
+					this.loadWebPlayerSDK()
+				
 				}
 			},
 			videoIdFun(newValue, oldValue, ownerInstance, instance) {
@@ -329,6 +332,9 @@
 				// console.log(this.videoId);
 				// console.log(this.playAuth);
 				//配置播放器
+				if(!this.playAuth){
+					return false;
+				}
 				var player = new Aliplayer({
 					id: "wgy-player-test",
 					"vid": this.videoId,
@@ -408,7 +414,8 @@
 					s_tag.src = 'https://g.alicdn.com/de/prismplayer/2.9.6/aliplayer-min.js';
 					s_tag.charset = 'utf-8';
 					s_tag.onload = () => {
-						//	this.playAli()
+					//	console.log(this.playAuth);
+						this.playAli()
 						resolve();
 					}
 					document.body.appendChild(s_tag);