From f39cd4d82c3952f8587ebff9a7e8ede73b46bcda Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 30 五月 2019 00:40:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 WebService/src/main/resources/components/nav/nav.js |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/WebService/src/main/resources/components/nav/nav.js b/WebService/src/main/resources/components/nav/nav.js
index ac84c2e..dd7216b 100644
--- a/WebService/src/main/resources/components/nav/nav.js
+++ b/WebService/src/main/resources/components/nav/nav.js
@@ -17,10 +17,11 @@
         mounted:function(){
             this.getNavCommunity();
             this.getNavData();
-            this.getUserInfo();
+            //this.getUserInfo();
         },
         methods:{
             getNavData:function(){
+
                 var param = {
                     msg:'123',
                 };
@@ -59,6 +60,12 @@
                            );
             },
             getUserInfo:function(){
+//                var _userInfo = vc.getData("_userInfo");
+//                //娴忚鍣ㄧ紦瀛樹腑鑳借幏鍙栧埌
+//                if(_userInfo != null && _userInfo != undefined){
+//                    vm.userName = _userInfo.name;
+//                    return ;
+//                }
                 //鑾峰彇鐢ㄦ埛鍚�
                 var param = {
                                     msg:'123',
@@ -71,7 +78,9 @@
                              function(json,res){
                                 if(res.status == 200){
                                     var tmpUserInfo = JSON.parse(json);
+                                    console.log(vm,tmpUserInfo);
                                    vm.userName = tmpUserInfo.name;
+//                                   vc.saveData("_userInfo",tmpUserInfo);
                                }
                              },function(){
                                 console.log('璇锋眰澶辫触澶勭悊');
@@ -124,4 +133,7 @@
 
 
     });
+
+     vm.getUserInfo();
+
 })(window.vc);
\ No newline at end of file

--
Gitblit v1.8.0