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

后端研发-苏泰源
2 parents 85315725 7b3c7ca6
Showing 2 changed files with 2 additions and 1 deletions
components/diy_luckyGo/diy_luckyGo.js
pages/index/index/index.wxss
@@ -81,7 +81,7 @@ Component({
  
           //--调用接口,读取秒杀--
           app.request.promiseGet("/api/weshop/prom/luckyActivity/getGoodsList?store_id="
-            + os.stoid + "&goodsidlist=" + goodsidlist + "&type="+ 1, {}).then(res => {
+            + os.stoid + "&goodsidlist=" + goodsidlist + "&type=1&timetype=1&is_end=0", {}).then(res => {
               console.log(res);
               //如果秒杀的数组为空的时候    
               var goodslist = res.data.data;
@@ -110,6 +110,7 @@
 	/* height: auto; */
 	border-radius: 16rpx;
 	overflow: hidden;
+	min-height: 300rpx;
 }
  
 .swiperItem {