Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents 5cf6508b e5bcde96
Showing 2 changed files with 16 additions and 11 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.js
@@ -574,8 +574,11 @@ Page({
         fir_quan = res1.data.data.pageData;
       })
     }
+
+
+    let arr = []
     //过滤不是本商品的单品优惠券-------------------
-    if (fir_quan.length > 0) {
+    if (fir_quan && fir_quan.length > 0) {
       let goodInfo = th.data.data || {}
       console.log('商品++++++++++++++++++++++');
       console.log(goodInfo);
@@ -586,14 +589,13 @@ Page({
           }
         }
       }
-    }
-    
-    let arr = []
-    let length = fir_quan.length
-    if (length <= 3) {
-      arr = fir_quan
-    } else {
-      arr = fir_quan.splice(0, 3);
+      
+      let length = fir_quan.length
+      if (length <= 3) {
+        arr = fir_quan
+      } else {
+        arr = fir_quan.splice(0, 3);
+      }
     }
     //--------获取视频图片---------
     await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, {
@@ -3078,7 +3078,8 @@ Page({
         isonsale: 1,
         is_on_sale: 1,
         pageSize: 500,
-        orderField: 'gg_ordid,goods_spec,sort'
+        orderField: 'gg_ordid,goods_spec,sort',
+        isnewwhere:1
       }
     }).then(res => {
       var e = res;
@@ -7873,7 +7874,9 @@ Page({
           }
         }
-
+        else{
+          func()
+        }
       }
     });
   },