diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 1bbfb29..810ad76 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -73,6 +73,7 @@ Component({
        reset:function(){
          curPage=1;
        },
+    
 
 
     },
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index bcdb55c..1f8dfd5 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -4,6 +4,7 @@
       <view class="hang ">
         <!-- 商品详情 --> 
         <view class="collect ib"  wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
           <!-- 商品图片 -->  
           <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill"  binderror="bind_bnerr_xc" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
           <view class="bottom">
@@ -23,6 +24,7 @@
               </view>
             </view>
           </view>
+            </navigator>
         </view>
       </view>
       <view class="nothing flex-center" wx:if="{{is_no_more==0}}">
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index 4e11cc2..469bc0b 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -102,6 +102,7 @@ Page({
           alllist.push(plist[i]);
         }
         e.data.currentPage++;
+     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 f9f8504..0d65de3 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -1,3 +1,4 @@
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <block wx:if="{{isshow}}">
 <view class=" body_frame">
 
@@ -5,7 +6,7 @@
 </image>
 
 
-<view class="kill-list abs seckill_list">
+<view class="kill-list abs seckill_list"> 
     <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide}}" >
         <navigator class="kill-pic rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
         <image class="abs xc-miaosha" src="{{url}}/miniapp/images/zms.png"></image>
@@ -18,13 +19,13 @@
             <view class="xc-strip-blank rel">
 
             <view class="flex-vertical rel total">
-             <view class="t-c abs xc-fill"style="width:{{type==1?100-item.buy_num/item.goods_num*100:'100'}}%;background:{{type==1?'#e4374d':'#059de5'}};">
+             <view class="t-c abs xc-fill"style="width:{{type==1?100-(item.buy_num+item.virtual) /(item.goods_num+item.virtual)*100:'100'}}%;background:{{type==1?'#e4374d':'#059de5'}};">
              </view>
-               <text class="fs20 white abs xc-fill-text" style="">剩余{{type==1?100-item.buy_num/item.goods_num*100:'100'}}%</text>
+               <text class="fs20 white abs xc-fill-text" style="">剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/(item.goods_num+item.virtual)*100,0):'100'}}%</text>
             </view>
            
             </view>
-            <view class=" ml10 fs20 " > 已抢{{item.buy_num}}件</view>  
+            <view class=" ml10 fs20 " > 已抢{{item.buy_num+item.virtual}}件</view>  
            </view>
 
 
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index dba5888..7dca225 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -9,7 +9,7 @@ Page({
       windowHeight:0,
       windowWidth: 0,
       eachLetterHeight:0,
-      lettersPosition:0,
+      lettersPosition:0, 
       catelist:null,   //分类读取
       nationlist: null,//国家读取
       groups: null,    //品牌读取
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 2c273f7..b8dd516 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -8,7 +8,7 @@ var t = require("../../../utils/util.js"),
   oo = s.globalData,
   o = s.globalData.setting,
   os = o;
-//评价加载更多
+//评价加载更多 
 var more = function(e) {
     return e && e.__esModule ? e : {
       default: e
@@ -1376,6 +1376,7 @@ Page({
                   prom_start_time: prom_start_time,
                   isshow:1,
                 });
+                
 
                 var newTime = ut.gettimestamp();
                 var endTime2 = t.data.data.end_time;
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 457321e..3e8d5a5 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -266,7 +266,7 @@
                   </view>
                   <view class="word-line fs24 xc-unit-price">零售价￥{{data.market_price}}</view>
                 </view>
-                <view class="xc-val-price">
+                <view class="xc-val-price"> 
                   <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
                   <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view>
                 </view>
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index c9beabd..4422ca4 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -48,7 +48,7 @@ Page({
        //扫一扫过来，显示搜索的内容
        var s_key = t.s_key;
        if (s_key){
-         this.search(s_key); his.openSearchModal();
+         this.search(s_key); this.openSearchModal();
          return;
        }
 
@@ -81,7 +81,7 @@ Page({
     requestSearch: function(t) {
         var a = this;
         console.log('requestSearch');
-        console.log(t);
+        console.log(t,"扫描商品的搜索商品1111111111111111111111111111");
 
         this.data.requestUrl = t, 
         //t += "&orderField=" + a.data.tabname;
@@ -144,6 +144,7 @@ Page({
 
     //-----点击搜索按钮----
     search: function(t) {
+      console.log(t,"是什么的");
         if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
         this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
     },
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index e1f498c..c75cbfa 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -565,8 +565,9 @@ Page({
     wx.scanCode({
       success: (res) => {
           var result = res.result;
+        console.log(res,"是什么所扫码的内容"+result);
           wx.navigateTo({
-            url: "/pages/goods/search/search?s_key=" + result,
+            url: "/pages/goods/search/search?s_key="+result,
           });
       }
     })
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index f194b81..b7f9d7a 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -148,7 +148,7 @@
                             <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
                         </view>
                         <view class="ellipsis-2">{{aitem.title}}</view>
-                        <view class="red-co mar-top10"> <text class="fs20">￥</text>{{aitem.price}}
+                        <view class="red-co mar-top10 is_seckill_height" > <text class="fs20">￥</text>{{aitem.price}}
                             <text class="un_line">￥{{aitem.market_price}}</text>
                         </view>
                     </navigator>
@@ -161,7 +161,7 @@
         </view>
     </view>
     <!----拼单---->
-    <view class="seckill" wx:if="{{pindGoods!=null && pindGoods.length!=0 }}">
+    <view class="seckill assemble-top-border" wx:if="{{pindGoods!=null && pindGoods.length!=0 }}">
         <navigator url="/pages/activity/pind_list/pind_list">
             <view class="seckill-time">
                 <view class="classname flex">
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 0b28386..3c94dbd 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -65,7 +65,7 @@ left: 10%;
 }
 .s_prom{
     width: 100%;
-    height: 380rpx;
+    height: 340rpx;
 }
 .s_proms{
     width: 100%;
@@ -265,7 +265,7 @@ left: 10%;
 
 .seckill-list view.imgview{
     width: 203rpx;
-    height: 226rpx;
+    height: 210rpx;
     position: relative;
     overflow: hidden;
    
@@ -518,7 +518,7 @@ margin-top: 10rpx;
 
 .title .China {
   width: 100%;
-  margin-top: 50rpx;
+  margin-top: 10rpx;
   margin-bottom: 10rpx;
   line-height: 0rpx;
 }
@@ -715,4 +715,14 @@ margin-top: 4rpx;
 }
 .time-blue{
 margin-left: 10rpx;
-}
\ No newline at end of file
+}
+.is_seckill_height{
+ height:40rpx;line-height:32rpx;
+}
+
+
+.assemble-top-border{
+  border-top: 10rpx solid #eee;
+  padding-top:20rpx;
+  margin-top:0rpx;
+}