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

pages/xinshuxue/components/danyuanInfo.vue

@@ -1,49 +1,52 @@
 <template>
-	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" 
-		mask-background-color="rgba(255, 255, 255, 0.1);" type="bottom">
-		<view class="xuexi-dagang-page">
-			<view class="dagang-title">
-				<text>{{danyuanInfo.danyuanIntro}}</text>
-				<icon @click="goUpPage"></icon>
-			</view>
-			<view class="xuexi-dagang-body">
-				<view class="ezy-video-box course-video-box">
-					<view ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
-						:change:playAuth="renderScript.receiveMsg" :videoId="videoId"
-						:change:videoId="renderScript.videoIdFun" :hideFlag="hideFlag"
-						:change:hideFlag="renderScript.hideFlagFun" :progressMarkers="progressMarkers"
-						:change:progressMarkers="renderScript.progressMarkersMsg" :seekTime="seekTime"
-						:change:seekTime="renderScript.seekTimeFun" class="ezy-video">
-					</view>
+	<view>
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+			mask-background-color="rgba(255, 255, 255, 0.1);" type="bottom">
+			<view class="xuexi-dagang-page">
+				<view class="dagang-title">
+					<text>{{danyuanInfo.danyuanIntro}}</text>
+					<icon @click="goUpPage"></icon>
 				</view>
+				<view class="xuexi-dagang-body">
+					<view class="ezy-video-box course-video-box">
+						<view ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
+							:change:playAuth="renderScript.receiveMsg" :videoId="videoId"
+							:change:videoId="renderScript.videoIdFun" :hideFlag="hideFlag"
+							:change:hideFlag="renderScript.hideFlagFun" :progressMarkers="progressMarkers"
+							:change:progressMarkers="renderScript.progressMarkersMsg" :seekTime="seekTime"
+							:change:seekTime="renderScript.seekTimeFun" class="ezy-video">
+						</view>
+					</view>
 
-				<!-- 您将学会 -->
-				<view class="dagang-xh-box">
-					<view class="xh-title">您将学会</view>
-					<view class="xh-content-box">
-						<view class="text-row" v-for="(item,index) in danyuanInfo.xuehui" :key="index">
-							<icon></icon>
-							<view class="text-content">{{item}}</view>
+					<!-- 您将学会 -->
+					<view class="dagang-xh-box">
+						<view class="xh-title">您将学会</view>
+						<view class="xh-content-box">
+							<view class="text-row" v-for="(item,index) in danyuanInfo.xuehui" :key="index">
+								<icon></icon>
+								<view class="text-content">{{item}}</view>
+							</view>
 						</view>
 					</view>
-				</view>
-				<!-- 学习大纲 -->
-				<view class="dagang-content-box">
-					<view class="dagang-content-title">学习大纲</view>
-					<view class="dagang-item-list">
-						<view class="dagang-content-item" v-for="(item,index) in danyuanInfo.dagangList" :key="index">
-							<!-- 封面 -->
-							<img :src="item.cover" />
-							<view>
-								<view class="course-title">{{item.jieName}}</view>
-								<view class="course-title">{{item.jieIntro}}</view>
+					<!-- 学习大纲 -->
+					<view class="dagang-content-box">
+						<view class="dagang-content-title">学习大纲</view>
+						<view class="dagang-item-list">
+							<view class="dagang-content-item" v-for="(item,index) in danyuanInfo.dagangList"
+								:key="index">
+								<!-- 封面 -->
+								<img :src="item.cover" />
+								<view>
+									<view class="course-title">{{item.jieName}}</view>
+									<view class="course-title">{{item.jieIntro}}</view>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-	</uni-popup>
+		</uni-popup>
+	</view>
 </template>
 
 <script>

pages/xinshuxue/components/danyuanMulu.vue

@@ -1,22 +1,24 @@
 <template>
-	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-		mask-background-color="rgba(255, 255, 255, 0.1);" type="bottom">
-		<view class="xuexi-dyml-page">
-			<!-- 头部 -->
-			<view class="dyml-title">
-				<text>单元目录</text>
-				<icon @click="goUpPage"></icon>
-			</view>
-			<!-- 目录 -->
-			<view class="xuexi-dyml-body">
-				<view class="dyml-item-box" v-for="item in list" @click="handleSelect" :key="item.danyuanId">
-					<text class="dy-num">{{item.danyuanName}}</text>
-					<text class="dy-title">{{item.intro}}</text>
-					<icon></icon>
+	<view>
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+			mask-background-color="rgba(255, 255, 255, 0.1);" type="bottom">
+			<view class="xuexi-dyml-page">
+				<!-- 头部 -->
+				<view class="dyml-title">
+					<text>单元目录</text>
+					<icon @click="goUpPage"></icon>
+				</view>
+				<!-- 目录 -->
+				<view class="xuexi-dyml-body">
+					<view class="dyml-item-box" v-for="item in list" @click="handleSelect" :key="item.danyuanId">
+						<text class="dy-num">{{item.danyuanName}}</text>
+						<text class="dy-title">{{item.intro}}</text>
+						<icon></icon>
+					</view>
 				</view>
 			</view>
-		</view>
-	</uni-popup>
+		</uni-popup>
+	</view>
 </template>
 
 <script setup>
@@ -28,29 +30,31 @@
 	const popupRef = ref(null)
 	const emits = defineEmits(['close', 'select'])
 	import * as httpApi from "@/api/chanpinShuxue.js";
-	
+
 	function goUpPage() {
 		popupRef.value.close();
 		emits('close')
 	}
-	
+
 	function showPopup(banbenId) {
 		list.value = [];
-		httpApi.getShuxueChanpinDanyuanMulu({banbenId}).then(res => {
+		httpApi.getShuxueChanpinDanyuanMulu({
+			banbenId
+		}).then(res => {
 			list.value = res.data;
 			popupRef.value.open();
 		})
 	}
-	
+
 	function closePopup() {
 		popupRef.value.close();
 	}
-	
+
 	function handleSelect(item) {
 		emits('select', item)
 		closePopup();
 	}
-	
+
 	defineExpose({
 		showPopup
 	})

pages/xinshuxue/components/tishiDl.vue

@@ -1,14 +1,15 @@
 <template>
 	<!-- 弹窗 -->
-	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-		mask-background-color="rgba(0,0,0, 0.76);">
-		<view  class="ezy-tip-dialog tip-e-dialog ">
-			<view class="close-btn" @click="handleClose"></view>
-			<view class="e-img kx-e-img"></view>
-			<view class="text-score">完成了本节基础课程的学习</view>
-			<view class="time-tip-box" v-if="times">({{count}}S)</view>
-		</view>
-	</uni-popup>
+	<view>
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" mask-background-color="rgba(0,0,0, 0.76);">
+			<view class="ezy-tip-dialog tip-e-dialog ">
+				<view class="close-btn" @click="handleClose"></view>
+				<view class="e-img kx-e-img"></view>
+				<view class="text-score">完成了本节基础课程的学习</view>
+				<view class="time-tip-box" v-if="times">({{count}}S)</view>
+			</view>
+		</uni-popup>
+	</view>
 </template>
 
 <script setup>
@@ -23,15 +24,15 @@
 
 
 	function initTime() {
-			times.value = setTimeout(() => {
-				if (count.value == 0) {
-					handleClose();
-					return;
-				}
-				count.value--;
-				initTime()
-			}, 1000)
-		}
+		times.value = setTimeout(() => {
+			if (count.value == 0) {
+				handleClose();
+				return;
+			}
+			count.value--;
+			initTime()
+		}, 1000)
+	}
 
 	function clearTime() {
 		clearTimeout(times.value);

pages/xinshuxue/components/unitAnswer.vue

@@ -1,83 +1,87 @@
 <template>
-	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-		mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
-		<view class="ezy-result-page">
-			<view class="icon-title-navBar-box">
-				<view @click="handleBack" class="nav-bar-icon"></view>
-				<view class="nav-bar-title">答案</view>
-			</view>
-			<view class="exam-body">
-				<view class="xx-jd-box">
-					<view class="xx-row">
-						<view>当前学习进度</view>
-						<view class="text-row">
-							<text class="dq-jd-text">{{current+1}}</text>
-							<text class="dq-jd-line">/</text>{{myList.length}}</view>
-					</view>
-					<progress :percent="(current+1)/myList.length * 100" class="exam-progress-box"
-					stroke-width="10" backgroundColor="#3c7dfd" activeColor="#ffd11c"/>
+	<view>
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+			mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
+			<view class="ezy-result-page">
+				<view class="icon-title-navBar-box">
+					<view @click="handleBack" class="nav-bar-icon"></view>
+					<view class="nav-bar-title">答案</view>
 				</view>
-				<view class="shiti-frame-box">
-				<w-swiper :list="myList" :positionIndex="current" class="result-exam-swiper" @change="onSwiperChange">
-					<template v-slot:default="{item,index}">
-						<view class="body" v-if="item.mta_show">
-							<danxuan :question="item" showError v-if="item.type == '1'"></danxuan>
-							<panduan :question="item" showError v-if="item.type == '2'"></panduan>
-							<tiankong :question="item" showError v-if="item.type == '3'"
-								:placeholders="item.placeholders"></tiankong>
-							<view class="answer-content-box">
-								<view class="answer-title">答案</view>
-								<view class="answer-content-border answer-btn-box" v-if="item.type!=3">
-									<!-- 你的答案 -->
-									<view class="answer-item-left">
-										<text class="answer-item-title">您的答案</text>
-										<text class="answer-item-error">{{showAnswerReply(item)}}</text>
-										<view class="answer-line"></view>
-									</view>
-									<!-- 答案 -->
-									<view class="answer-item-right">
-										<text class="answer-item-title">正确答案</text>
-										<text class="answer-item-correct">{{showAnswerResult(item)}}</text>
-									</view>
-								</view>
-								<!-- 填空题答案 -->
-								<view class="answer-content-border tiankong-answer-content-box" v-else>
-									<view class="tiankong-answer-title">正确答案</view>
-									<view v-for="(ict,cindex) in showAnswerResult(item)" :key="cindex"
-										class="tiankong-answer-row">
-										<text class="answer-index-box">{{cindex+1}}</text>
-										<text v-for="(xItem,xindex) in ict" :key="xindex">
-											<text> {{xItem}} </text>
-											<text v-if="xindex != ict.length-1">/</text>
-										</text>
-									</view>
-								</view>
-
-								<!-- 试题解析 -->
-								<view class="answer-stjx-box">
-									<view class="answer-text-title">试题解析：</view>
-									<rich-text :nodes="item.answer" class="answer-rich-text"></rich-text>
-
-									<!-- 试题视频 -->
-									<view class="answer-text-title">视频讲解：</view>
-									<view class="answer-video-box">
-										<img :src="item.cover"/>
+				<view class="exam-body">
+					<view class="xx-jd-box">
+						<view class="xx-row">
+							<view>当前学习进度</view>
+							<view class="text-row">
+								<text class="dq-jd-text">{{current+1}}</text>
+								<text class="dq-jd-line">/</text>{{myList.length}}
+							</view>
+						</view>
+						<progress :percent="(current+1)/myList.length * 100" class="exam-progress-box" stroke-width="10"
+							backgroundColor="#3c7dfd" activeColor="#ffd11c" />
+					</view>
+					<view class="shiti-frame-box">
+						<w-swiper :list="myList" :positionIndex="current" class="result-exam-swiper"
+							@change="onSwiperChange">
+							<template v-slot:default="{item,index}">
+								<view class="body" v-if="item.mta_show">
+									<danxuan :question="item" showError v-if="item.type == '1'"></danxuan>
+									<panduan :question="item" showError v-if="item.type == '2'"></panduan>
+									<tiankong :question="item" showError v-if="item.type == '3'"
+										:placeholders="item.placeholders"></tiankong>
+									<view class="answer-content-box">
+										<view class="answer-title">答案</view>
+										<view class="answer-content-border answer-btn-box" v-if="item.type!=3">
+											<!-- 你的答案 -->
+											<view class="answer-item-left">
+												<text class="answer-item-title">您的答案</text>
+												<text class="answer-item-error">{{showAnswerReply(item)}}</text>
+												<view class="answer-line"></view>
+											</view>
+											<!-- 答案 -->
+											<view class="answer-item-right">
+												<text class="answer-item-title">正确答案</text>
+												<text class="answer-item-correct">{{showAnswerResult(item)}}</text>
+											</view>
+										</view>
+										<!-- 填空题答案 -->
+										<view class="answer-content-border tiankong-answer-content-box" v-else>
+											<view class="tiankong-answer-title">正确答案</view>
+											<view v-for="(ict,cindex) in showAnswerResult(item)" :key="cindex"
+												class="tiankong-answer-row">
+												<text class="answer-index-box">{{cindex+1}}</text>
+												<text v-for="(xItem,xindex) in ict" :key="xindex">
+													<text> {{xItem}} </text>
+													<text v-if="xindex != ict.length-1">/</text>
+												</text>
+											</view>
+										</view>
+
+										<!-- 试题解析 -->
+										<view class="answer-stjx-box">
+											<view class="answer-text-title">试题解析：</view>
+											<rich-text :nodes="item.answer" class="answer-rich-text"></rich-text>
+
+											<!-- 试题视频 -->
+											<view class="answer-text-title">视频讲解：</view>
+											<view class="answer-video-box">
+												<img :src="item.cover" />
+											</view>
+										</view>
 									</view>
 								</view>
-							</view>
+							</template>
+						</w-swiper>
+						<!--  左右滑动提示  -->
+						<view class="swiper-tip-box">
+							左右滑动查看更多题目
 						</view>
-					</template>
-				</w-swiper>
-				<!--  左右滑动提示  -->
-					<view class="swiper-tip-box">
-						左右滑动查看更多题目
 					</view>
 				</view>
 			</view>
-		</view>
-		<!-- 解析浮层数据 -->
-		<questionJiexi ref="jiexiRef"></questionJiexi>
-	</uni-popup>
+			<!-- 解析浮层数据 -->
+			<questionJiexi ref="jiexiRef"></questionJiexi>
+		</uni-popup>
+	</view>
 </template>
 
 <script setup>

pages/xinshuxue/components/unitResult.vue

@@ -1,4 +1,5 @@
 <template>
+	<view>
 	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
 		mask-background-color="rgba(0,0,0, 0.76);" class="ezy-popup-width-all">
 		<view class="dycs-dialog">
@@ -30,6 +31,7 @@
 			</view>
 		</view>
 	</uni-popup>
+</view>
 </template>
 
 <script setup>