fix: vip info

components/LoginPopup/LoginPopup.vue

@@ -4,115 +4,113 @@
       <view class="popup-header">
         <text class="popup-title">登录授权</text>
       </view>
-    
+
       <view class="avatar-nickname">
-        <button open-type="chooseAvatar" @chooseavatar="onChooseAvatar" class="avatar-selector custom-button">
+        <button
+          open-type="chooseAvatar"
+          @chooseavatar="onChooseAvatar"
+          class="avatar-selector custom-button"
+        >
           <image v-if="avatarUrl" :src="avatarUrl" class="avatar-preview" />
           <text v-else>获取头像</text>
         </button>
-        <input 
+        <input
-          class="nickname-input" 
+          class="nickname-input"
-          type="nickname" 
+          type="nickname"
-          v-model="nickname" 
+          v-model="nickname"
-          placeholder="请输入昵称" 
+          placeholder="请输入昵称"
         />
       </view>
-    
+
-      <button class="confirm-btn custom-button" @tap="confirmLogin">确认登录</button>
+      <button class="confirm-btn custom-button" @tap="confirmLogin">
+        确认登录
+      </button>
     </view>
   </uni-popup>
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref } from "vue";
-import { useUserStore } from '@/stores/user'
+import { useUserStore } from "@/stores/user";
-import { getPlatformProvider } from '@/utils/system'
+import { getPlatformProvider } from "@/utils/system";
-import { apiLogin } from '@/api/auth.js'
+import { uploadImage } from "@/utils/common";
-import { wxLogin } from '@/utils/login.js'
+import { apiLogin } from "@/api/auth.js";
+import { wxLogin } from "@/utils/login.js";
 
-const popupRef = ref(null)
+const popupRef = ref(null);
-const avatarUrl = ref('')
+const avatarUrl = ref("");
-const nickname = ref('')
+const nickname = ref("");
 
-const userStore = useUserStore()
+const userStore = useUserStore();
 
-const emit = defineEmits(['logind'])
+const emit = defineEmits(["logind"]);
 
 const open = () => {
-  popupRef.value.open()
+  popupRef.value.open();
-}
+};
 
 const close = () => {
-  popupRef.value.close()
+  popupRef.value.close();
-}
+};
 
 const onChooseAvatar = (e) => {
-  avatarUrl.value = e.detail.avatarUrl
+  avatarUrl.value = e.detail.avatarUrl;
-}
+};
 
 const confirmLogin = async () => {
   try {
-    const platform = getPlatformProvider()
+    const platform = getPlatformProvider();
-    if (platform === 'mp-weixin') {
+    if (platform === "mp-weixin") {
-      const code = await wxLogin()
+      const code = await wxLogin();
-      console.log('准备登录：', { code, nickname: nickname.value, avatarUrl: avatarUrl.value })
+      const imageUrl = await uploadImage(avatarUrl.value);
-	  // console.log('准备登录：', { code, nickname: nickname.value, avatarUrl: 'http://tmp/HXhtcEwQ5A3B58476c91ba545ab67c6bf9c67d9c2559.jpeg' })
+
-	  
+      const loginRes = await apiLogin({
-	  const fileKeyRes = await uni.uploadFile({
+        code,
-		url: 'https://api.ai-meng.com/api/common/upload',
+        nickname: nickname.value,
-		filePath: avatarUrl.value,
+        avatarUrl: imageUrl,
-		name: 'file',  // 和后端接收文件字段名一致
+        platform: "wx",
-		header: {
+      });
-		    'x-app-id': '69665538a49b8ae3be50fe5d',
+      // 保存用户信息到store
-		 },
+      userStore.setUserInfo({
-	  })
+        nickName: loginRes?.user?.nickname || nickname.value,
-	  if(fileKeyRes.statusCode < 400) {
+        avatarUrl: loginRes?.user?.avatar || imageUrl,
-		  const keyJson = JSON.parse(fileKeyRes.data)
+        id: loginRes?.user?.id,
-		  const url = `https://file.lihailezzc.com/${keyJson?.data.key}`
+        isVip: loginRes?.isVip || false,
-		  const loginRes = await apiLogin({ code, nickname: nickname.value, avatarUrl: url, platform: 'wx' })
+        vipExpireAt: loginRes?.vipExpireAt || null,
-		  // 保存用户信息到store
+      });
-		  userStore.setUserInfo({
+
-			nickName: loginRes?.user?.nickname || nickname.value,
+      userStore.setToken(loginRes.token);
-			avatarUrl: loginRes?.user?.avatar || url,
+
-			id: loginRes?.user?.id
+      uni.showToast({ title: "登录成功", icon: "success" });
-		  })
+      emit("logind");
-		  
+      popupRef.value.close();
-		  userStore.setToken(loginRes.token)
+
-		  
+      // 重置临时变量
-		  uni.showToast({ title: '登录成功', icon: 'success' })
+      avatarUrl.value = "";
-		  emit('logind') 
+      nickname.value = "";
-		  popupRef.value.close()
-		  
-		  // 重置临时变量
-		  avatarUrl.value = ''
-		  nickname.value = ''
-	  } else {
-		  throw Error('获取失败')
-	  }
-  
     }
   } catch (err) {
-    uni.showToast({ title: '登录失败', icon: 'none' })
+    uni.showToast({ title: "登录失败", icon: "none" });
-    console.error(err)
+    console.error(err);
   }
-}
+};
-defineExpose({ open, close })
+defineExpose({ open, close });
 </script>
 
-<style lang='scss'>
+<style lang="scss">
 .custom-button {
-    border: none;
+  border: none;
-	outline: none;
+  outline: none;
-	background-color: transparent;
+  background-color: transparent;
-	padding: 0;
+  padding: 0;
-	margin: 0;
+  margin: 0;
-	line-height: normal;
+  line-height: normal;
-	font-family: inherit;
+  font-family: inherit;
-  }
+}
-  
+
-  .custom-button::after {
+.custom-button::after {
-	border: none;
+  border: none;
-  }
+}
 .popup-container {
   background-color: #fff;
   padding: 40rpx 30rpx 60rpx;
@@ -146,7 +144,7 @@ defineExpose({ open, close })
       margin-bottom: 20rpx;
       background-color: #eee;
     }
-    
+
     .avatar-preview {
       width: 100%;
       height: 100%;