秒杀调整

pages/home/home.js

@@ -57,7 +57,8 @@ Page ({
     todaysend: Date.parse(new Date()) / 1000,
     showtime: '',
     projects_more:true,
-    userinfo:{}
+    userinfo:{},
+	nowseckill_data:''
   },
   onLoad: function () {
     // this.getzhunongList()
@@ -342,7 +343,16 @@ Page ({
         // var leftTime = end - now; //时间差
         var t = Date.parse(new Date())
         t = t / 1000;
-        var leftTime = that.data.clock - t
+		
+		var leftTime;
+		if(that.data.nowseckill_data['state'] == 'seckill'){
+			leftTime = that.data.clock - t
+		}else if(that.data.nowseckill_data['state'] == 'preparing'){
+			leftTime = that.data.nowseckill_data['start_time'] - t
+		}
+        
+		
+		
         var d, h, m, s, ms;
         if (leftTime >= 0) {
           // day = parseInt(ctime / 86400)
@@ -422,39 +432,59 @@ Page ({
     var success = function (res) {
       var seclist = res.data.ret_item_list
       var singleNavWidth = that.data.windowWidth / 5
-      for (var index in seclist) {
+      // for (var index in seclist) {
+      //   if (seclist[index].state == 'seckill') {
+      //     that.setData({
+      //       firsttime: seclist[index].date_format,
+      //       clock: seclist[index].end_time,
+      //       // navScrollLeft: singleNavWidth,
+      //       toView: 'a' + seclist[index].date_format,
+      //       changeshow: 'seckill'
+      //     })
+      //   }
+      //   if (seclist[index].state == 'end' && seclist[index].date_format == that.data.currentTab) {
+      //     that.setData({
+      //       toView: 'a' + seclist[index].date_format,
+      //       changeshow: 'end'
+      //     })
+      //   }
+      //   if (seclist[index].state == 'preparing' && seclist[index].date_format == that.data.currentTab) {
+      //     var nowtime = util.formatTime(new Date(seclist[index].start_time * 1000))
+      //     that.setData({
+      //       toView: 'a' + seclist[index].date_format,
+      //       changeshow: 'preparing',
+      //       showtime: nowtime.substring(11,13),
+      //     })
+      //   }
+      //   if (seclist[index].state == 'none' && seclist[index].date_format == that.data.currentTab) {
+      //     that.setData({
+      //       toView: 'a' + seclist[index].date_format,
+      //       changeshow: 'none'
+      //     })
+      //   }
+      // }
+	  
+	  var nsdata;
+	  for (var index in seclist) {
         if (seclist[index].state == 'seckill') {
-          that.setData({
-            firsttime: seclist[index].date_format,
-            clock: seclist[index].end_time,
-            // navScrollLeft: singleNavWidth,
-            toView: 'a' + seclist[index].date_format,
-            changeshow: 'seckill'
-          })
-        }
-        if (seclist[index].state == 'end' && seclist[index].date_format == that.data.currentTab) {
-          that.setData({
-            toView: 'a' + seclist[index].date_format,
-            changeshow: 'end'
-          })
-        }
-        if (seclist[index].state == 'preparing' && seclist[index].date_format == that.data.currentTab) {
-          var nowtime = util.formatTime(new Date(seclist[index].start_time * 1000))
-          that.setData({
-            toView: 'a' + seclist[index].date_format,
-            changeshow: 'preparing',
-            showtime: nowtime.substring(11,13),
-          })
-        }
-        if (seclist[index].state == 'none' && seclist[index].date_format == that.data.currentTab) {
-          that.setData({
-            toView: 'a' + seclist[index].date_format,
-            changeshow: 'none'
-          })
+          nsdata = seclist[index];
+		  var showtime = util.formatTime(new Date(nsdata['start_time']* 1000));
+		  nsdata['showtime'] = showtime.substring(11,13);
+		  nsdata['clock'] = seclist[index].end_time;
+		  break;
+        }else if (seclist[index].state == 'preparing') {
+          nsdata = seclist[index];
+		  var showtime = util.formatTime(new Date(nsdata['start_time'] * 1000));
+		  nsdata['showtime'] = showtime.substring(11,13)
+		  break;
         }
       }
+	  
+	  console.log('nsdata',nsdata);
       that.setData({
         seckilltimelist: seclist,
+		clock:nsdata['clock'],
+		nowseckill_data:nsdata
       })
       that.getkillgoods()
       that.starttime()
@@ -465,7 +495,7 @@ Page ({
     var that = this
     var url = 'v1/seckill/products'
     var params = {
-      query_date: that.data.firsttime,
+      query_date: that.data.nowseckill_data != '' ? that.data.nowseckill_data['date_format'] : '',
       cache: false
     }
     var success = function (res) {

pages/home/home.wxml

@@ -86,11 +86,13 @@
         <view class="clean"></view>
       </view>
     </view>
-    <view class="seckill" wx:if="{{seckilltimelist.length > 0}}">
+    <view class="seckill" wx:if="{{nowseckill_data != ''}}">
+	
+	<!-- new -->
       <view class="seckill-top">
         <view class="seckill-title">
           <view class="seckill-time">
-            <view wx:if="{{changeshow === 'seckill'}}">
+            <view wx:if="{{nowseckill_data['state'] === 'seckill'}}">
               <view class="time-click">
                 <!--<view class="time-item time-kuang1">{{msecond}}</view>-->
                 <view class="time-item time-kuang">{{second}}</view>
@@ -101,6 +103,41 @@
               </view>
               <view class="time-text">本期剩余时间</view>
             </view>
+            <view wx:if="{{nowseckill_data['state'] === 'preparing'}}">
+              <!-- <view wx:if="{{nowseckill_data['showtime'] == 12}}" class="time-text" style="font-weight:600;padding-right:0">当天<text style="color:#f85550">中午{{nowseckill_data['showtime']}}点</text>开始 , 敬请期待 ! </view>
+              <view wx:if="{{nowseckill_data['showtime'] < 12}}" class="time-text" style="font-weight:600;padding-right:0">当天<text style="color:#f85550">早上{{nowseckill_data['showtime']}}点</text>开始 , 敬请期待 ! </view>
+              <view wx:if="{{nowseckill_data['showtime'] > 12 && nowseckill_data['showtime'] <= 18}}" class="time-text" style="font-weight:600;padding-right:0">当天<text style="color:#f85550">下午{{nowseckill_data['showtime']}}点</text>开始 , 敬请期待 ! </view>
+              <view wx:if="{{nowseckill_data['showtime'] > 18}}" class="time-text" style="font-weight:600;padding-right:0">当天<text style="color:#f85550">晚上{{nowseckill_data['showtime']}}点</text>开始 , 敬请期待 ! </view> -->
+			 
+			  <view class="time-click">
+			    <!--<view class="time-item time-kuang1">{{msecond}}</view>-->
+			    <view class="time-item time-kuang">{{second}}</view>
+			    <view class="time-item time-color"> : </view>
+			    <view class="time-item time-kuang">{{min}}</view>
+			    <view class="time-item time-color"> : </view>
+			    <view class="time-item time-kuang">{{hour}}</view>
+			  </view>
+			  <view class="time-text">距离秒杀开始时间</view>
+            </view>
+          </view>
+        </view>
+        <view><image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/neverse/seckill.png" class="seckill-img" /></view>
+      </view>
+	  
+	  <!-- old -->
+	  <!-- <view class="seckill-top">
+        <view class="seckill-title">
+          <view class="seckill-time">
+            <view wx:if="{{changeshow === 'seckill'}}">
+              <view class="time-click">
+                <view class="time-item time-kuang">{{second}}</view>
+                <view class="time-item time-color"> : </view>
+                <view class="time-item time-kuang">{{min}}</view>
+                <view class="time-item time-color"> : </view>
+                <view class="time-item time-kuang">{{hour}}</view>
+              </view>
+              <view class="time-text">本期剩余时间</view>
+            </view>
             <view wx:if="{{changeshow === 'end'}}">
               <view class="time-text" style="font-weight:600;padding-right:0">本期已结束</view>
             </view>
@@ -116,8 +153,8 @@
           </view>
         </view>
         <view><image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/neverse/seckill.png" class="seckill-img" /></view>
-      </view>
-      <view class="seckill-scrol">
+      </view> -->
+      <!-- <view class="seckill-scrol">
         <scroll-view scroll-x="true" class="time-nav" scroll-into-view="{{toView}}" scroll-left="{{navScrollLeft}}" scroll-with-animation="{{true}}">
           <view class="time-part" wx:for="{{seckilltimelist}}" wx:for-index="idx" wx:key="{{idx}}" id="a{{item.date_format}}">
             <view class="{{currentTab === item.date_format ?'active':''}}" data-val="{{idx}}" data-current="{{item.state}}" data-showtime="{{item.start_time}}" data-time="{{item.date_format}}" wx:show="{{!change}}" bindtap="switchtime">
@@ -130,7 +167,7 @@
             </view>
           </view>
         </scroll-view>
-      </view>
+      </view> -->
       <view>
         <view class="seckill-teambuy" wx:if="{{false}}">
           <view class="teambuy-top">