Commit 7c4e3417f14bdc508d13d82250d628bf1730ed3f
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
2 changed files
with
16 additions
and
11 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -574,8 +574,11 @@ Page({ | @@ -574,8 +574,11 @@ Page({ | ||
574 | fir_quan = res1.data.data.pageData; | 574 | fir_quan = res1.data.data.pageData; |
575 | }) | 575 | }) |
576 | } | 576 | } |
577 | + | ||
578 | + | ||
579 | + let arr = [] | ||
577 | //过滤不是本商品的单品优惠券------------------- | 580 | //过滤不是本商品的单品优惠券------------------- |
578 | - if (fir_quan.length > 0) { | 581 | + if (fir_quan && fir_quan.length > 0) { |
579 | let goodInfo = th.data.data || {} | 582 | let goodInfo = th.data.data || {} |
580 | console.log('商品++++++++++++++++++++++'); | 583 | console.log('商品++++++++++++++++++++++'); |
581 | console.log(goodInfo); | 584 | console.log(goodInfo); |
@@ -586,14 +589,13 @@ Page({ | @@ -586,14 +589,13 @@ Page({ | ||
586 | } | 589 | } |
587 | } | 590 | } |
588 | } | 591 | } |
589 | - } | ||
590 | - | ||
591 | - let arr = [] | ||
592 | - let length = fir_quan.length | ||
593 | - if (length <= 3) { | ||
594 | - arr = fir_quan | ||
595 | - } else { | ||
596 | - arr = fir_quan.splice(0, 3); | 592 | + |
593 | + let length = fir_quan.length | ||
594 | + if (length <= 3) { | ||
595 | + arr = fir_quan | ||
596 | + } else { | ||
597 | + arr = fir_quan.splice(0, 3); | ||
598 | + } | ||
597 | } | 599 | } |
598 | //--------获取视频图片--------- | 600 | //--------获取视频图片--------- |
599 | await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, { | 601 | await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, { |
pages/goods/goodsInfo/goodsInfo.js
@@ -3078,7 +3078,8 @@ Page({ | @@ -3078,7 +3078,8 @@ Page({ | ||
3078 | isonsale: 1, | 3078 | isonsale: 1, |
3079 | is_on_sale: 1, | 3079 | is_on_sale: 1, |
3080 | pageSize: 500, | 3080 | pageSize: 500, |
3081 | - orderField: 'gg_ordid,goods_spec,sort' | 3081 | + orderField: 'gg_ordid,goods_spec,sort', |
3082 | + isnewwhere:1 | ||
3082 | } | 3083 | } |
3083 | }).then(res => { | 3084 | }).then(res => { |
3084 | var e = res; | 3085 | var e = res; |
@@ -7873,7 +7874,9 @@ Page({ | @@ -7873,7 +7874,9 @@ Page({ | ||
7873 | } | 7874 | } |
7874 | 7875 | ||
7875 | } | 7876 | } |
7876 | - | 7877 | + else{ |
7878 | + func() | ||
7879 | + } | ||
7877 | } | 7880 | } |
7878 | }); | 7881 | }); |
7879 | }, | 7882 | }, |