Merge branch 'feature/plusstar' into 'gray'

潮流优选优化、sale报错



See merge request !604

@@ -182,7 +182,7 @@ let discountDetail = (req, res, next) => {
         params.renderData.pageHeader.navTitle = result.title;
         params.renderData.pageHeader.navTitle = result.title;
 
 
         // 唤起 APP 的路径
         // 唤起 APP 的路径
-        res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.discountmarketpro","params":{"id":"${id}","cover_url":"${result.activity.cover_url.split('?')[0]}","title":"${result.title}"}}`;
+        res.locals.appPath = result.activity && result.activity.cover_url ? `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.discountmarketpro","params":{"id":"${id}","cover_url":"${result.activity.cover_url.split('?')[0]}","title":"${result.title}"}}` : '';
 
 
         res.render('sale/discount-detail', Object.assign(params.renderData, result, {
         res.render('sale/discount-detail', Object.assign(params.renderData, result, {
             localCss: true
             localCss: true

@@ -306,7 +306,7 @@ plusstar = {
             });
             });
         }, 300);
         }, 300);
     },
     },
-    goodsList: function() {
+    goodsList: function(reload) {
         let that = this,
         let that = this,
             skn = [];
             skn = [];
 
 
@@ -319,6 +319,10 @@ plusstar = {
             return false;
             return false;
         }
         }
 
 
+        if (!reload) {
+            $('.goods').append('<div class="divide">正在加载...</div>');
+        }
+
         loading.showLoadingMask();
         loading.showLoadingMask();
         skn = that.common.productSkns.slice((that.common.page - 1) *
         skn = that.common.productSkns.slice((that.common.page - 1) *
             that.common.pagesize, that.common.page * that.common.pagesize);
             that.common.pagesize, that.common.page * that.common.pagesize);
@@ -356,6 +360,7 @@ plusstar = {
                     PAGE_NUM: that.common.page - 1
                     PAGE_NUM: that.common.page - 1
                 });
                 });
 
 
+                $('.divide').remove();
                 $('.plusstar-resources .goods').append(data);
                 $('.plusstar-resources .goods').append(data);
 
 
                 $('.plusstar-resources .goods').find('img.lazy:not([src])').lazyload();
                 $('.plusstar-resources .goods').find('img.lazy:not([src])').lazyload();
@@ -399,6 +404,8 @@ $(function() {
 
 
     plusstar.init();
     plusstar.init();
 
 
+    plusstar.goodsList(true);
+
     // 滚动翻页
     // 滚动翻页
     $(window).scroll(function() {
     $(window).scroll(function() {
         scrollFn();
         scrollFn();

@@ -356,6 +356,10 @@ function filterInit() {
         url: '/product/sale/filter',
         url: '/product/sale/filter',
         data: defaultOpt,
         data: defaultOpt,
         success: function(data) {
         success: function(data) {
+            if (data === '') {
+                return false;
+            }
+
             $goodsContainer.append(data);
             $goodsContainer.append(data);
 
 
             // 初始化filter&注册filter回调
             // 初始化filter&注册filter回调

@@ -198,6 +198,15 @@
         .goods {
         .goods {
             background-color: #fff;
             background-color: #fff;
             padding: 0 14px;
             padding: 0 14px;
+
+            .divide {
+                float: left;
+                height: 50px;
+                width: 100%;
+                padding: 10px 0;
+                color: #ccc;
+                text-align: center;
+            }
         }
         }
     }
     }