Merge pull request 'xbx' (#29) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/29

src/components/Menu.vue

@@ -2,8 +2,8 @@
     <div class="menu">
         <div class="user" style="overflow: hidden;">
             <div class="user" :class="{'seltop': selnum == 0}">
-                <img src="" alt="" class="head">
-                <div class="name">name</div>
+                <img :src="userinfo.head" alt="" class="head">
+                <div class="name">{{userinfo.username}}</div>
             </div>
         </div>
         
@@ -50,7 +50,6 @@
         .head{
             width: 57px;
             height: 57px;
-            background-color: #0f0;
             margin-bottom: 15px;
             border-radius: 50%;
         }
@@ -118,7 +117,8 @@
 </style>
 <script lang="ts">
 import router from '@/router';
-import { defineComponent, ref } from 'vue';
+import store from '@/store';
+import { computed, defineComponent, ref } from 'vue';
 
 export default defineComponent({
     setup(){
@@ -169,6 +169,9 @@ export default defineComponent({
         ]
         // 当前选中的index
         const selnum = ref(0);
+
+        const userinfo = computed(() => store.state.userinfo)
+        console.log(userinfo.value)
         /**
          * 跳转路由与赋值对应的下标
          * @param index 选中的下标 方便赋值与跳转
@@ -181,10 +184,13 @@ export default defineComponent({
             })
 
         }
+
+      
         return{
             list,
             routeto,
-            selnum
+            selnum,
+            userinfo
         }
     }
 })

src/components/NavTop.vue

@@ -14,17 +14,17 @@
         <div class="setting">
             <div class="item">
                 <img src="@/static/images/shijian.png" alt="" class="icon">
-                <div class="name">北京 GMT +08:00</div>
+                <div class="name">{{userinfo.zoneStr}}</div>
                 <img src="@/static/images/jiantou2.png" alt="" class="down">
             </div>
             <div class="item">
                 <img src="@/static/images/qianbi.png" alt="" class="icon">
-                <div class="name">人民币</div>
+                <div class="name">{{userinfo.currency}}</div>
                 <img src="@/static/images/jiantou2.png" alt="" class="down">
             </div>
             <div class="item">
                 <img src="@/static/images/yuyan.png" alt="" class="icon">
-                <div class="name">中文</div>
+                <div class="name">{{userinfo.language}}</div>
                 <img src="@/static/images/jiantou2.png" alt="" class="down">
             </div>
             <div class="item">
@@ -110,7 +110,8 @@
 </style>
 <script lang="ts">
 import router from '@/router';
-import { defineComponent, ref } from 'vue';
+import store from '@/store';
+import { computed, defineComponent, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 export default defineComponent({
@@ -148,6 +149,10 @@ export default defineComponent({
                 route: "/mine/archives"
             }
         ]
+        const userinfo = computed(() => {
+            return store.state.userinfo;
+        })
+
         function navto(index: number){
             router.push({
                 path: nav[index].route
@@ -156,7 +161,8 @@ export default defineComponent({
         return {
             nav,
             types,
-            navto
+            navto,
+            userinfo
         }
     }
 })