更新预售，新增预热时间

前端开发-熊洪亮
1 parent 51b6750c
Showing 7 changed files with 190 additions and 94 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.wxss
packageC/pages/presell/list/list.js
packageC/pages/presell/list/list.wxml
pages/index/index/index.js
pages/index/index/index.wxml
@@ -21,6 +21,9 @@ let self = null;
 Page({
   data: {
+    type: 0,
+    a_btn_type: true, //测试底部按钮显示
+
     start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始)
     color_type: 0, //线条控制
     color_type_one: 0,
@@ -2379,13 +2382,30 @@ Page({
   countDown(time, prom_st) {
     if (!this.data.is_timer) return false;
     var th = this;
+    var {presellForm:{start_time,show_time,end_time},presellForm} = this.data;
     // 获取当前时间，同时得到活动结束时间数组
     var endTime = time;
     var newTime = ut.gettimestamp();
     // 对结束时间进行处理渲染到页面
     var obj = null;
-    // 如果活动未结束，对时间进行处理
-    if (endTime - newTime > 0) {
+    var type = 0;
+    
+    if ( show_time && newTime>=show_time && newTime<start_time ) {
+      // 如果开启预热且在预热时间内
+      var time = (start_time - newTime);
+      // 获取天、时、分、秒
+      var day = parseInt(time / (60 * 60 * 24));
+      var hou = parseInt(time % (60 * 60 * 24) / 3600);
+      var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+      var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+      obj = {
+        day: this.timeFormat(day),
+        hou: this.timeFormat(hou),
+        min: this.timeFormat(min),
+        sec: this.timeFormat(sec)
+      }
+    } else if (endTime - newTime > 0) {
+      // 如果活动未结束，对时间进行处理
       var time = (endTime - newTime);
       // 获取天、时、分、秒
       var day = parseInt(time / (60 * 60 * 24));
@@ -2398,8 +2418,8 @@ Page({
         min: this.timeFormat(min),
         sec: this.timeFormat(sec)
       }
+      type = 1
     } else {
-
       //活动已结束，全部设置为'00'
       obj = {
         day: '00',
@@ -2407,19 +2427,20 @@ Page({
         min: '00',
         sec: '00'
       }
+
       th.setData({
         prom_time_text: '活动已经结束:',
-        prom_st: 3
+        prom_st: 3,
+        djs: obj,
+        type: 2
       })
-      th.setData({
-        djs: obj
-      });
-      return false;
+      return false;
     }
     th.setData({
-      djs: obj
+      djs: obj,
+      type: type
     });
     setTimeout(function () {
       th.countDown(endTime)
@@ -4716,6 +4737,7 @@ Page({
         presell_id: presell_id,
         goods_id: th.data.gid
       }
+      console.log('获取预售从表')
       //------获取预售从表----------
       await getApp().request.promiseGet(url, {
         data: rd
@@ -4730,6 +4752,7 @@ Page({
       })
     } else {
+      console.log('获取预售从表', 'pre_id', th.data.pre_id)
       //------获取预售从表----------
       await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + th.data.pre_id, {}).then(res => {
         if (res.data.code == 0 && res.data.data) {
@@ -4798,12 +4821,13 @@ Page({
         }
         if (act_data.start_time > ut.gettimestamp()) {
-          wx.showToast({ title: "活动还未开始", icon: 'none', duration: 3000 });
-          setTimeout(function () {
-            ut.wx_back();
-          }, 2000)
-          gnext = 0;
-          return false;
+          // wx.showToast({ title: "活动还未开始", icon: 'none', duration: 3000 });
+          // setTimeout(function () {
+          //   ut.wx_back();
+          // }, 2000)
+          // gnext = 0;
+          th.setData({ show: true });
+          // return false;
         }
         th.setData({
@@ -4838,11 +4862,12 @@ Page({
       }
     })
     if (!pre_arr) {
-      wx.showToast({ title: "当前会员身份不符或者时间已过期，无法参与", icon: 'none', duration: 3000 });
-      setTimeout(function () {
-        ut.wx_back();
-      }, 2000)
-      return false;
+      // wx.showToast({ title: "当前会员身份不符或者时间已过期，无法参与", icon: 'none', duration: 3000 });
+      // setTimeout(function () {
+      //   ut.wx_back();
+      // }, 2000)
+      th.setData({ show: true });
+      // return false;
     }
     if (func) {
       func();
@@ -74,7 +74,8 @@
       <view class="goo">
         <view class="pt_view rel">
           <!-- 许程 7. 24 -->
-          <image class="secondkill-img" src="{{iurl+'/miniapp/images/red_jx.png'}}"></image>
+          <image wx:if="{{type == 0}}" class="secondkill-img" src="{{iurl?iurl+'miniapp/images/blue_ks.png':''}}" />
+          <image wx:else class="secondkill-img" src="{{iurl?iurl+'miniapp/images/red_jx.png':''}}" />
           <!-- <view class=""> -->
           <!-- <view class="flex" style='height:40rpx; margin-top:5rpx;'> -->
           <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
@@ -88,28 +89,28 @@
           <block>
             <!-- </view> -->
-            <view class="hy-stop word-color fs26 abs">距活动结束还有</view>
+            <view class="hy-stop word-color fs26 abs cl_r {{type==0?'pre_cl':''}}">距活动{{type==0?'开始':'结束'}}还有</view>
             <view class="secview  flex abs fs24 " style="color: black;right: 3px; top:46rpx;">
               <block wx:if="djs.day">
-                <view class='day-val' style="color:#d40022;margin-top:-34rpx;">
+                <view class="day-val cl_r {{type==0?'pre_cl':''}}" style="margin-top:-34rpx;">
                   {{djs.day}}
                 </view>
-                <view class="day white" style="margin-top:-34rpx;margin-right:10rpx;color:#d40022">
+                <view class="day cl_r {{type==0?'pre_cl':''}}" style="margin-top:-34rpx;margin-right:10rpx;">
                   天
                 </view>
               </block>
-              <view class='xc-time-val white t-c' style="background:#d40022">
+              <view class="xc-time-val white t-c {{type==0?'pre_ba':''}}" >
                 {{djs.hou}}
               </view>
-              <view class="xc-time" style="color:#d40022">时</view>
-              <view class='xc-time-val white t-c' style="background:#d40022">
+              <view class="xc-time {{type==0?'pre_cl':''}}">时</view>
+              <view class="xc-time-val white t-c {{type==0?'pre_ba':''}}" >
                 {{djs.min}}
               </view>
-              <view class="xc-time" style="color:#d40022">分</view>
-              <view class='xc-time-val white t-c' style=";background:#d40022">
+              <view class="xc-time {{type==0?'pre_cl':''}}">分</view>
+              <view class="xc-time-val white t-c {{type==0?'pre_ba':''}}" >
                 {{djs.sec}}
               </view>
-              <view class="xc-time" style="color:#d40022">秒</view>
+              <view class="xc-time {{type==0?'pre_cl':''}}">秒</view>
             </view>
           </block>
         </view>
@@ -128,11 +129,11 @@
             </view>
           </view>
           <view wx:if="{{presellForm.presell_type==0}}" class="fs24" style="padding-bottom:20rpx">
-            <view class="stock" style="color:#999">尾款：{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}}</view>
+            <view class="stock" style="color:#999">尾款:{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}}</view>
           </view>
           <view class="goods-num">
             <block wx:if="{{presellList.virtual_qty}}">
-              <view class="stock">总数量：{{presellList.presell_sumqty+presellList.virtual_qty}}件</view>
+              <view class="stock">总数量:{{presellList.presell_sumqty+presellList.virtual_qty}}件</view>
               <view class="stock" wx:if="{{presellList.vip_butyqty}}">限购:{{presellList.vip_butyqty}}件</view>
               <view class="stock" wx:else>限购:不限</view>
               <view class="sales">已购:{{presellList.buy_goodnum+presellList.virtual_qty}}件</view>
@@ -209,7 +210,7 @@
         </view>
         <scroll-view scroll-x="true" class="pj_scroll">
           <view class="flex">
-            <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="fir_comments">
+            <view class="xc_comment-detail" wx:for="{{fir_comments}}" wx:key="fir_comments">
               <view class="xc_comment-left">
                 <view class="xc_comment-user">
                   <view class="xc_user-img">
@@ -219,7 +220,7 @@
                     <view class="xc_user-name five-level-word">
                       {{item.is_anonymous!=1?item.username:'匿名'}}
                     </view>
-                    <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+                    <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="rank"></image>
                   </view>
                 </view>
                 <view class="xc_comment-font pj_word_size ellipsis-1 pdt12">
@@ -434,7 +435,7 @@
                 <view class="middle-user">
                   {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}
                 </view>
-                <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+                <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="index"></image>
               </view>
             </view>
             <view class="xc-pirces">
@@ -450,12 +451,12 @@
             </view>
             <view class="img-ul">
               <block wx:if="{{item.source_type==0}}">
-                <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">
+                <view class="img-li" wx:for="{{item.img}}" wx:key="index">
                   <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image>
                 </view>
               </block>
               <block wx:if="{{item.source_type==1}}">
-                <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
+                <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="index" wx:for-item="aitem">
                   <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}" data-id="{{index}}" src="{{aitem}}"></image>
                 </view>
               </block>
@@ -474,7 +475,7 @@
           <view class="reply rel" wx:if="{{item.replay_list}}">
             <view class="line_bulge"></view>
             <view class="shop-reply">店家回复:</view>
-            <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
+            <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="index">
               {{r_item.content}}
             </view>
           </view>
@@ -529,7 +530,8 @@
     </navigator>
   </view>
-  <view class="fs24 f1 flex ai-center bg-FF4732 t-c white" style="border-radius:10rpx;justify-content: center">
+  <view wx:if="{{type == 0}}" class="buy-btn cart-btn cart-btn-lg lanse set_width" style="border-radius: 56rpx;">即将开始</view>
+  <view wx:else class="fs24 f1 flex ai-center bg-FF4732 t-c white" style="border-radius:10rpx;justify-content: center">
     <view style="padding: 0 6rpx">
       <view class="">{{filters.format_time(presellForm.end_time,2)}} 预售结束</view>
       <!-- <view class="">08.30 23:59:59 开始发货</view> -->
@@ -721,7 +723,7 @@
         {{sec_sto.name}}
       </view>
       <view class="itemlists" hidden="{{is_sec_mend==0}}">
-        <view wx:for="{{sec_sto.s_arr}}" wx:key="{{index}}" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">
+        <view wx:for="{{sec_sto.s_arr}}" wx:key="index" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">
           {{item.pickup_name}}
         </view>
       </view>
@@ -735,7 +737,7 @@
   <view class="prom-model">
     <icon bindtap="closePromModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
     <view class="prom-title">优惠信息</view>
-    <view class="logistics-item" wx:for="{{select.activity.data}}" wx:key="{{index}}">
+    <view class="logistics-item" wx:for="{{select.activity.data}}" wx:key="index">
       <view class="item-title">
         <text class="prom-item">{{item.title}}</text>
       </view>
@@ -759,7 +761,7 @@
       <view class="top-frame">
         <view class="xc-coupon-frame ">
           <!-- -单张的券- -->
-          <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}">
+          <view class="rel" wx:for="{{quan_list}}" wx:key="index">
             <view class="coupon flex">
               <view class="circle xc-circular-one"></view>
               <view class="xc-coupon-left ">
@@ -817,7 +819,7 @@
         <block wx:if="{{choice_sort_store==0}}">
           <!-- 需要for循环 -->
           <block wx:if="{{is_show_sto_cat==1}}">
-            <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+            <view class="store_choose flex" wx:for="{{def_pickpu_list}}" wx:key="dpl" bindtap="choose_for_store_fir" data-ind="{{index}}">
               <view class="store flex-vertical">
                 <!-- 需要点击事件 -->
                 <block wx:if="{{index==fir_pick_index}}">
@@ -843,7 +845,7 @@
             </view>
           </block>
           <block wx:else>
-            <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+            <view class="store_choose flex" wx:for="{{only_pk}}" wx:key="olpk" bindtap="choose_for_store_fir" data-ind="{{index}}">
               <view class="store flex-vertical">
                 <!-- 需要点击事件 -->
                 <block wx:if="{{index==fir_pick_index}}">
@@ -871,7 +873,7 @@
         </block>
         <block wx:else>
           <!-- 如果是点击选择门店分类后显示分类下的门店 -->
-          <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
+          <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" wx:key="sec_arr" data-ind="{{index}}" bindtap="choose_for_store">
             <view class="store flex-vertical">
               <!-- 需要点击事件 -->
               <block wx:if="{{index==sec_pick_index}}">
@@ -922,7 +924,7 @@
         </view>
       </view>
       <view class="sort_store_list">
-        <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
+        <view class="sort-store-frame" wx:for="{{all_sto}}" wx:key="all_sto" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
           <view class="sort-store flex-vertical-between">
             <view class="fs30" di>{{item.name}}</view>
             <view class="black_rights-frame">
@@ -2361,8 +2361,30 @@ margin-top:5rpx;
   top: -23rpx;
   right: 56rpx;
 }
-.xc-time-val{width:36rpx;height:36rpx;border-radius:7rpx; line-height: 36rpx;}
-.xc-time{margin-right:10rpx; margin-left:10rpx; margin-top:-32rpx;
+.xc-time-val{
+  width:36rpx;
+  height:36rpx;
+  border-radius:7rpx;
+  line-height: 36rpx;
+  background:#d40022;
+}
+.xc-time{
+  margin-right:10rpx;
+  margin-left:10rpx;
+  margin-top:-32rpx;
+  color: #d40022;
+}
+.ba_r {
+  background:#d40022;
+}
+.cl_r {
+  color: #d40022;
+}
+.pre_ba {
+  background:#0097e0;
+}
+.pre_cl {
+  color: #0097e0;
 }
 .xc-goods-explain{
   width:100%;
@@ -2947,7 +2969,7 @@ button.custom-service::after{
     /* position: absolute; */
     display: flex;
     align-items: center;
-    /* justify-content: center; */
+    justify-content: center;
     border-radius: 60rpx;
     background-color: rgba(0,0,0,.4);
     /* position: absolute; */
@@ -11,7 +11,7 @@ Page({
         isshow: 0,
         ad_data: null,
         max_sw_height: 200,
-        type: 1,
+        type: 0,
     },
     //------初始化加载----------
@@ -136,7 +136,7 @@ Page({
             store_id: os.stoid,
             page: this.data.page,
             pageSize: 10,
-            timetype: self.data.type,
+            // timetype: self.data.type,
             isuse:1
         }
         if(getApp().globalData.userInfo){
@@ -150,12 +150,20 @@ Page({
         getApp().request.get("/api/weshop/marketing/marketingPresellList/page", {
             data: req,
             success: function (res) {
+                let now = ut.gettimestamp();
                 self.data.loading = 0;
                 if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
                     var list = self.data.goodlist ? self.data.goodlist : [];
                     var arr = res.data.data.pageData;
                     //数组合起来
                     for (var i in arr) {
+                        arr[i].type =  arr[i].show_time&&(now>=arr[i].show_time&&now<arr[i].start_time)?0:(now>arr[i].start_time&&now<arr[i].end_time)?1:2;
+                        arr[i].djs = { 
+                          day: '00',
+                          hou: '00',
+                          min: '00',
+                          sec: '00',
+                        };
                         list.push(arr[i]);
                     }
                     self.data.page++;
@@ -215,36 +223,49 @@ Page({
     if(endTimeList==null) return null
     // 对结束时间进行处理渲染到页面
     for (var i = 0; i < endTimeList.length; i++){
-         var o = endTimeList[i];
-         var endTime = o.start_time;
-         let obj = null;
-         // 如果活动未结束，对时间进行处理
-         if (endTime - newTime > 0){
-              let time = (endTime - newTime);
-              // 获取天、时、分、秒
-              let day = parseInt(time / (60 * 60 * 24));
-              let hou = parseInt(time % (60 * 60 * 24) / 3600);
-              let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-              let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
-              obj = {
-                day: this.timeFormat(day), 
-                hou: this.timeFormat(hou), 
-                min: this.timeFormat(min), 
-                sec: this.timeFormat(sec), 
-                hide: 1
-              }
-          }else{
-             //活动已结束，全部设置为'00'
-           obj = { 
-               day: '00', 
-               hou: '00', 
-               min: '00', 
-               sec: '00' 
+        var o = endTimeList[i];
+        var endTime = o.start_time;
+        let obj = null;
+        var type = 1;
+        var tend = false;
+        // if (o.show_time && newTime < endTime && newTime >= o.show_time) {
+        //   type = 0;
+        // }
+        // 如果活动未结束，对时间进行处理
+        if (o.show_time && newTime < endTime && newTime > o.show_time){
+            let time = (endTime - newTime);
+            // 获取天、时、分、秒
+            let day = parseInt(time / (60 * 60 * 24));
+            let hou = parseInt(time % (60 * 60 * 24) / 3600);
+            let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+            let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+            obj = {
+              day: this.timeFormat(day), 
+              hou: this.timeFormat(hou), 
+              min: this.timeFormat(min), 
+              sec: this.timeFormat(sec), 
+              hide: 1
             }
+            type = 0;
+        }else{
+          //活动已结束，全部设置为'00'
+          obj = { 
+              day: '00', 
+              hou: '00', 
+              min: '00', 
+              sec: '00' 
           }
-          var txt ="goodlist["+i+"].djs";
-          th.setData({ [txt]: obj});
+          tend = true
         }
+        var txt ="goodlist["+i+"].djs";
+        var typ ="goodlist["+i+"].type";
+        var end ="goodlist["+i+"].end";
+        th.setData({ 
+          [txt]: obj,
+          [typ]: type,
+          [end]: tend,
+        });
+    }
    },
    go_url(e){
         let url=e.currentTarget.dataset.url;
@@ -6,7 +6,7 @@
    <swiper class="swiper" circular="true"  autoplay="true"
              indicator-dots="true" interval="2500" style="height:{{max_sw_height}}rpx" >
-      <block wx:for="{{ad_data}}">    
+      <block wx:for="{{ad_data}}" wx:key="as">    
           <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
             <swiper-item>
@@ -26,7 +26,7 @@
 <view class="kill-list seckill_list"> 
-    <view class="kill-item" wx:for="{{goodlist}}">
+    <view class="kill-item" wx:for="{{goodlist}}" wx:key="gs">
         <navigator class="kill-pic rel" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">
             <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
                 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
@@ -37,9 +37,10 @@
             <view class="flex-vertical xc-strip-frame">
             <view class="xc-strip-blank rel">
-            <view class="flex-vertical rel total" style="background-color: {{type == 0 ? '#059de5' : ''}};">
-               <view class="t-c abs xc-fill" ></view>
-               <text class="fs20 white abs xc-fill-text">已预售0%</text>
+            <view class="flex-vertical rel total" style="background-color: {{item.type == 0 ? '#059de5' : item.type == 1 ? '#ffe3e2' :  ''}};">
+               <view wx:if="{{item.type == 1}}" class="t-c abs xc-fill" style="background: #e4374d;width: calc({{filters.toFix(100-(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)||100}} * 1%);"></view>
+               <text wx:if="{{item.type == 1}}" class="fs20 white abs xc-fill-text">剩余{{filters.toFix(100-(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)||100}}%</text>
+               <text wx:else class="fs20 white abs xc-fill-text">已预售{{filters.toFix((item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)||0}}%</text>
             </view>
             </view>
@@ -48,23 +49,24 @@
             <view class="goods-num">
                 <view>
-                    <view class="blue_c" wx:if="{{type == 0}}"> 
-                    <text>剩余:</text>
-                        <text class='tui-conutdown-box'> {{item.djs.day}}</text>天
+                    <view class="blue_c" wx:if="{{item.type == 0 && false}}" style="display: none;position: absolute;margin-top: -40rpx;">
+                        <text>剩余：</text>
+                        <text class='tui-conutdown-box'>{{item.djs.day}}</text>天
                         <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时
                         <text class='tui-conutdown-box'>{{item.djs.min}}</text>分
                         <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒
                     </view>
-                    <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
+                    <view class="fs40 flex xc-buttom-money {{item.type==1?'xc-wc':'blue_c'}}" >
                     <view class="fs28" style="line-height: 16px;">￥{{item.presell_price}}</view>
                     <text>{{item.price}}</text> 
 <!--                    <span class="underline fs20">零售价￥{{item.market_price}}</span>-->
                     </view>
                 </view>
                 <view class="kill-btn ">
-                    <navigator wx:if="{{type==1}}" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
-                    <navigator wx:else url="/packageC/pages/presell/pregoodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}" style="background:#059de5;"><view style="color:#fff;">即将开始</view></navigator>
+                    <navigator wx:if="{{item.type==1}}" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
+                    <!-- <navigator wx:else url="/packageC/pages/presell/pregoodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}" style="background:#059de5;"><view style="color:#fff;">即将开始</view></navigator> -->
+                    <navigator wx:else url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}" style="background:#059de5;"><view style="color:#fff;">即将开始</view></navigator>
                 </view>
             </view>
@@ -361,7 +361,8 @@ Page({
 		console.log(this.data.isTemplate, '首页');
 		if (!this.data.isTemplate) {
-			var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1 };
+      // timetype: 1 仅查询已预售 置空查询全部,
+			var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1 };
 			if (user_id) {
 				pre_data.user_id = user_id;
 			}
@@ -370,7 +371,25 @@ Page({
 				data: pre_data,
 				success: function (e) {
 					if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) {
-						var pre_data = e.data.data.pageData;
+            var pre_data = e.data.data.pageData;
+            //当前时间戳
+            var st = ut.gettimestamp();
+
+            pre_data.forEach(function (val, ind) {
+
+              if (val.user_price) val.price = val.user_price;
+              if (val.start_time > st) {
+                pre_data[ind].status = 0;
+              } else if (val.end_time > st) {
+                pre_data[ind].status = 1;
+              } else {
+                pre_data[ind].status = 2;
+              }
+
+              // if (val.buy_num >= val.goods_num) {
+              //   pre_data[ind].status = 2;
+              // }
+            });
 						var arr = new Array();
 						//--三个三个一组---
 						for (var i = 0; i < pre_data.length; i += 3) {
@@ -145,7 +145,7 @@
 		</navigator>
 		<view class="seckill-list">
 			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange">
-				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="padding: 0; margin-left: 10rpx">
+				<swiper-item wx:for="{{saleGoods}}" class="p_swiper" wx:key="saleGoods" style="padding: 0; margin-left: 10rpx">
 						<navigator style="flex-shrink: 0;width: 247rpx" class="nav" hover-class="none" url="{{aitem.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id):('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id )}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
 								<view class="imgview">
 									<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
@@ -189,8 +189,13 @@
 					<navigator bindtap="go_pre" class="nav" hover-class="none"
                                data-url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&pre_id={{aitem.id}}"
                                wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
-						<view class="imgview presell">
+						<!-- <view class="imgview presell"> -->
+						<view class="imgview">
 							<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="preGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
+
+              <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"/>
+              <image wx:elif="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"/>
+              <image wx:else="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"/>
 						</view>
 						<view class="ellipsis-2 mar-top10" style="height: 75rpx; width: 200rpx">{{aitem.act_name}}</view>
 						<view class="co-red mar-top10 flex jc_sb ali-c">
@@ -401,7 +406,7 @@
   </view>
-  <block wx:for="{{template_arr}}" wx:key="{{index}}">
+  <block wx:for="{{template_arr}}" wx:key="index">
     <view>
       <!--导航-->
       <block wx:if="{{item.ename=='nav'}}">