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

pages/chanpinMy/duihuanma.vue

@@ -9,7 +9,7 @@
 				<icon class="head-img-box" :style="{backgroundImage: 'url(' + myInfoData.icon + ')'}"></icon>
 				<view class="head-content-box">
 					<view>{{ myInfoData.nickName }}</view>
-					<view>{{ myInfoData.userName }}</view>
+<!--					<view>{{ myInfoData.userName }}</view>-->
 				</view>
 			</view>
 			<view class="duihuan-input-box">

pages/chanpinMy/my.vue

@@ -46,6 +46,9 @@
 		</view>
 
 		<goLogin ref="loginRef" @success="handleSuccess"></goLogin>
+
+    <tipMiddleDialog ref="goLoRef" @confirm-btn="btntxt" :content="tishiTxt"></tipMiddleDialog>
+
 		<!-- 底部 -->
 		<custom-tab-bar :show="true" :current-index="currentTabIndex" />
 	</view>
@@ -62,6 +65,7 @@
 	} from '@/api/my.js'
 	import CustomTabBar from '@/components/custom-tabbar/index.vue';
 	import goLogin from "@/components/goLogin/goLogin.vue"
+  import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
 	import {
 		onLoad,
 		onShow
@@ -90,6 +94,8 @@
 		icon: '',
 	});
 	let pageFrom = ref(null)
+  const goLoRef = ref(null)
+  let tishiTxt = ref('您现在是游客身份，请先登录再进行兑换操作！')
 
 	onShow(() => {
 		console.log('pageFrom.value', pageFrom.value);
@@ -103,6 +109,11 @@
 			isShowBindPhone.value = false
 		}
 	})
+
+  function btntxt() {
+    loginRef.value.showDl()
+  }
+
 	/***************** 测试 ******************/
 	const testRef = ref(null)
 
@@ -156,7 +167,8 @@
 		// 兑换码兑换策略
 		if (getUserIsYouke()) {
 			// 非登录 -- 登录
-			loginRef.value.showDl()
+      goLoRef.value.handleShow();
+
 		} else {
 			// 已登录
 			uni.navigateTo({