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

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

minigame/WebContent/js/main.js

@@ -614,7 +614,7 @@ function handleComplete(evt, comp) {
                         })
 
 
-                        if(document.location.href.indexOf('type') > -1){
+                        if(document.location.href.indexOf('type') == -1){
                             var href = document.location.href + (document.location.href.indexOf('?') > -1?'&':'?') + "type=" + chooseType + "&food=" + dishIndex;
                             history.pushState("", "Title", href);
                         }