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

common/styles/global/components.scss

@@ -415,12 +415,12 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 }
 
 /***** 模拟标题栏 *****/
-.ezy-title-bar {
+/* .ezy-title-bar {
 	height: calc(44px + env(safe-area-inset-top));
     position: fixed;top: var(--status-bar-height);left: var(--window-left);right: var(--window-right);
     background-color: rgb(248, 248, 248);color: rgb(0, 0, 0);box-sizing: border-box;
 	display: flex;align-items: center;justify-content: center;overflow: hidden;z-index: 998;
-  }
+  } */
 
 
 // 小的提示弹窗
@@ -562,6 +562,24 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 			background-image: url("@/static/images/common/tip-one-confirm-btn.png");
 		}
 	}
+	
+	@include mediaSmall() {
+		.tip-content-box{width: 406rpx;height: 237rpx;padding: 23rpx 31rpx;}
+		.tip-content{font-size: 22rpx;padding-bottom: 23rpx;min-height: 98rpx;}
+		.tip-btn-box{
+			margin: 23rpx 0 0;
+			.tip-btn{width: 256rpx;height: 57rpx;line-height: 57rpx;font-size: 20rpx;}
+		}
+	}
+
+	@include mediaBig() {
+		.tip-content-box{width: 1000rpx;height: 584rpx;padding: 58rpx 77rpx;}
+		.tip-content{font-size: 54rpx;padding-bottom: 58rpx;min-height: 240rpx;}
+		.tip-btn-box{
+			margin: 58rpx 0 0;
+			.tip-btn{width: 630rpx;height: 141rpx;line-height: 141rpx;font-size: 46rpx;}
+		}
+	}
 }
 
 // 大鹅提示弹窗
@@ -640,10 +658,10 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 }
 
 // tab页面
-.ezy-tab-border{
+/* .ezy-tab-border{
 	flex: 1;width: 92%;height: auto;background-color: rgba(255, 255, 255, 0.6);border-radius: 10px;
 	margin: 12rpx auto 32rpx;position: relative;box-sizing: border-box;display: flex;flex-direction: column;
-}
+} 
 .ezy-tab-box{
 		height: 82rpx!important;
 		background-color: rgba(255, 255, 255, 0.6);z-index: 3;margin: 20rpx 20rpx 0;
@@ -651,7 +669,7 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		.segmented-control__text{color: #333!important;}
 		.segmented-control__item--button,.segmented-control__item--button--last{height: 62rpx;border: 0;border-width: 0!important;border-radius: 8rpx;}
 		.segmented-control__item--button--active .segmented-control__text{color: #fff!important;}
-	}
+	}*/
 
 //视频
 .ezy-video-box{
@@ -690,13 +708,6 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		}
 }
 
-// 升级提醒弹窗
-.phone-tip-dialog{
-	width: 580rpx;border-radius: 12rpx;background-color: #fff;padding: 24rpx;
-	.tip-title{padding-top: 24rpx;font-size: 34rpx;color: #333;text-align: center;}
-	.tip-content{font-size: 32rpx;color: #666;margin:32rpx 32rpx 56rpx;line-height: 1.6;text-align: justify;}
-}
-
 // 暂无数据
 .ezy-no-sj{
 	display: flex;align-items: center;flex-direction: column;

components/dialog/tipDialog.vue

@@ -1,38 +0,0 @@
-<template>
-	<uni-popup ref="tipPopup" :animation="false" :is-mask-click="false"
-	 mask-background-color="rgba(0,0,0, 0.76);">
-	 <view class="phone-tip-dialog">
-			<view class="common-body-box">
-				<view class="tip-title">{{title}}</view>
-				<view class="tip-content" :class="dialogContentClass">{{content}}</view>
-			</view>
-	 </view>
-	</uni-popup>
-</template>
-
-<script setup>
-	import { ref } from 'vue';
-	const props = defineProps({
-		title: {
-		  type: String,
-		  default: ''
-		},
-	  content: {
-	    type: String,
-		require: true,
-	    default: ''
-	  },
-	});
-	const tipPopup = ref(null); // 索引
-	const $emit = defineEmits(['confirm-btn'])
-	// 打开弹窗
-	function handleShow() {
-		tipPopup.value.open();
-	}
-	defineExpose({
-			handleShow
-		})
-</script>
-
-<style>
-</style>

pages/login/index.vue

@@ -77,7 +77,6 @@
 	} from "@/utils/common";
 	import telDialog from './telDialog.vue'
 	import cacheManager from "@/utils/cacheManager.js";
-	import tipDialog from '@/components/dialog/tipDialog.vue';
 	import config from '../../config.js'
 	import {
 		error