From 6534006fefe23a25f5b6f82a7fb870e645d0bb40 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Sat, 30 Aug 2025 17:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/fly-login/fly-login.vue |  4 ++-
 src/pages/my/components/wx-login.vue   | 50 ++++++++++++++++++--------
 src/pages/my/index.vue                 | 22 +-----------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/components/fly-login/fly-login.vue b/src/components/fly-login/fly-login.vue
index d6fe1ed..27e0fd9 100644
--- a/src/components/fly-login/fly-login.vue
+++ b/src/components/fly-login/fly-login.vue
@@ -41,7 +41,7 @@
         size="default"
         type="default"
         style="color: #fff; background-color: #1aad19; border-color: #1aad19"
-        class="text-center leading-12 w-40 my-4"
+        class="text-center leading-12 w-60 my-4"
         @click="onSubmit"
       >
         授权登录
@@ -105,6 +105,8 @@ const onSubmit = () => {
 
 <style lang="scss" scoped>
 .fly-login {
+  display: flex;
+  bottom: 0;
   z-index: 1;
   position: fixed;
   inset: 0;
diff --git a/src/pages/my/components/wx-login.vue b/src/pages/my/components/wx-login.vue
index ee9a78b..4d97b3f 100644
--- a/src/pages/my/components/wx-login.vue
+++ b/src/pages/my/components/wx-login.vue
@@ -5,24 +5,46 @@
 </route>
 
 <template>
-  <view class="p-4">
-    <view class="flex items-center leading-6" v-if="hasLogin">
-      <image class="w-18 h-18 rounded-full" :src="userStore.userInfo?.avatar"></image>
+  <view class=" ">
+    <view class=" " style="">
+      <wd-card custom-class="card-content">
+        <view class="relative" style="height: 380rpx">
+          <wd-img
+            radius="20rpx"
+            :width="'100%'"
+            :height="'100%'"
+            src="https://img.shetu66.com/2023/06/14/1686734441937414.png"
+          />
+          <view
+            class="m-4 absolute bottom-0 text-left left-0 right-0 text-white bg-black bg-opacity-20"
+            style="backdrop-filter: blur(2rpx); border-radius: 10rpx"
+          >
+            <view class="p-4">
+              <view class="flex items-center leading-6" v-if="hasLogin">
+                <image class="w-18 h-18 rounded-full" :src="userStore.userInfo?.avatar"></image>
 
-      <view class="ml-2 flex-content-column">
-        <view class="ps-1 font-size-4 font-bold">微信用户{{ userStore.userInfo?.nickname }}</view>
-        <view class="ml-1 font-size-3" style="align-items: end">
-          <text class="pe-2 font-size-3">账号：{{ userStore.userInfo?.nickname }}</text>
+                <view class="ml-2 flex-content-column">
+                  <view class="ps-1 font-size-4 font-bold">
+                    微信用户{{ userStore.userInfo?.nickname }}
+                  </view>
+                  <view class="ml-1 font-size-3" style="align-items: end">
+                    <text class="pe-2 font-size-3">账号：{{ userStore.userInfo?.nickname }}</text>
+                  </view>
+                </view>
+              </view>
+              <view class="flex items-center leading-6" v-else @click="show = true">
+                <image class="w-18 h-18 rounded-full" :src="userStore.userInfo?.avatar"></image>
+                <view class="ml-2 font-size-4">去登录</view>
+              </view>
+
+              <!-- <fly-content :line="10" /> -->
+              <!-- <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button> -->
+            </view>
+          </view>
         </view>
-      </view>
-    </view>
-    <view class="flex items-center leading-6" v-else @click="show = true">
-      <image class="w-18 h-18 rounded-full" :src="userStore.userInfo?.avatar"></image>
-      <view class="ml-2 font-size-4">去登录</view>
+      </wd-card>
     </view>
     <fly-login v-model="show" />
-    <!-- <fly-content :line="10" /> -->
-    <!-- <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button> -->
   </view>
 </template>
 
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index baf79ae..7e30ed1 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -5,27 +5,7 @@
 </route>
 <template>
   <view class="background_home">
-    <view class="px-2">
-      <view class=" " style="" @click="more">
-        <wd-card custom-class="card-content">
-          <view class="relative" style="height: 380rpx">
-            <wd-img
-              radius="20rpx"
-              :width="'100%'"
-              :height="'100%'"
-              src="https://img.shetu66.com/2023/06/14/1686734441937414.png"
-            />
-            <view
-              class="m-4 absolute bottom-0 text-left left-0 right-0 text-white bg-black bg-opacity-20"
-              style="backdrop-filter: blur(2rpx); border-radius: 10rpx"
-            >
-              <wx-login />
-            </view>
-          </view>
-        </wd-card>
-      </view>
-    </view>
-
+    <wx-login />
     <!-- <view class="ml-4">wx的openid:</view> -->
     <!-- <view class="ml-4">{{ openId }}</view> -->