Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学

common/styles/global/pages.scss

@@ -340,10 +340,11 @@
 
 // 学习大纲
 .xuexi-dagang-page{
-	width: 100%;height: 95vh;border-radius: 16rpx 16rpx 0 0;
+	width: 100%;height: calc(95vh - var(--status-bar-height));border-radius: 16rpx 16rpx 0 0;z-index: 10;position: relative;
 	background-color: #fff;box-shadow: 0 0rpx 4rpx rgba(100, 159, 241, 0.2);
 	display: flex;flex-direction: column;
 	box-sizing: border-box;padding: 36rpx 0 120rpx;
+	position: fixed;bottom: 0;
 	.xuexi-dagang-body{overflow-y: auto;padding: 24rpx 0 0;}
 	.dagang-title{
 		width: 80%;line-height: 1.5;margin: 24rpx auto 0;

components/chengji/chengji.vue

@@ -1,5 +1,5 @@
 <template>
-		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="top"
 			mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
 			<view class="ezy-result-page" :style="{backgroundImage: 'url(' + courseBjFun() + ')'}">
 				<view class="icon-title-navBar-box">

components/dialog/duihuanmaDialog.vue

@@ -1,6 +1,6 @@
 <!-- 小弹窗 一行文字 -->
 <template>
-	<uni-popup ref="tipSmallPopup" :animation="false" :is-mask-click="false"
+	<uni-popup ref="tipSmallPopup" :animation="false" :is-mask-click="false" type="top"
 	 mask-background-color="rgba(255, 255, 255, 0.6);">
 	 <view class="ezy-tip-dialog tip-small-dialog duihuan-dialog">
 		<view class="tip-content-box">

components/goLogin/goLogin.vue

@@ -1,5 +1,5 @@
 <template>
-	<uni-popup ref="dlRef" :animation="false" :is-mask-click="false" mask-background-color="rgba(255, 255, 255, 0.6);">
+	<uni-popup ref="dlRef" :animation="false" :is-mask-click="false" type="top" mask-background-color="rgba(255, 255, 255, 0.6);">
 		<view class="ezy-login-page go-login-page">
 			<view @click="handleBack" class="ezy-nav-bar-icon yzm-nav-bar-icon"></view>
 			<icon class="login-img"></icon>
@@ -101,7 +101,7 @@
 	const sliderData = reactive({})
 
 	function showDl() {
-		dlRef.value.open('bottom');
+		dlRef.value.open();
 		loginData.buttonText = '获取验证码';
 		clearInterval(loginData.intervalId);
 		loginData.intervalId = null;

components/loginComp/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="top"
 		mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
 		<view>
 			<!-- 手机号输入框 -->

components/points/uni-points.vue

@@ -1,6 +1,6 @@
 <template>
 	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-	 mask-background-color="rgba(51, 137, 217, 0.65);">
+	 type="top" mask-background-color="rgba(51, 137, 217, 0.65);">
 		<view class="exam-score-dialog" :class="getDialogClass()">
 			<view class="score-content-box">
 				<view class="right-error-row">

components/questionJiexi/questionJiexi.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="top"
 			mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
 			<view class="ezy-dajx-page" :style="{backgroundImage: 'url(' + courseBjFun() + ')'}">
 				<view class="icon-title-navBar-box">
@@ -29,7 +29,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<uni-popup ref="popupRef2" :animation="false" :is-mask-click="false"
+		<uni-popup ref="popupRef2" :animation="false" :is-mask-click="false" type="top"
 			mask-background-color="rgba(51, 137, 217, 0.65);">
 			<view class="course-finish-dialog">
 				<view class="text-score">{{credit}}</view>

components/questionJiexi/questionJiexiYingyu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="top"
 			mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
 			<view class="ezy-dajx-page"  :style="{backgroundImage: 'url(' + courseBjFun() + ')'}">
 				<view class="icon-title-navBar-box">

pages/chanpinneirong/index.vue

@@ -108,7 +108,6 @@
 						return
 					}
 				}).catch(() => {
-					toast('请求版本内容详情接口数据异常')
 					return false
 				})
 			},

pages/login/agreeContentDialog.vue

@@ -1,6 +1,6 @@
 <template>
-	  <uni-popup ref="agreeContentPopup" :animation="false" :is-mask-click="false"
-	  mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
+	  <uni-popup ref="agreeContentPopup" :animation="false" :is-mask-click="false" type="top"
+	  mask-background-color="rgba(255, 255, 255, 0.6);">
 	  <view class="agree-content-dialog">
 		<view class="icon-title-navBar-box">
 			<view @click="handleClose" class="nav-bar-icon"></view>
@@ -497,7 +497,7 @@ function formatText(text) {
 }
 // 打开弹窗
 function handleShow() {
-	agreeContentPopup.value.open('bottom');
+	agreeContentPopup.value.open();
 }
 // 关闭弹窗
 function handleClose() {

pages/xinshuxue/components/questionJiexi.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popupRef" :animation="true" :is-mask-click="false"
+		<uni-popup ref="popupRef" :animation="true" :is-mask-click="false" type="top"
 			mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
 			<view class="ezy-dajx-page">
 				<view class="icon-title-navBar-box">
@@ -73,7 +73,7 @@
 		methods: {
 			playEnd(data) {
 				plus.screen.lockOrientation('portrait-primary');
-				this.$refs.popupRef2.open('bottom');
+				this.$refs.popupRef2.open();
 			},
 			goBack() {
 				plus.screen.unlockOrientation();
@@ -90,7 +90,7 @@
 				//this.videoId = 'b997f16cb9cb474cb93526cff77d8801'
 				//	this.progressMarkers = item.progressMarkers
 				this.getLive(); //获取播放凭证
-				this.$refs.popupRef.open('bottom')
+				this.$refs.popupRef.open()
 			},
 			handleBack(item) {
 				this.$refs.popupRef.close()

pages/xinshuxue/components/unitAnswer.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popupRef" :animation="true" :is-mask-click="false"
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="top"
 			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">
@@ -140,7 +140,7 @@
 
 	// 切换成绩
 	function showPopup() {
-		popupRef.value.open('bottom')
+		popupRef.value.open()
 	}
 
 	function closePopup() {

pages/xinshuxue/components/unitResult.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-	<uni-popup ref="popupRef" :animation="true" :is-mask-click="false"
+	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="top"
 		mask-background-color="rgba(0,0,0, 0.76);" class="ezy-popup-width-all">
 		<view class="dycs-dialog">
 			<!-- 返回区域 -->
@@ -60,7 +60,7 @@
 		data.right = options.right;
 		data.wrong = options.wrong;
 
-		popupRef.value.open('bottom');
+		popupRef.value.open();
 	}
 
 	function closePopup() {