release/5.1合并master分支

@@ -17,7 +17,7 @@ const shopIndex = (req, res) => {
             })
         };
     } else {
-        uid  = crypto.encryption('', req.query.uid + ''),
+        uid = crypto.encryption('', req.query.uid + ''),
         parameter = {
             appVersion: true,
             uid: uid

@@ -50,7 +50,6 @@ const banner = () => {
         cache: true,
         code: 200
     }).then((result) => {
-
         if (result && result.data) {
             return result.data[0];
         }

@@ -81,25 +81,25 @@ function shopListData(tabName, stoping) {
                     success: function(list) {
                         var url;
 
-                    if (list.code === 200) {
-                        if ($this.hasClass('already-collect')) {
-                            $this.removeClass('already-collect');
-                            tip.show('店铺取消收藏成功');
-                        } else {
-                            $this.addClass('already-collect');
-                            tip.show('店铺收藏成功');
+                        if (list.code === 200) {
+                            if ($this.hasClass('already-collect')) {
+                                $this.removeClass('already-collect');
+                                tip.show('店铺取消收藏成功');
+                            } else {
+                                $this.addClass('already-collect');
+                                tip.show('店铺收藏成功');
+                            }
                         }
-                    }
 
-                    if (list.code === 400) {
+                        if (list.code === 400) {
 
-                        url = list.data;
-                        if ($('#jump-login').length <= 0) {
-                            $('body').append('<a href=\'' + url + '\'><span id="jump-login"><span></a>');
+                            url = list.data;
+                            if ($('#jump-login').length <= 0) {
+                                $('body').append('<a href=\'' + url + '\'><span id="jump-login"><span></a>');
+                            }
+                            $('#jump-login').click();
                         }
-                        $('#jump-login').click();
-                    }
-                    searching = false;
+                        searching = false;
                     },
                     error: function() {
                         tip.show('网络断开连接了~');