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

App.vue

@@ -92,11 +92,11 @@
 	/* 公共样式 */
 	@import '/common/styles/index.scss';
 
-	// 西文、雅黑、黑体、宋体
+	// 小米字体、思源黑体、苹果平方、数字字体、通用无衬线字体
 	body,
 	html,
 	#app {
-		font-family: "Helvetica Neue", "Microsoft YaHei", "SimHei", "SimSun", "Arial", sans-serif;
+		font-family: "MiSans", "PingFang SC", sans-serif;
 		margin: 0;
 		padding: 0;
 		box-sizing: border-box;

common/styles/global/components.scss

@@ -50,16 +50,16 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 
 // active
 // 按钮缩小动画
-.ezy-btn-active{transition: 0.3s;}
+// .ezy-btn-active{transition: 0.3s;}
 .ezy-btn-active:active{transform:scale(0.92);}
 
 // 列表item 元素向下
-.ezy-list-item-active{transition: 0.3s;}
-.ezy-list-item-active:active {transform: translateY(12rpx);opacity: 0.8;}
+// .ezy-list-item-active{transition: 0.3s;}
+.ezy-list-item-active:active {transform: translateY(6rpx);opacity: 0.8;}
 
 // tab页 点击放大
-.ezy-tab-item-active{transition: 0.3s;}
-.ezy-tab-item-active:active {transform: scale(1.08);}
+// .ezy-tab-item-active{transition: 0.3s;}
+.ezy-tab-item-active:active {transform: scale(1.05);}
 
 /***** 富文本处理  *****/
 @mixin ezy-rich-text() {

common/styles/global/pages.scss

@@ -2097,7 +2097,7 @@
 		.xx-item-title{text-align: center;margin: 32rpx 0;font-size: 32rpx;color: #444;}
 		.item-dy-box{
 			display: flex;align-items: center;justify-content: center;
-			color: #fff;transition: 0.3s;margin-bottom: 24rpx;
+			color: #fff;margin-bottom: 24rpx;
 			.dy-left-box{
 				width: 174rpx;height: 127rpx;@include ezy-no-repeat-cover;font-size: 64rpx;
 				display: flex;align-items: center;box-sizing: border-box;padding:0 24rpx;
@@ -2108,7 +2108,7 @@
 				background-image: url("@/static/images/xuexi/xx-ml-jt.png");display: block;
 			}
 			.dy-right-box{
-				width: 518rpx;height: 127rpx;@include ezy-no-repeat-cover;transition: 0.3s;
+				width: 518rpx;height: 127rpx;@include ezy-no-repeat-cover;
 				display: flex;align-items: flex-start;flex-direction: column;justify-content: center;
 				box-sizing: border-box;padding:0 24rpx;font-size: 28rpx;
 				background-image: url("@/static/images/xuexi/xx-ml-right.png");

components/dialog/nichengDialog.vue

@@ -7,8 +7,8 @@
 			<view class="tip-title">{{title}}</view>
 				<input class="duihuan-input" type="text" focus v-model="nichengValue" placeholder="请输入昵称" />
 				<view class="tip-btn-box">
-					<view class="not-confirm-btn" @click="handleClose">取消</view>
-					<view class="confirm-btn" @click="confirmBtn">确认</view>
+					<ezyActiveVue class="ezy-btn-active not-confirm-btn" @aclick="handleClose">取消</ezyActiveVue>
+					<ezyActiveVue class="ezy-btn-active confirm-btn" @aclick="confirmBtn">确认</ezyActiveVue>
 				</view>
 		</view>
 	 </view>
@@ -17,6 +17,7 @@
 
 <script setup>
 	import { ref } from 'vue';
+	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
 	import {
 		toast,
 	} from "@/utils/common";

components/dialog/tipBigDialog.vue

@@ -8,8 +8,8 @@
    <view class="tip-content" v-if="content">{{content}}</view>
    <view class="tip-img" v-if="imgShow"></view>
    <view class="tip-btn-box">
-    <view class="not-confirm-btn" @click="handleClose"></view>
-    <view class="confirm-btn" @click="confirmBtn"></view>
+    <ezyActiveVue class="ezy-btn-active not-confirm-btn" @aclick="handleClose"></ezyActiveVue>
+    <ezyActiveVue class="ezy-btn-active confirm-btn" @aclick="confirmBtn"></ezyActiveVue>
    </view>
   </view>
   </view>
@@ -18,6 +18,7 @@
 
 <script setup>
  import { ref } from 'vue';
+ import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
  const props = defineProps({
    title: {
      type: String,

components/dialog/tipMiddleDialog.vue

@@ -7,8 +7,8 @@
 			<view class="tip-title">{{title}}</view>
 			<view class="tip-content">{{content}}</view>
 			<view class="tip-btn-box">
-				<view class="not-confirm-btn" @click="handleClose">取消</view>
-				<view class="confirm-btn" @click="confirmBtn">确认</view>
+				<ezyActiveVue class="ezy-btn-active not-confirm-btn" @aclick="handleClose">取消</ezyActiveVue>
+				<ezyActiveVue class="ezy-btn-active confirm-btn" @aclick="confirmBtn">确认</ezyActiveVue>
 			</view>
 		</view>
 	 </view>
@@ -17,6 +17,7 @@
 
 <script setup>
 	import { ref } from 'vue';
+	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
 	const props = defineProps({
 	  title: {
 	    type: String,

components/dialog/tipSmallDialog.vue

@@ -7,8 +7,8 @@
 			<view class="tip-title">{{title}}</view>
 			<view class="tip-content">{{content}}</view>
 			<view class="tip-btn-box">
-				<view class="not-confirm-btn" @click="handleClose">取消</view>
-				<view class="confirm-btn" @click="confirmBtn">确认</view>
+				<ezyActiveVue class="ezy-btn-active not-confirm-btn" @aclick="handleClose">取消</ezyActiveVue>
+				<ezyActiveVue class="ezy-btn-active confirm-btn" @aclick="confirmBtn">确认</ezyActiveVue>
 			</view>
 		</view>
 	 </view>
@@ -17,6 +17,7 @@
 
 <script setup>
 	import { ref } from 'vue';
+	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
 	const props = defineProps({
 	  title: {
 	    type: String,

components/ezyActive/ezyActive.vue

@@ -5,7 +5,7 @@
 </template>
 <!--  父组件传值使用 :delay="500" -->
 <script setup>
-import { defineProps, defineEmits } from 'vue'
+
 
 // 定义延迟时间的prop，默认值300ms
 const props = defineProps({
@@ -18,9 +18,9 @@ const props = defineProps({
 const emits = defineEmits(['aclick'])
 
 function handleClick() {
-	setTimeout(() => {
-		emits('aclick')
-	}, props.delay); // 使用props.delay作为延迟时间
+			emits('aclick')
+	/* setTimeout(() => {
+	}, props.delay); // 使用props.delay作为延迟时间 */
 }
 </script>
 

pages/chanpinMy/components/telDialog.vue

@@ -26,7 +26,7 @@
 						@input="changeYzmInput" />
 					<view class="close-btn" v-if="bindObj.clearYzmIcon" @click="clearYzm"></view>
 				</view>
-				<view @click="bindBtn" class="my-bind-btn">绑定</view>
+				<ezyActiveVue @aclick="bindBtn" class="ezy-btn-active my-bind-btn">绑定</ezyActiveVue>
 			</view>
 
 		</view>
@@ -35,6 +35,7 @@
 <script>
 	import cacheManager from '@/utils/cacheManager.js';
 	import captcha from "@/components/captcha4/index.vue";
+	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
 	import {
 		telBind,
 		sendCode
@@ -70,7 +71,7 @@
 			}
 		},
 		components: {
-			captcha
+			captcha,ezyActiveVue
 		},
 		methods: {
 			telClose() {