预售_组合购添加预热

泉州测试
1 parent a4fdee1c
Showing 8 changed files with 267 additions and 39 deletions
packageB/pages/zuhegou/list/g_filter.wxs
packageB/pages/zuhegou/list/list.js
packageB/pages/zuhegou/list/list.wxml
packageC/pages/group_list/group_list.js
packageC/pages/group_list/group_list.wxml
packageC/pages/group_list/group_list.wxss
packageC/pages/presell/list/list.js
packageC/pages/presell/list/list.wxml
@@ -20,10 +20,19 @@ var g_filters = {
             var tnow=getDate();
             if(t1>=tnow) return 1;
             return 0;
-	}
+	},
+	goToUrl: function(type, id, name) {
+		if (type == 1) {
+			return "/packageB/pages/zuhegou/index/index?id="+id+"&title="+name
+		} else {
+			return "/packageB/pages/zuhegou/preIndex/index?id="+id+"&title="+name
+		}
+	},
+
 }
 module.exports = {
 	has_char: g_filters.has_char,
 	beg_time: g_filters.beg_time,
 	end_time: g_filters.end_time,
+	goToUrl: g_filters.goToUrl,
 }
 \ No newline at end of file
@@ -90,16 +90,17 @@ Page({
  
   //----倒计时函数-----
    countDown() {
+    
     if(!this.data.is_timer) return false;
     var th=this;
     // 获取当前时间，同时得到活动结束时间数组
-    let newTime =ut.gettimestamp();
-    var endTimeList = this.data.goodlist;
-    if(endTimeList==null) return null
+    let newTime = ut.gettimestamp();
+    var endTimeList = th.data.goodlist;
+    if(endTimeList == null) return null;
     // 对结束时间进行处理渲染到页面
     for (var i = 0; i < endTimeList.length;i++){
          var o = endTimeList[i];
-         var endTime = o.end_time;
+         var endTime = o.start_time;
          if(th.data.type==0) endTime = o.start_time;
          let obj = null;
          // 如果活动未结束，对时间进行处理
@@ -122,23 +123,36 @@ Page({
         }
    },
  
+  //  请求活动列表
    async requestSalelist() {
         //--没有更多就不调用--
         if(!this.data.ismore) return false;
-				
-        var e = this,th=e, i = "/api/weshop/prom/zhbuy/page?is_end=0&timetype=1&page=" + e.data.currentPage;
+        var e = this,
+            th = e, 
+            i = "/api/weshop/prom/zhbuy/page?is_end=0&timetype=" + this.data.type + "&page=" + e.data.currentPage;
         // var plist=null,alllist=th.data.goodlist;
         // if(!alllist) alllist=[];
-        let {goodlist}=this.data;
+        let {goodlist} = this.data;
         const {data:res}=await getApp().request.promiseGet(i,{
           isShowLoading:1,
-          data:{store_id:os.stoid,user_id:getApp().globalData.user_id}
+          data:{
+            store_id: os.stoid,
+            user_id: getApp().globalData.user_id
+          }
         })
         if(res.code==0 && res.data.pageData.length>0){
           if(res.data.page>1){
-            goodlist=goodlist.concat(res.data.pageData)
+            th.data.goodlist = goodlist.concat(res.data.pageData)
           }else{
-            goodlist=res.data.pageData;
+            th.data.goodlist = res.data.pageData;
+          }
+
+          if (th.data.type == 0) {
+            clearInterval(ot);
+            var ot = setInterval(function () {
+                th.countDown();
+            }, 1000);
+              
           }
  
         }else{
@@ -146,14 +160,21 @@ Page({
           th.data.ismore=0;
         }
         e.data.currentPage++;
-        th.setData({goodlist,isshow:1});
+        th.setData({
+          goodlist: th.data.goodlist,
+          isshow: 1
+        });
  
     },
+
     onPullDownRefresh: function() {
         this.reloadGoodList();
     },
+
     reloadGoodList: function() {
-       this.data.goodlist = null, this.data.currentPage = 1, this.requestSalelist();
+       this.data.goodlist = null;
+       this.data.currentPage = 1; 
+       this.requestSalelist();
     },
  
     onReachBottom: function() {
@@ -162,9 +183,16 @@ Page({
  
     //点击tab事件
     tip:function(e) {
-       var a=e.currentTarget.dataset.ty,th=this;th.data.ismore=1;
-       this.setData({type:a,goodlist:null});
+       var a = e.currentTarget.dataset.ty,
+       th = this;
+       th.data.type = a;
+       th.data.ismore = 1;
+       this.setData({
+         type:a,
+         goodlist: null
+        });
        this.reloadGoodList();
+       
     },
  
  
@@ -34,26 +34,26 @@
  
 <view class="kill-list"> 
     <view class="kill-item" wx:for="{{goodlist}}">
-        <navigator class="kill-pic rel" url="/packageB/pages/zuhegou/index/index?id={{item.id}}&title={{item.name}}" hover-class="none">
+        <navigator class="kill-pic rel" url="{{g_filter.goToUrl(type, item.id, item.name)}}" hover-class="none">
         <!-- <image class="abs xc-miaosha" src="{{url}}/miniapp/images/zms.png"></image> -->
             <image class="wh100" src="{{url+item.img_url}}" data-val="{{item.img_url}}"
                 data-errorimg="goodlist[{{index}}].img_url" binderror="bind_bnerr2" lazy-load="true"></image>
         </navigator>
         <view class="kill-cont">
-            <navigator class="goods-name ellipsis-2" url="/packageB/pages/zuhegou/index/index?id={{item.id}}&title={{item.name}}"  hover-class="none">
+            <navigator class="goods-name ellipsis-2" url="{{g_filter.goToUrl(type, item.id, item.name)}}"  hover-class="none">
 						{{item.name}}
  
 						<view class="goods-num">
 						    <view>
 									<view>组合数量: {{item.zhbuyqty}}</view>
 									<view>活动时间: {{filters.format_time(item.start_time) + '至' + filters.format_time(item.end_time)}}</view>
-						    <!-- <view class="{{type==1?'xc-wc':'blue_c'}}"> 
-						        <text>剩余:</text>
+						        <view class="blue_c" wx:if="{{type == 0}}"> 
+						            <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>
 						        <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
 						        <view class="fs28" style="line-height: 16px;">￥</view>
 						        <text>{{item.zhprice}}</text> 
@@ -105,7 +105,9 @@
     <!-- <view style="height:120rpx"></view> -->
 </view>
  
-<!-- <view class="kill-time xc-seckill-bottom">
+<view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
+
+<view class="kill-time xc-seckill-bottom">
 	<view class="theader" >
 		<view bindtap='tip' data-ty="1" class="xc-border-right flex-center timeac left {{type==1?'active':''}}">
 		<image class="xc-bottom"
@@ -116,10 +118,10 @@
 		src="{{url}}{{type==0?'/miniapp/images/clock-rad.png':'/miniapp/images/clock-black.png'}}"></image>
 		即将开始</view>
 	</view>
-</view> -->
+</view>
+
  
  
-	<view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
 </view>
  
  
@@ -9,7 +9,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-		// type:1,
+		url: a.imghost,
+		type:1,
 		// goodlist: null,
  
 		isLogin: false,
@@ -31,3 +31,18 @@
  
 <view class="no-more" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">—— 已经到底啦 ——</view>
 <nodata nodataContainer="t-c" wx:if="{{list.pageData.length == 0}}"></nodata>
+
+<view style="height:10rpx"></view>
+
+<view class="kill-time xc-seckill-bottom">
+	<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="{{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="{{url}}{{type==0?'/miniapp/images/clock-rad.png':'/miniapp/images/clock-black.png'}}"></image>
+		即将开始</view>
+	</view>
+</view>
 \ No newline at end of file
@@ -55,4 +55,78 @@ page {
 	text-align: center;
 	/* margin-top: 10rpx; */
 	color: #ccc;
+}
+
+.xc-seckill-bottom{
+  position: fixed;
+bottom: 0rpx;
+width: 100%;
+
+}
+
+.xc-bottom{
+  width: 45rpx;
+  height: 45rpx;
+  margin-right: 13rpx;
+}
+.xc-border-right{
+  border-right: 4rpx solid #eee;
+
+}
+
+.kill-time .theader .timeac {
+	font-size: 32rpx; height:100%; width: 50%; 
+	color: #333; background-color: #fff;
+
+}
+
+.kill-time .theader{
+	display: flex; margin: 0 auto; align-items: center;
+	height: 100rpx;
+
+}
+
+.kill-time {
+	text-align: center;
+	justify-content: space-around;
+	align-items: center;
+	height: 101rpx;
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	background-color: #f6f6f6;
+}
+.kill-time .theader{
+ display: flex; margin: 0 auto; align-items: center;
+ height: 100rpx;
+
+}
+.kill-time .theader .timeac {
+	font-size: 32rpx; height:100%; width: 50%; 
+	color: #333; background-color: #fff;
+
+}
+/* .kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;}
+.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;} */
+.kill-time .theader .timeac.active{color: #c4182e}
+
+.kill-item {
+	display: flex;
+	justify-content: space-between;
+	background-color: #fff;
+	padding: 20rpx;
+	margin-bottom: 20rpx;
+	border-radius: 10rpx;
+	/* height: 249rpx; */
+	align-items: center;
+}
+
+.kill-pic {
+	width: 215rpx;
+	height: 215rpx;
+}
+
+.kill-cont {
+	width: 465rpx;
+	margin-left:20rpx;
+	margin-right: 5rpx;
 }
 \ No newline at end of file
@@ -11,6 +11,7 @@ Page({
         isshow: 0,
         ad_data: null,
         max_sw_height: 200,
+        type: 1,
     },
  
     //------初始化加载----------
@@ -117,7 +118,7 @@ Page({
             store_id: os.stoid,
             page: this.data.page,
             pageSize: 10,
-            timetype: 1,
+            timetype: self.data.type,
             isuse:1
         }
         if(getApp().globalData.userInfo){
@@ -131,7 +132,6 @@ Page({
         getApp().request.get("/api/weshop/marketing/marketingPresellList/page", {
             data: req,
             success: function (res) {
-                console.log(res);
                 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 : [];
@@ -145,17 +145,92 @@ Page({
                     if (arr.length < 10) {
                         self.setData({no_more: 1})
                     }
+
+                     // 预热活动设置倒计时
+                    if (self.data.type == 0) {
+                        clearInterval(self.data.timer);
+                        self.data.timer = setInterval(function () {
+                            self.countDown();
+                        }, 1000);
+                        
+                    }
                 } else {
                     self.setData({no_more: 1})
                 }
                 self.setData({is_get: 1})
-
+               
             }
         })
     },
+
+
     go_index:function () {
         getApp().goto("/pages/index/index/index");
-    }
+    },
+
+
+    tip: function(e){
+        // 获取模板Data数据 1进行中 0预热中
+        var typeValue = e.currentTarget.dataset.ty;
+        // 初始化数据
+        this.data.type = typeValue;
+        this.data.loading = 0;
+        this.data.no_more = 0;
+        this.data.page = 1;
+        this.data.goodlist = [];
+        var goodslist = this.data.goodlist;
+        // 设置模板Data数据
+        this.setData({
+            type: typeValue,
+            goodlist: goodslist,
+        });
+        // 请求接口数据
+        this.get_list();
+    },
+
+      //----倒计时函数-----
+   countDown() {
+    var th=this;
+    // 获取当前时间，同时得到活动结束时间数组
+    let newTime = ut.gettimestamp();
+    var endTimeList = this.data.goodlist;
+    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 txt ="goodlist["+i+"].djs";
+          th.setData({ [txt]: obj});
+        }
+   },
+
+
  
+    
  
 });
@@ -37,7 +37,7 @@
             <view class="flex-vertical xc-strip-frame">
             <view class="xc-strip-blank rel">
  
-            <view class="flex-vertical rel total">
+            <view class="flex-vertical rel total" style="background-color: {{type == 0 ? '#059de5' : ''}};">
                <view class="t-c abs xc-fill" style="width:{{215*(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)}}rpx;background:#e4374d;"></view>
                <text class="fs20 white abs xc-fill-text">已预售{{filters.toFix((item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)}}%</text>
             </view>
@@ -45,32 +45,56 @@
             </view>
             <view class=" ml10 fs20">库存还剩{{item.presell_sumqty-item.buy_goodnum}}件</view>
            </view>
-
-
+           
             <view class="goods-num">
                 <view>
-				    <view class="{{type==1?'xc-wc':'blue_c'}}"></view>
+                    <view class="blue_c" wx:if="{{type == 0}}"> 
+                    <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="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 url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
+                    <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>
                 </view>
+                
             </view>
         </view>
     </view>
 </view>
  
-  <block wx:if="{{goodlist.length==0 && is_get}}">
-      <nodata  nodataContainer="t-c"></nodata>
-      <view class="bc_btn" bindtap="go_index">去首页逛逛</view>
-  </block>
-  <view class="no-more" wx:elif="{{no_more}}">-- 没有更多 --</view>
+<block wx:if="{{goodlist.length==0 && is_get}}">
+<nodata  nodataContainer="t-c"></nodata>
+</block>
  
+  <view class="no-more" wx:elif="{{no_more}}">-- 没有更多 --</view>
   <view style="height:10rpx"></view>
+
+  <!-- 底部按钮 -->
+  <view class="kill-time xc-seckill-bottom">
+    <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="{{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="{{url}}{{type==0?'/miniapp/images/clock-rad.png':'/miniapp/images/clock-black.png'}}"></image>
+            即将开始
+        </view>
+
+    </view>
+</view>
+
+
 </view>