Merge branch 'master' of http://47.100.37.243:10080/wutt/game

# Conflicts:
#	minigame/WebContent/js/main.js

minigame/WebContent/js/main.js

@@ -698,39 +698,43 @@ function getInfo() {
         $('#nameText').show();
         $('#textInput').hide();
         $('#text').show();
+
+        $('.replay-btn').hide();
+        $('.secret-btn').hide();
+
         chooseType = URLParams['type'];
         dishType = URLParams['food'];
         $(".poster-mode").addClass("poster-bg" + chooseType);
-        if(dishIndex == 0){
+        if(dishType == 0){
             $('#poster').attr('src','./img/poster/hsr.png');
-        }else if(dishIndex == 1){
+        }else if(dishType == 1){
             $('#poster').attr('src','./img/poster/qcdf.png');
-        }else if(dishIndex == 2){
+        }else if(dishType == 2){
             $('#poster').attr('src','./img/poster/swy.png');
         }else{
             $('#poster').attr('src','./img/poster/ymc.png');
         }
+        getMsg();
         $(".poster-mode").fadeIn();
     } else {
         $('#nameInput').show();
         $('#nameText').hide();
         $('#textInput').show();
         $('#text').hide();
+
+        $('.replay-btn').show();
+        $('.secret-btn').show();
+
         init();
         getMsg();
     }
+
 }
 
 // 获取登陆信息
 function getMsg(){
     if(URLParams['uid'] || localStorage.userId){
-        if(localStorage.userId) {
-            window.user_info.uid = localStorage.userId;
-            window.user_info.logo = localStorage.userPic;
-            window.user_info.nickname = localStorage.userName;
-            $('.headimg-box img').attr("src", localStorage.userPic);
-            $('.user-info p').html(localStorage.userName);
-        } else {
+        if(URLParams['uid']) {
             var uid = URLParams['uid'];
             var xhr=null;
             try{
@@ -761,6 +765,12 @@ function getMsg(){
                     }
                 }
             }
+        } else {
+            window.user_info.uid = localStorage.userId;
+            window.user_info.logo = localStorage.userPic;
+            window.user_info.nickname = localStorage.userName;
+            $('.headimg-box img').attr("src", localStorage.userPic);
+            $('.user-info p').html(localStorage.userName);
         }
 
     }else {