Commit 1f2c248b24f13ebaa365ed86c72d4cedf10c8766

Authored by 后端研发-苏泰源
2 parents 85315725 7b3c7ca6

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

components/diy_luckyGo/diy_luckyGo.js
@@ -81,7 +81,7 @@ Component({ @@ -81,7 +81,7 @@ Component({
81 81
82 //--调用接口,读取秒杀-- 82 //--调用接口,读取秒杀--
83 app.request.promiseGet("/api/weshop/prom/luckyActivity/getGoodsList?store_id=" 83 app.request.promiseGet("/api/weshop/prom/luckyActivity/getGoodsList?store_id="
84 - + os.stoid + "&goodsidlist=" + goodsidlist + "&type="+ 1, {}).then(res => { 84 + + os.stoid + "&goodsidlist=" + goodsidlist + "&type=1&timetype=1&is_end=0", {}).then(res => {
85 console.log(res); 85 console.log(res);
86 //如果秒杀的数组为空的时候 86 //如果秒杀的数组为空的时候
87 var goodslist = res.data.data; 87 var goodslist = res.data.data;
pages/index/index/index.wxss
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
110 /* height: auto; */ 110 /* height: auto; */
111 border-radius: 16rpx; 111 border-radius: 16rpx;
112 overflow: hidden; 112 overflow: hidden;
  113 + min-height: 300rpx;
113 } 114 }
114 115
115 .swiperItem { 116 .swiperItem {