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

# Conflicts:
#	pages/chanpinMy/my.vue

components/bindPhone/bindPhone.vue

@@ -23,7 +23,7 @@
 				:class="{ 'cxfs-btn-disabled': loginData.isDisabled}">{{loginData.buttonText}}</text>
 		</view>
 		<!-- 登录按钮 -->
-		<ezyActiveVue class="ezy-btn-active login-btn yzm-btn" @aclick="skipFun" :class="loginData.yzmStatus">跳过
+		<ezyActiveVue v-if="skipBtnFlag" class="ezy-btn-active login-btn yzm-btn" @aclick="skipFun" :class="loginData.yzmStatus">跳过
 		</ezyActiveVue>
 		<ezyActiveVue class="ezy-btn-active login-btn yzm-btn" @aclick="bangdingFun" :class="loginData.yzmStatus">绑定
 		</ezyActiveVue>
@@ -78,7 +78,12 @@
 		isDisabled: false, // 按钮是否禁用
 		buttonText: '获取验证码', // 按钮文本
 	})
-
+	const props = defineProps({
+		skipBtnFlag: {
+			type: Boolean,
+			default: true
+		}
+	})
 	const sliderData = reactive({})
 
 	function showDl() {

pages/chanpinMy/my.vue

@@ -46,7 +46,7 @@
 		</view>
 
 		<goLogin ref="loginRef" @success="handleSuccess"></goLogin>
-		<bindPhone ref="bindPhoneRef" @success="bingPhoneSuccess"></bindPhone>
+		<bindPhone ref="bindPhoneRef" :skipBtnFlag='false' @success="bingPhoneSuccess"></bindPhone>
 		<!-- 底部 -->
 		<custom-tab-bar :show="true" :current-index="currentTabIndex" />
 	</view>
@@ -82,6 +82,7 @@
 	let currentPlatform = ref(null);
 	let authInfo = ref(null);
 	let loginRef = ref(null);
+	let bindPhoneRef = ref(null);
 	let isShowBindPhone = ref(false);
 	let currentTabIndex = ref(3)
 	let myInfoData = reactive({
@@ -177,10 +178,7 @@
 	}
 
 	function bangPhone() {
-
-
-		//	authInfo.value = cacheManager.get('auth');
-
+		bindPhoneRef.value.showDl();
 	}
 
 	function duihuamaDuihuan() {
@@ -232,4 +230,4 @@
 			url: '/pages/chanpinShop/index'
 		})
 	}
-</script>
+</script>