From bb0d9f77b3700effceda938d017093cc069cd784 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Wed, 25 Sep 2019 09:45:43 +0800
Subject: [PATCH] 首页拼单修改

---
 pages/index/index/index.js   | 42 +++++++++++++++++++++++++++++++-----------
 pages/index/index/index.wxml | 24 +++++++++++++++++-------
 pages/index/index/index.wxss | 11 +++++++++--
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 4e5aa69..8422c53 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -75,8 +75,11 @@ Page({
    
 
   },
+  
+  
   async onShow() {
     var th=this;
+    
     await this.init_load();
     //显示的时候要开启计时器
     this.data.is_timer = 1;
@@ -117,7 +120,7 @@ Page({
       }
     })
   },
-
+  
   //当隐藏的时候就关闭计时器
   onHide:function(){
     this.data.is_timer=0;
@@ -141,8 +144,8 @@ Page({
             th.setData({ template_arr: t_arr, isTemplate: 1, bgcolor_t: temp_data.bkcolor});
           }
       })
-      console.log("init_load");
-      console.log(getApp().globalData.config);
+      
+     
       //--首页的问题--
       if(getApp().globalData.config && getApp().globalData.config.store_name!=undefined && getApp().globalData.config.store_name!=null ){
          wx.setNavigationBarTitle({
@@ -192,8 +195,7 @@ Page({
         flash_data = e.data.data.pageData;
         if (flash_data == null || flash_data.length <= 0) return false;
 
-        console.log('flash_data');
-        console.log(flash_data);
+        
         //当前时间戳
         var nt = ut.gettimestamp();
         console.log(nt);
@@ -212,7 +214,7 @@ Page({
         th.setData({
           saleGoods: arr
         });
-        th.countDown();
+        //th.countDown();
       }
     });
 
@@ -228,27 +230,39 @@ Page({
       var e = res;
       if (e.data.code == 0) {
         var pd_data = e.data.data.pageData;
-        console.log("拼团列表的所有的数据在这里", pd_data);
+      
         if (pd_data.length == 0) return;
-
-        //当前时间戳
+      
+        //获取当前
         var nt = ut.gettimestamp();
         pd_data.forEach(function (val,ind) {
           if(val.start_time>nt) pd_data[ind].status=0;
           else if(val.end_time>nt) pd_data[ind].status=1;
           if(val.buy_num>=val.goods_num) pd_data[ind].status=2;
         });
-
+       
+       //获取当前时间，比较拼团中还在未开始
+        var timestamp = new Date().getTime();
+        var is_team_tepy;
+        for (var j = 0; j < pd_data.length;j++ ){
+          pd_data[j].is_team_tepy = 1;
+          if (timestamp<pd_data[j].start_time*1000){
+            var is_team_tepy;
+            pd_data[j].is_team_tepy = 0;
+         }
+        }
+       
         var arr = new Array();
         //--2个2个一组---
         for(var i=0;i< pd_data.length;i+=2){
+      
           arr.push(pd_data.slice(i,i+2));
         }
        
         th.setData({
           pindGoods: arr
         });
-        //th.countDown2();
+        th.countDown2();
       }
     })
 
@@ -463,6 +477,9 @@ Page({
   //----拼单倒计时函数-----
   countDown2() {
     if(!this.data.is_timer) return false;
+
+   
+
     var th = this;
     // 获取当前时间，同时得到活动结束时间数组
     var newTime = ut.gettimestamp();
@@ -500,6 +517,9 @@ Page({
           }
         }
         var txt = "pindGoods[" + j + "][" + i + "].djs";
+
+
+
         th.setData({
           [txt]: obj
         });
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index c2fa562..1c853b2 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -1,7 +1,7 @@
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 <view class="container rel" wx:if="{{ishow}}">
-<block wx:if="{{banner}}">  
+<block wx:if="{{banner}}">   
 <image class="xc-top-img abs"  src="{{url}}/miniapp/images/top-img.png"></image>
 </block>
     <!--搜索框-->  
@@ -199,23 +199,33 @@
 
               </navigator>
             <view class="flex left">
-            <view class="tneirong red-b flex-vertical rel">
+            <view class="tneirong red-b flex-vertical rel" wx:if="{{aitem.is_team_tepy!=0}}">
             <image class="xc-team-img abs" src="{{url}}/miniapp/images/fril.png"></image>
             已拼{{aitem.buy_num}}份</view>
             <view class="fs20 flex xc-people-val-frame" 
-            style="border-color:{{type==1?'#059de5':'#d60021'}};margin-left:8rpx">
-            <view class=" flex-center val-img {{type==1?'blue_b':'red-b'}}">
+            style="border-color:{{aitem.is_team_tepy==0?'#059de5':'#d60021'}};margin-left:{{aitem.is_team_tepy==0?'':'8rpx'}}">
+            <view class=" flex-center val-img {{aitem.is_team_tepy==0?'blue_b':'red-b'}}">
             <image class="people-img"src="{{url}}/miniapp/images/bai-ren.png"></image>
             </view>
-           <text  class="{{type==1?'blue_c':'red-co'}}" style="margin-left:8rpx; margin-right:8rpx">{{aitem.ct_num}}人团</text> 
+           <text  class="{{aitem.is_team_tepy==0?'blue_c':'red-co'}}" style="margin-left:8rpx; margin-right:8rpx">{{aitem.ct_num}}人团</text> 
             </view>
+
+             <view class="fs20 blue_c time-blue" wx:if="{{aitem.is_team_tepy==0}}">
+                        距开始:
+                        <text class='tui-conutdown-box'>{{aitem.djs.day}}</text>天
+                        <text class='tui-conutdown-box'>{{aitem.djs.hou}}</text>时
+                        <text class='tui-conutdown-box'>{{aitem.djs.min}}</text>分
+                        <text class='tui-conutdown-box tui-countdown-bg'>{{aitem.djs.sec}}</text>
+                  秒
+                    </view>
                  </view>
+                
              
                      <view class="goods-num"style="margin-top:{{type==0?'70rpx':'40rpx'}}">
                 <view>
                 
-                    <view class="fs40 flex  xc-top15 {{type==1?'blue_c':' red-co ai-bas'}}">
-                    <text class="fs28 {{type==0?'martop13':''}}">￥</text>
+                    <view class="fs40 flex  xc-top15 {{aitem.is_team_tepy==0?'blue_c':' red-co ai-bas'}}">
+                    <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text>
                    <text style="margin-left:-5rpx">{{aitem.price}}</text>
                     <span class="underline {{type==0?'martop18':''}}">零售价￥{{aitem.market_price}}</span>
                     </view>
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 145e8de..8e8b017 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -499,10 +499,10 @@ margin-top: 10rpx;
 }
 .xc-top15{
   padding-top: 15rpx;
-  margin-top: 4rpx;
+  margin-top: 43rpx;
 }
 .underline {
-    text-decoration: line-through; color:#999999; font-size: 20rpx; margin-left: 5rpx;
+    text-decoration: line-through; color:#999999; font-size: 20rpx; margin-left: 5rpx;margin-top: 5rpx;
 }
 .navigator.navwidth{
   width: 100%；
@@ -708,4 +708,11 @@ left: 43%;
 }
 .m-left{
   margin-left: 18rpx;
+}
+.martop4{
+margin-top: 4rpx;
+
+}
+.time-blue{
+margin-left: 10rpx;
 }
\ No newline at end of file
--
libgit2 0.21.4