From dbfdb7fc1cc403c54a7cc3d8b5cd9d6f597ae306 Mon Sep 17 00:00:00 2001
From: liu guang bo <l2026442945@qq.com>
Date: Wed, 3 Jul 2024 20:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/module.js                         | 41 +++++++++++-
 core/routes/index.js                          |  4 +-
 yunyou_pavilion/src/App.vue                   |  1 +
 yunyou_pavilion/src/components/MyUser.vue     | 64 +++++++++----------
 .../components/MymyAttention/Attention.vue    |  4 +-
 yunyou_pavilion/src/main.js                   |  1 -
 yunyou_pavilion/src/router/index.js           |  2 +-
 yunyou_pavilion/src/views/My.vue              | 32 +++++-----
 .../PersonalInformation.vue                   | 21 +++---
 yunyou_pavilion/src/views/myserver/user.js    |  8 +++
 10 files changed, 115 insertions(+), 63 deletions(-)
 create mode 100644 yunyou_pavilion/src/views/myserver/user.js

diff --git a/core/module/module.js b/core/module/module.js
index 58f14d1..8f40a98 100644
--- a/core/module/module.js
+++ b/core/module/module.js
@@ -1,13 +1,50 @@
 const mongoose = require('./db')
 
 const UserSchema = new mongoose.Schema({
-    username: String, //用户名字
-    password: String, //用户密码
+    username: {
+        type: String,
+        default: 'aa'
+    }, //用户名字
+    password: {
+        type: String,
+        default: ''
+    }, //用户密码
     phone: String, //手机号
+    usersex:{
+        type:String,
+        default:'未知'
+    },
+    personalizedLabel: {
+        type: String,
+        default: '这个人很懒，什么都没留下~'
+    },//个性签名
     create_time: String, //创建时间
     update_time: String, //更新时间
+    avatar: {
+        type: String,
+        default: 'https://picsum.photos/id/23/200/300'
+    }, //用户头像
+    level: {
+        type: Number,
+        default: 1
+    },//用户等级
+    goldCoins: {
+        type: Number,
+        default: 0
+    },//金币
+
 })
 
+const attention=new mongoose.Schema({
+    userId:{  //w
+        type:mongoose.Types.ObjectId,
+        ref:'user'
+    },
+    attentionId:{ //t
+        type:mongoose.Types.ObjectId,
+        ref:'user'
+    }
+})
 
 const UserModel = mongoose.model('user', UserSchema, 'user')
 
diff --git a/core/routes/index.js b/core/routes/index.js
index 1fd5a47..da3633b 100644
--- a/core/routes/index.js
+++ b/core/routes/index.js
@@ -72,6 +72,7 @@ router.post('/sendCode', (req, res) => {
 // 根据id获取用户信息
 router.get('/getUserInfo', async (req, res) => {
   let { id } = req.query
+  console.log(id)
   let user = await UserModel.find({ _id: id })
   res.send({
     code: 200,
@@ -123,7 +124,8 @@ router.post('/login', async (req, res) => {
     if (user.length !== 0) {
       res.send({
         code: 200,
-        msg: '登录成功',
+        msg: '登录成功',  
+        user_id: user[0]._id,
         accessToken: accessToken({ phone: phone }),
         refreshToken: refreshToken({ phone: phone })
       })
diff --git a/yunyou_pavilion/src/App.vue b/yunyou_pavilion/src/App.vue
index 66c900e..df48f46 100644
--- a/yunyou_pavilion/src/App.vue
+++ b/yunyou_pavilion/src/App.vue
@@ -5,6 +5,7 @@
 </template>
 
 <script setup>
+import axios from "@/middleware/axios";
 </script>
 
 <style>
diff --git a/yunyou_pavilion/src/components/MyUser.vue b/yunyou_pavilion/src/components/MyUser.vue
index 763c91f..acb15af 100644
--- a/yunyou_pavilion/src/components/MyUser.vue
+++ b/yunyou_pavilion/src/components/MyUser.vue
@@ -1,18 +1,17 @@
 <template>
   <div class="users">
     <div class="userRight">
-      <img class="imgs" :src="obj.imgs" alt="" /><br />
+      <img class="imgs" :src="list.avatar" alt="" /><br />
       <span class="userName" @click="personalInformation()"
-        ><B>{{ obj.userName }}</B></span
+        ><B>{{ list.username }}</B></span
       ><br />
       <span class="userType">
         <!-- 标签 -->
         <div class="userLevel">
-          <span>Lv.{{ obj.userLevel }}</span>
+          <span>Lv.{{ list.level }}</span>
         </div>
         <div class="userSex">
-          <img src="/imgs/xb.svg" alt="" />
-          <span>{{ obj.userSex }}</span>
+          <span>{{ list.usersex }}</span>
         </div>
       </span>
     </div>
@@ -39,25 +38,24 @@
 import { ref } from "vue";
 import { useRouter } from "vue-router";
 const router = useRouter();
-let obj = ref({
-  id: "10000012",
-  imgs: "/imgs/1.jpg",
-  userName: "晚风心里吹",
-  userLevel: 1,
-  userSex: "未知",
-  userText: "important声明的样式的优先级最高",
-});
+// 接收父组件数据
+const props=defineProps({
+  list:Object,
+})
+console.log(props.list)
+// to个人信息
 const personalInformation = () => {
   router.push({
     name: "personalInformation",
-    params: obj.value,
+    params: props.list,
   });
 };
+// to关注和粉丝
 const torouter = (v) => {
   router.push({
     name: "attentionAndFans",
     params: {
-      id: obj.value.id,
+      id: props.list._id,
       state: v,
     },
   });
@@ -75,17 +73,17 @@ const torouter = (v) => {
   text-align: center;
   box-sizing: border-box;
   position: relative;
-  bottom: 0.4rem;
-  left: 0.5333rem;
+  bottom: .4rem;
+  left: .5333rem;
 }
 .userRight .imgs {
   width: 2.1333rem;
   height: 2.1333rem;
   border-radius: 50%;
-  border: 0.08rem solid rgb(255, 255, 255);
+  border: .08rem solid rgb(255, 255, 255);
 }
 .userName {
-  margin: 0.1333rem 0;
+  margin: .1333rem 0;
 }
 .userRight span {
   display: inline-block;
@@ -95,38 +93,38 @@ const torouter = (v) => {
   justify-content: space-evenly;
 }
 .userRight .userType span {
-  font-size: 0.32rem;
+  font-size: .32rem;
 }
 .userRight .userType .userSex img {
-  margin-top: 0.08rem;
+  margin-top: .08rem;
   background-color: #ffe4f8;
-  height: 0.4rem;
-  width: 0.3467rem;
+  height: .4rem;
+  width: .3467rem;
 }
 .userRight .userType .userLevel {
   color: #ff9823;
   background-color: #ffecd8;
-  border-radius: 0.4rem;
-  width: 0.9333rem;
+  border-radius: .4rem;
+  width: .9333rem;
 }
 .userRight .userType .userSex {
   box-sizing: border-box;
   display: flex;
   justify-content: space-evenly;
-  color: #ff2386;
-  background-color: #ffe4f8;
-  border-radius: 0.4rem;
+  color: #18a3d1;
+  background-color: #e1f5ff;
+  border-radius: .4rem;
   width: 1.2rem;
 }
 .userRight .userType .userSex span {
-  font-size: 0.2933rem;
-  margin-top: 0.1333rem;
+  font-size: .2933rem;
+  margin-top: .1333rem;
 }
 /* 数据信息部分 */
 .userLeft {
   width: 7.0667rem;
   height: 4rem;
-  padding-top: 0.2667rem;
+  padding-top: .2667rem;
 }
 .userLeft ul {
   text-align: center;
@@ -136,13 +134,13 @@ const torouter = (v) => {
 }
 .userLeft ul li span {
   font-family: "Times New Roman", Times, serif;
-  font-size: 0.48rem;
+  font-size: .48rem;
   /* font-weight: 600; */
   color: rgb(0, 0, 0);
 }
 .userLeft ul li .a1 {
   font-family: "Times New Roman", Times, serif;
-  font-size: 0.3733rem;
+  font-size: .3733rem;
   font-weight: 400;
   color: rgb(125, 125, 125);
 }
diff --git a/yunyou_pavilion/src/components/MymyAttention/Attention.vue b/yunyou_pavilion/src/components/MymyAttention/Attention.vue
index 727ba70..61d1aee 100644
--- a/yunyou_pavilion/src/components/MymyAttention/Attention.vue
+++ b/yunyou_pavilion/src/components/MymyAttention/Attention.vue
@@ -2,7 +2,9 @@
     <div class="animate__animated animate__fadeInRight">关注</div>
 </template>
 <script setup>
-
+import {useRoute} from 'vue-router'
+const route = useRoute()
+console.log(route.params.id,)
 </script>
 <style>
 
diff --git a/yunyou_pavilion/src/main.js b/yunyou_pavilion/src/main.js
index d4e41cc..30876f4 100644
--- a/yunyou_pavilion/src/main.js
+++ b/yunyou_pavilion/src/main.js
@@ -8,7 +8,6 @@ import 'animate.css';
 
 
 
-
 const app = createApp(App)
 app.use(createPinia())
 app.use(router)
diff --git a/yunyou_pavilion/src/router/index.js b/yunyou_pavilion/src/router/index.js
index ab13c47..f8bc2b5 100644
--- a/yunyou_pavilion/src/router/index.js
+++ b/yunyou_pavilion/src/router/index.js
@@ -106,7 +106,7 @@ const router = createRouter({
     },
     // 修该个人信息页
     {
-      path: '/personalInformation/:id/:imgs/:userName/:userLevel/:userSex/:userText',
+      path: '/personalInformation/:_id/:avatar/:username/:usersex/:personalizedLabel',
       name: 'personalInformation',
       component: () => import('../views/PersonalInformation/PersonalInformation.vue'),
     },
diff --git a/yunyou_pavilion/src/views/My.vue b/yunyou_pavilion/src/views/My.vue
index 830b618..59ca0d7 100644
--- a/yunyou_pavilion/src/views/My.vue
+++ b/yunyou_pavilion/src/views/My.vue
@@ -1,22 +1,12 @@
 <template>
   <div class="animate__animated animate__fadeIn" id="box">
-
-    <!-- <MySetVue></MySetVue>
+    <MySetVue></MySetVue>
     <MyLogin v-if="!getUser_id()"></MyLogin>
     <div class="content">
-      <MyUserVue v-if="!!getUser_id()"></MyUserVue>
+      <MyUserVue v-if="!!getUser_id()" :list="userInfo"></MyUserVue>
       <div class="con">
         <MyItem v-if="!!getUser_id()"></MyItem>
-        <MyItem2></MyItem2>
-        <MyItem3></MyItem3>
-      </div>
-    </div> -->
-
-    <MySetVue></MySetVue>
-    <div class="content">
-      <MyUserVue></MyUserVue>
-      <div class="con">
-        <MyItem1></MyItem1>
+        <MyItem1 v-if="!!getUser_id()"></MyItem1>
         <MyItem2></MyItem2>
         <MyItem3></MyItem3>
       </div>
@@ -32,11 +22,23 @@ import MySetVue from "../components/MySet.vue";
 import MyUserVue from "../components/MyUser.vue";
 import { getUser_id } from "@/hooks/getLocation";
 import MyLogin from "@/components/MyLogin.vue";
+import { ref, onMounted } from "vue";
+import { UserAPI } from "./myserver/user";
+
+// 获取用户信息
+const userInfo = ref({});
+const UserData = async () => {
+  let data = await UserAPI(getUser_id());
+  userInfo.value = data;
+};
+onMounted(() => {
+  UserData();
+});
 </script>
 
 <style scoped>
 #box {
-  font: 12px/1.5 tahoma,arial,'Hiragino Sans GB','\5b8b\4f53',sans-serif;
+  font: 12px/1.5 tahoma, arial, "Hiragino Sans GB", "\5b8b\4f53", sans-serif;
   height: 20vh;
   width: 100%;
   /* 渐变 */
@@ -47,7 +49,7 @@ import MyLogin from "@/components/MyLogin.vue";
 }
 .content {
   height: 85vh;
-  border-radius: .4rem;
+  border-radius: 0.4rem;
   background-color: rgb(246, 246, 246);
 }
 
diff --git a/yunyou_pavilion/src/views/PersonalInformation/PersonalInformation.vue b/yunyou_pavilion/src/views/PersonalInformation/PersonalInformation.vue
index 1f01338..f181ff9 100644
--- a/yunyou_pavilion/src/views/PersonalInformation/PersonalInformation.vue
+++ b/yunyou_pavilion/src/views/PersonalInformation/PersonalInformation.vue
@@ -10,7 +10,7 @@
     </div>
     <div class="info">
       <div class="imgs">
-        <img :src="params.imgs" alt="" /><br />
+        <img :src="params.avatar" alt="" /><br />
         <span @click="show = true">点击修改头像</span>
       </div>
     </div>
@@ -26,11 +26,11 @@
       />
 
       <van-cell-group inset border>
-        <van-cell title="用户名" :value="params.userName" is-link @click="router.push({path:'/setusername'})" />
-        <van-cell title="UID" :value="params.id" @click="copyText()" />
+        <van-cell title="用户名" :value="params.username" is-link @click="router.push({path:'/setusername'})" />
+        <van-cell title="UID" value-class="userText" :value="params._id" @click="copyText()" />
         <van-cell
           title="性别"
-          :value="params.userSex"
+          :value="params.usersex"
           @click="showPicker = true"
         />
         <van-popup v-model:show="showPicker" round position="bottom">
@@ -42,7 +42,7 @@
         </van-popup>
         <van-cell
           title="个性签名"
-          :value="params.userText"
+          :value="params.personalizedLabel"
           is-link
           value-class="userText"
           @click="router.push('/setusertext')"
@@ -61,7 +61,7 @@ import { copyDomText } from "../../components/Copytext";
 const route = useRoute();
 const router = useRouter();
 let params = ref(route.params);
-console.log(params);
+
 // 修改头像
 const show = ref(false);
 const actions = [{ name: "拍照(暂未开放)" }, { name: "从相册选择" }];
@@ -82,17 +82,20 @@ const columns = [
   { text: "女", value: "nv" },
   { text: "未知", value: "" },
 ];
+
 const showPicker = ref(false);
 
+// 修改性别
 const onConfirm = ({ selectedOptions }) => {
   showPicker.value = false;
-  console.log(selectedOptions);
-  params.value.userSex = selectedOptions[0].text;
+  params.value.usersex = selectedOptions[0].text;
+  console.log(params.value.usersex);
 };
 // 复制文本
 const copyText = () => {
-  copyDomText(params.value.id);
+  copyDomText(params.value._id);
 };
+
 </script>
 
 <style scoped>
diff --git a/yunyou_pavilion/src/views/myserver/user.js b/yunyou_pavilion/src/views/myserver/user.js
new file mode 100644
index 0000000..b0dd076
--- /dev/null
+++ b/yunyou_pavilion/src/views/myserver/user.js
@@ -0,0 +1,8 @@
+// import axios from '@/middleware/axios'
+
+import axios from 'axios'
+
+export const UserAPI = async (id) => {
+    let {data} = await axios.get(`/getUserInfo?id=${id}`)
+    return data
+}
\ No newline at end of file
-- 
Gitee