Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -103,28 +103,27 @@ window.submitSearch = function() {
  * @return {[type]} [description]
  * @return {[type]} [description]
  */
  */
 function actionAddKeyWords() {
 function actionAddKeyWords() {
-    var keywords = $('#nav_keyword').text();
+    var $keywords = $('#nav_keyword').text();
     var defaultsearch = 'vans';
     var defaultsearch = 'vans';
-    var $query_key = $('#query_key');
-    if (keywords !== '') {
-        $query_key.css({
-            'color': '#000'
+    var $querykey = $('#query_key');
+
+    if ($keywords !== '') {
+        $querykey.css({
+            color: '#000'
         });
         });
-        $query_key.val(keywords);
+        $querykey.val($keywords);
     } else {
     } else {
-        $query_key.css({
-            'color': '#e0e0e0'
+        $querykey.css({
+            color: '#e0e0e0'
         });
         });
-        $query_key.val(defaultsearch);
-        $query_key.on('focus', function(e) {
-            $query_key.css({
-                'color': '#000'
+        $querykey.val(defaultsearch);
+        $querykey.on('focus', function(e) {
+            $querykey.css({
+                color: '#000'
             });
             });
-            $query_key.val('');
-        })
-
+            $querykey.val('');
+        });
     }
     }
-
 }
 }
 /**
 /**
  * 定义购物车扩展
  * 定义购物车扩展
@@ -1343,7 +1342,6 @@ function actionSearch() {
  * @return {[type]} [description]
  * @return {[type]} [description]
  */
  */
 function actionLoginState(_data) {
 function actionLoginState(_data) {
-    console.log(_data); 
     var timestamp = new Date().getTime();
     var timestamp = new Date().getTime();
     var noLoginHtml = '<span>Hi~</span>[<a href="http://www.yohobuy.com/signin.html" class="list-a login-out ">' +
     var noLoginHtml = '<span>Hi~</span>[<a href="http://www.yohobuy.com/signin.html" class="list-a login-out ">' +
         '请登录</a>]&nbsp;' +
         '请登录</a>]&nbsp;' +
@@ -1364,12 +1362,12 @@ function actionLoginState(_data) {
     var char = '';
     var char = '';
     var user = info.split('::');
     var user = info.split('::');
     var userName = user[0] || ' ';
     var userName = user[0] || ' ';
-    var _logout = '';
+    var _logout = 'http://www.yohobuy.com/logout_';
     var islogin = '1';
     var islogin = '1';
     var _num = 0;
     var _num = 0;
     var data = {
     var data = {
         user_name: name,
         user_name: name,
-        logout: _logout,
+        logout: _logout + _data.data.token + '.html',
         random: Math.random()
         random: Math.random()
     };
     };