diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index 68b6117..aa8bd4b 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -17,9 +17,13 @@ Page({
 
     //------初始化加载----------
     onLoad: function(t) {
-		 wx.setNavigationBarTitle({ title: "商品秒杀",})
-		
+		wx.setNavigationBarTitle({ title: "商品秒杀",})
         var  first_leader = t.first_leader;
+		var type=t.type;
+		if(type!=undefined){
+		    this.setData({type:type});
+        }
+
 		var th=this;
 
         console.log("------------");
@@ -129,8 +133,17 @@ Page({
         });
 
         if(plist.length<=0){
+
           getApp().showWarning("没有更多数据");
           th.data.ismore=0;
+          if(e.data.currentPage==1 && this.data.type==1){
+              setTimeout(function () {
+                  th.data.ismore=1;
+                  th.setData({type:0});
+                  th.requestSalelist();
+              },1000);
+          }
+          return false;
         }
 
         //--循环读取接口---
@@ -147,7 +160,7 @@ Page({
           alllist.push(plist[i]);
         }
         e.data.currentPage++;
-     console.log("秒杀商品列表", alllist);
+        console.log("秒杀商品列表", alllist);
         th.setData({goodlist:alllist,isshow:1});
 
     },
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 0037753..cb8a935 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -84,11 +84,11 @@
     <view class="theader" >
         <view bindtap='tip' data-ty="1" class="xc-border-right flex-center timeac left {{type==1?'active':''}}">
         <image class="xc-bottom"
-        src="{{type==1?'{{url}}/miniapp/images/fire-red.png':'{{url}}/miniapp/images/fire-black.png'}}"></image>
+        src="{{url}}{{type==1?'/miniapp/images/fire-red.png':'/miniapp/images/fire-black.png'}}"></image>
         火热进行中</view>
         <view bindtap='tip' data-ty="0"  class=" flex-center timeac right {{type==0?'active':''}}">
         <image class="xc-bottom"
-        src="{{type==0?'{{url}}/miniapp/images/clock-rad.png':'{{url}}/miniapp/images/clock-black.png'}}"></image>
+        src="{{url}}{{type==0?'/miniapp/images/clock-rad.png':'/miniapp/images/clock-black.png'}}"></image>
         即将开始</view>
     </view>
 </view>