Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -14,8 +14,10 @@ const shopList = (uid, tabName) => {
         method: 'app.shops.promote',
         method: 'app.shops.promote',
         uid: uid,
         uid: uid,
         tab_name: tabName
         tab_name: tabName
+    }, {
+        code: 200,
+        cache: true
     }).then((result) => {
     }).then((result) => {
-
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             _.forEach(result.data, function(data) {
             _.forEach(result.data, function(data) {
                 data.isFavorite = data.isFavorite === 'Y';
                 data.isFavorite = data.isFavorite === 'Y';
@@ -31,8 +33,11 @@ const shopList = (uid, tabName) => {
 const shopNav = () => {
 const shopNav = () => {
     return api.get('', {
     return api.get('', {
         method: 'app.shops.promoteTabNameList'
         method: 'app.shops.promoteTabNameList'
+    }, {
+        cache: true,
+        code: 200
     }).then((result) => {
     }).then((result) => {
-        if (result && result.code === 200) {
+        if (result.data) {
             return result.data;
             return result.data;
         }
         }
     });
     });
@@ -40,11 +45,13 @@ const shopNav = () => {
 
 
 const banner = () => {
 const banner = () => {
     return service.get('operations/api/v5/resource/get', {
     return service.get('operations/api/v5/resource/get', {
-        content_code: 'c0acf0296a3c329678fb45da958d9951'
+        content_code: 'ec9eb72eae121fcd6c1b7d1de75caff1'
     }, {
     }, {
-        cache: true
+        cache: true,
+        code: 200
     }).then((result) => {
     }).then((result) => {
-        if (result && result.code === 200) {
+        console.log(result)
+        if (result && result.data) {
             return result.data[0];
             return result.data[0];
         }
         }
     });
     });

@@ -133,7 +133,7 @@ function shopNavData() {
             // 加载第一页数据
             // 加载第一页数据
             if (navType.id) {
             if (navType.id) {
                 $('.shop-nav').find('li').each(function() {
                 $('.shop-nav').find('li').each(function() {
-                    if (navType.id === $(this).data('type')) {
+                    if (decodeURI(navType.id) === $(this).data('type')) {
                         $(this).addClass('active');
                         $(this).addClass('active');
                         shopListData($(this).data('type'));
                         shopListData($(this).data('type'));
                     }
                     }
@@ -183,6 +183,4 @@ $(function() {
             pagination: '.banner-top .pagination-inner'
             pagination: '.banner-top .pagination-inner'
         });
         });
     }
     }
-
-
 });
 });

@@ -153,7 +153,7 @@ $(
                             '<div class="seckill-time seckill-time-border">' +
                             '<div class="seckill-time seckill-time-border">' +
                                 '<span>距结束&nbsp</span>' +
                                 '<span>距结束&nbsp</span>' +
                                 '<span class="end-time">' +
                                 '<span class="end-time">' +
-                                    '<i class="tick day hide">00</i>:' +
+                                    '<i class="tick day hide">00</i>' +
                                     '<i class="tick hour">00</i>:' +
                                     '<i class="tick hour">00</i>:' +
                                     '<i class="tick minute">00</i>:' +
                                     '<i class="tick minute">00</i>:' +
                                     '<i class="tick second">00</i>' +
                                     '<i class="tick second">00</i>' +
@@ -162,9 +162,9 @@ $(
                         );
                         );
                         $('.text-info').append(
                         $('.text-info').append(
                             '<div class="seckill-time seckill-time-border seckill-chose">' +
                             '<div class="seckill-time seckill-time-border seckill-chose">' +
-                                '<span>距结束 </span>' +
+                                '<span>距结束&nbsp</span>' +
                                 '<span class="end-time">' +
                                 '<span class="end-time">' +
-                                    '<i class="tick day hide">00</i>:' +
+                                    '<i class="tick day hide">00</i>' +
                                     '<i class="tick hour">00</i>:' +
                                     '<i class="tick hour">00</i>:' +
                                     '<i class="tick minute">00</i>:' +
                                     '<i class="tick minute">00</i>:' +
                                     '<i class="tick second">00</i>' +
                                     '<i class="tick second">00</i>' +