Merge branch 'test' into 'qa'

Test See merge request !603

Merge branch 'test' into 'qa'
Test See merge request !603
后端研发-苏明海
2 parents 67b8130d 1d47db29
Showing 56 changed files with 2768 additions and 368 deletions
app.wxss
components/diy_advertising/diy_advertising.wxml
components/diy_advertising/diy_advertising.wxss
components/diy_pingd_buy/diy_pingd_buy.js
components/diy_pingd_buy/diy_pingd_buy.wxml
components/diy_pingd_buy/diy_pingd_buy.wxss
components/diy_seckill/diy_seckill.js
components/diy_seckill/diy_seckill.wxml
components/diy_shopname/diy_shopname.wxml
components/diy_shopname/diy_shopname.wxss
components/full_screen/filter.wxs
components/full_screen/full_screen.js
components/full_screen/full_screen.json
components/full_screen/full_screen.wxml
components/full_screen/full_screen.wxss
packageA/pages/activity_share/activity_share.js
packageA/pages/checkin/checkin.js
packageA/pages/checkin/checkin.wxml
packageA/pages/checkin/checkin.wxs
packageA/pages/checkin/checkin.wxss
@@ -446,12 +446,12 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot');
-  src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff') format('woff'),
-  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_2054717_qfl8swm1iw.eot');
+  src: url('//at.alicdn.com/t/font_2054717_qfl8swm1iw.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_2054717_qfl8swm1iw.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2054717_qfl8swm1iw.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2054717_qfl8swm1iw.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2054717_qfl8swm1iw.svg#iconfont') format('svg');
 }
  
 .iconfont {
@@ -462,6 +462,10 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
  
+.icon-riqi:before {
+  content: "\e64c";
+}
+
 .icon-shanchu:before {
   content: "\e61b";
 }
@@ -401,7 +401,7 @@
 <block wx:if='{{object.style==4}}'>
  
  
-  <swiper class="swiper"  autoplay="{{autoplay}}" current="{{object.sw_index}}"
+  <swiper class="swiper" circular="true"  autoplay="{{autoplay}}" current="{{object.sw_index}}"
           indicator-dots="true"
           indicator-color="{{object.dot_color}}"
           indicator-active-color="{{object.dot_color_act}}"
@@ -314,8 +314,7 @@
  
 .swiper {
   height: auto;
-  width: 98%;
-  padding:0 7rpx;
+  width: 100%; 
   padding-bottom: 7rpx;
   padding-top: 7rpx;
   /* background-color: palevioletred; */
@@ -37,6 +37,20 @@ Component({
     timer: null,
     iurl:o.imghost,
   },
+  
+  pageLifetimes:{
+    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+    show: function () {
+  		var th=this;
+  		if(this.data.goods_array.length>0){
+  			th.data.timer = setInterval(function() {
+  			  th.countDown2(th);
+  			}, 1000);
+  		}
+  	}
+  },	
+  
+  
   ready: function() {
     console.log("ready");
     var g_id = this.data.object.data;
@@ -55,50 +69,83 @@ Component({
          app = getApp(), all_array = [],
          index = 0,
          goodsidlist="";
+		
+		 //-- 当是默认的调用的时候 --		 
+		 if(!g_id || g_id.length<=0 ){
+			 th.no_gid_set();
+		 }else{ 
+			  //--先把商品ID串起来--
+			  g_id.forEach(function(val, ind) {
+				var item = {};
+				goodsidlist+=val.goodsid+",";
+			  })
+			  goodsidlist= goodsidlist.substr(0,goodsidlist.length-1);
  
-      //--先把商品ID串起来--
-      g_id.forEach(function(val, ind) {
-        var item = {};
-        goodsidlist+=val.goodsid+",";
-      })
-      goodsidlist= goodsidlist.substr(0,goodsidlist.length-1);
-
-      //--调用接口,读取拼单--
-      app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id="
-          +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
-
-          //如果拼单的数组为空的时候
-          var goodslist=res.data.data;
-          if(!goodslist || goodslist.length==0) return false;
-
-          /*--商品队列按照添加的顺序排列--*/
-          g_id.forEach(function(val, ind) {
-              goodslist.forEach(function (vy,indy) {
-                  if(val.goodsid==vy.goods_id){
-                      all_array.push(vy);
-                  }
-              })
-          })
-          if(all_array.length==0){
-            all_array=goodslist;
-          }
-
-          var arr = new Array();
-          //--三个三个一组---
-          for(var i=0;i< all_array.length;i+=3){
-            arr.push(all_array.slice(i,i+3));
-          }
-          /*--熏染到前台--*/
-          th.setData({goods_array:arr});
-            var newTime = ut.gettimestamp();
-            th.setData({ newTime: newTime });
-          
-          th.data.timer = setInterval(function() {
-            th.countDown2(th);
-          }, 1000);
-      });
+			  //--调用接口,读取拼单--
+			  app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id="
+				  +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
+				  //如果拼单的数组为空的时候
+				  var goodslist=res.data.data;
+				  if(goodslist && goodslist.length>0){
+					  th.set_goods_list(g_id,goodslist);  
+				  }
+				
+			  });
+	  }
     },
-    //---小于10的格式化函数----
+		
+	no_gid_set(){
+		var th=this;
+		var url= "/api/weshop/teamlist/pageteam/2?page=1&pageSize=9";
+		getApp().request.promiseGet(url, {
+		  data: {
+		    store_id: os.stoid,is_end: 0,is_show: 1,	   
+		  }
+		}).then(res => {
+		   if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+				var goodslist=res.data.data.pageData;
+				th.set_goods_list(null,goodslist);
+		   } 
+		})
+	},
+    
+	//设置商品列表
+	set_goods_list:function(g_id,goodslist){
+		var th=this,all_array=[];
+		if(g_id){
+			/*--商品队列按照添加的顺序排列--*/
+			g_id.forEach(function(val, ind) {
+			  goodslist.forEach(function (vy,indy) {
+				if(val.goodsid==vy.goods_id){
+				  all_array.push(vy);
+				  //th.setData({goods_array:arr});
+				}
+			  })
+			})
+		}else{
+			all_array=goodslist;
+		}
+				
+		if(all_array.length==0){
+		  all_array=goodslist;
+		}
+		
+		var arr = new Array();
+		//--三个三个一组---
+		for(var i=0;i< all_array.length;i+=3){
+		  arr.push(all_array.slice(i,i+3));
+		}
+		/*--熏染到前台--*/
+		th.setData({goods_array:arr});
+		  var newTime = ut.gettimestamp();
+		  th.setData({ newTime: newTime });
+		
+		th.data.timer = setInterval(function() {
+		  th.countDown2(th);
+		}, 1000);
+	},
+	
+	//---小于10的格式化函数----
     timeFormat: function(param) {
       return param < 10 ? '0' + param : param;
     },
@@ -108,6 +155,8 @@ Component({
       var ee = ob;
       // 获取当前时间，同时得到活动结束时间数组
       var newTime = ut.gettimestamp();
+	  this.setData({newTime:newTime});
+	  
       var List = ee.data.goods_array;
       if (List.length == 0) return false;
       for (var j = 0; j < List.length; j++) {
 <!--pages/wp/wp.wxml-->
-<block wx:if="goods_array.length>0">
+<block wx:if="{{goods_array.length>0}}">
   <!--拼单-->
   <view class='top_p' bindtap="go_to_pindlist">
     <view class="top">
@@ -21,11 +21,10 @@
  
                 <block wx:if="{{aitem.start_time>newTime}}">
                   <span class='s_top_p' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
-                </block>
-                <block wx:if="{{aitem.start_time<newTime}}">
+                </block>				
+                <block wx:if="{{aitem.start_time<newTime && aitem.end_time>newTime}}">
                   <span class='s_top_p'>火热进行</span>
                 </block>
-
                 <!-- <span class='s_top_p'>火热进行</span> -->
  
                 <view class='s_img_p'>
@@ -50,12 +49,17 @@
                 <!--<view class='sp_jgx_p'>￥{{aitem.market_price}}</view>-->
  
                 <view class="tuan_set_num">
-                  <view class="co-red2">{{aitem.ct_num}}人团</view>
-
-                  <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去参团</view>
-                  <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
-                  <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
-                  <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="cantuan huise">已抢光</view>
+                  <view class="co-red2">{{aitem.ct_num}}人团</view>			
+			      <!-- 判断有没有过期 -->  	  
+				  <block wx:if="{{aitem.end_time<=newTime}}">
+					  <view class="cantuan huise">已结束</view>
+				  </block>				  
+				  <block wx:else>
+					  <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去参团</view>
+					  <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
+					  <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
+					  <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="cantuan huise">已抢光</view>
+				  </block>
                 </view>
               </view>
             </view>
@@ -89,16 +93,21 @@
                 <view class='sp_jg_p'>￥{{aitem.price}}</view>
                 <view class='sp_jgx_p'>￥{{aitem.market_price}}</view>
               </view>
-              <view class="o1_sj_p">
+              <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
                 <image class="time_img" src="/public/static/images/model/time.png"></image>
-                <block wx:if="aitem.djs.day>0">{{aitem.djs.day}}天</block>{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
+                <block wx:if="{{aitem.djs.day>0 }}">{{aitem.djs.day}}天</block>{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
               </view>
-
-              <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
-              <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去开团</view>
-              <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
-              <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="wo_p huise">已抢光</view>
-
+			  
+			  <!-- 判断有没有过期 -->
+			  <block wx:if="{{aitem.end_time<=newTime}}">
+			  	<view class="wo_p huise">已结束</view>
+			  </block>		
+			  <block wx:else>
+				  <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
+				  <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去开团</view>
+				  <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
+				  <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="wo_p huise">已抢光</view>
+              </block>  
             </view>
           </view>
         </navigator>
@@ -362,4 +362,5 @@ swiper {
    display: flex;
    align-items: center;
    margin:5rpx 0rpx;
-}
 \ No newline at end of file
+}
+.o1_right_p .wo_p.huise{ background-color: #eee;}
 \ No newline at end of file
@@ -36,6 +36,19 @@ Component({
     imghost: os.imghost,
     timer: null,
   },
+  
+  pageLifetimes:{
+    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+    show: function () {
+		var th=this;
+		if(this.data.goods_array.length>0){
+			th.data.timer = setInterval(function() {
+			  th.countDown2(th);
+			}, 1000);
+		}
+	}
+  },	
+  
   ready: function() {
     console.log("ready");
     var g_id = this.data.object.data;
@@ -50,66 +63,82 @@ Component({
     // 这里是一个自定义方法
     customMethod: function() {},
     init: function(g_id) {
-      var th = this, app = getApp(),all_array = [], goodsidlist="";
-
-      //--先把商品ID串起来--
-      g_id.forEach(function(val, ind) {
-        var item = {};
-        goodsidlist+=val.goodsid+",";
-      })
-      goodsidlist=ut.sub_last(goodsidlist);
-
-      //--调用接口,读取秒杀--
-      app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id="
-        +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
-        //如果秒杀的数组为空的时候
-      
-        var goodslist=res.data.data;
-        if(!goodslist || goodslist.length==0) return false;
-
-        // 判断火热，预热
-        var newTime = ut.gettimestamp();
-        th.setData({newTime:newTime});
-        // for(var a=0;a< goodslist.length;a++){
-        //   var starTime=goodslist[a].start_time;
-        //   var msStr=[];
-        //   console.log(2222222222)
-        //   console.log(starTime+":"+newTime)
-        //   if (starTime>newTime){
-        //     msStr.push()
-        //     //th.setData({msText:'即将开始'});
-        //    }
-        //   if (starTime<newTime){
-        //     th.setData({msText:'火热进行'});
-        //   }
-        // }
-        /*--商品队列按照添加的顺序排列--*/
-        g_id.forEach(function(val, ind) {
-          goodslist.forEach(function (vy,indy) {
-            if(val.goodsid==vy.goods_id){
-              all_array.push(vy);
-              th.setData({goods_array:arr});
-            }
-          })
-        })
-        if(all_array.length==0){
-          all_array=goodslist;
-        }
-
-        var arr = new Array();
-        //--三个三个一组---
-        for(var i=0;i< all_array.length;i+=3){
-          arr.push(all_array.slice(i,i+3));
-        }
-        /*--熏染到前台--*/
-
-        th.setData({goods_array:arr});
-
-        th.data.timer = setInterval(function() {
-          th.countDown2(th);
-        }, 1000);
-      });
+      var th = this, app = getApp(), goodsidlist="";	  
+	  if(g_id && g_id.length>0){
+		  //--先把商品ID串起来--
+		  g_id.forEach(function(val, ind) {
+			var item = {};
+			goodsidlist+=val.goodsid+",";
+		  })
+		  goodsidlist=ut.sub_last(goodsidlist);
+	
+		  //--调用接口,读取秒杀--
+		  app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id="
+			+os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
+			//如果秒杀的数组为空的时候    
+			var goodslist=res.data.data;
+			//就算是添加的活动已经过期，就要用最新的进行中活动
+			if(goodslist && goodslist.length>0) {
+				th.set_goods_list(g_id,goodslist);
+			}    
+		  });
+	   }else{
+		  th.no_gid_set();  
+	   }
     },
+	
+	//当是默认的情况
+	no_gid_set(){
+		getApp().request.promiseGet("/api/ms/flash_sale/spikepage?page=1&pageSize=9",
+		  {isShowLoading:1,data:{store_id:os.stoid,is_end:0,is_show:1}}
+		).then(res=>{
+		  if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0)	{
+			   goodsidlist=res.data.data.pageData; 
+			   th.set_goods_list(null,goodslist);
+		  }	  
+		});
+	},
+	
+	//就算是添加的活动已经过期，就要用最新的活动
+	set_goods_list(g_id,goodslist){
+		// 判断火热，预热
+		var newTime = ut.gettimestamp(),all_array = [],th=this;
+		th.setData({newTime:newTime});		
+		if(g_id){
+			/*--商品队列按照添加的顺序排列--*/
+			g_id.forEach(function(val, ind) {
+			  goodslist.forEach(function (vy,indy) {
+				if(val.goodsid==vy.goods_id){
+				  all_array.push(vy);
+				  //th.setData({goods_array:arr});
+				}
+			  })
+			})
+		}else{
+			all_array=goodslist;
+		}
+		
+		
+		if(all_array.length==0){
+		  all_array=goodslist;
+		}
+		
+		var arr = new Array();
+		//--三个三个一组---
+		for(var i=0;i< all_array.length;i+=3){
+		  arr.push(all_array.slice(i,i+3));
+		}
+		/*--熏染到前台--*/
+		
+		th.setData({goods_array:arr});
+		
+		th.data.timer = setInterval(function() {
+		  th.countDown2(th);
+		}, 1000);
+	},
+	
+	
+	
     //---小于10的格式化函数----
     timeFormat: function(param) {
       return param < 10 ? '0' + param : param;
@@ -120,6 +149,8 @@ Component({
       var ee = ob;
       // 获取当前时间，同时得到活动结束时间数组
       var newTime = ut.gettimestamp();
+	  this.setData({newTime:newTime});
+	    
       var List = ee.data.goods_array;
       if (List.length == 0) return false;
       for (var j = 0; j < List.length; j++) {
-<block wx:if="goods_array.length>0">
+<block wx:if="{{goods_array.length>0}}">
   <!--秒杀-->
   <view class='top' bindtap="go_to_skill">
     <view class="flex">
@@ -24,16 +24,26 @@
                     <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
                   </view>
                 </block>
-                <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-                  <view class="rob">
-                    <span class='s_top_kill'>火热进行</span>
-                  </view>
-                </block>
-                <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-                  <view class="rob">
-                    <span class='s_top_kill gray'>已抢光</span>
-                  </view>
-                </block>
+				
+				<block wx:if="{{aitem.end_time<=newTime}}">
+					<view class="rob">
+					  <span class='s_top_kill gray'>活动已结束</span>
+					</view>
+				</block>				
+				<block wx:else>
+					 <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
+					   <view class="rob">
+					     <span class='s_top_kill'>火热进行</span>
+					   </view>
+					 </block>
+					 <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
+					   <view class="rob">
+					     <span class='s_top_kill gray'>已抢光</span>
+					   </view>
+					 </block>
+				</block>
+				
+               
  
                 <view class='clear'></view>
  
@@ -92,17 +102,25 @@
                   <view class="wo" style="background-color: #adadad">正在预热</view>
                 </view>
               </block>
-              <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-                <view class="rob">
-                  <view class="wo">我要抢</view>
-                </view>
-              </block>
-
-              <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-                <view class="rob">
-                  <view class="wo" style="background-color: #adadad">已抢光</view>
-                </view>
-              </block>
+			  
+			  <block wx:if="{{aitem.end_time<newTime}}">
+				  <view class="rob">
+				    <view class="wo" style="background-color: #adadad">已结束</view>
+				  </view>
+			  </block>			  
+			  <block wx:else>		  
+				  <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
+					<view class="rob">
+					  <view class="wo">我要抢</view>
+					</view>
+				  </block>
+
+				  <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
+					<view class="rob">
+					  <view class="wo" style="background-color: #adadad">已抢光</view>
+					</view>
+				  </block>
+			  </block>
  
  
             </view>
@@ -10,7 +10,7 @@
             <view style="position: relative; height: 150rpx;">
             <view class="big_border" >
                 <view class="circle">
-                    <view class="border">
+                    <view class="border" style="width: 100%; height: 100%;">
                         <image   class="wxd_ww" src='{{sto}}' bindtap="go_user"></image>
                     </view>
                 </view>
@@ -139,9 +139,9 @@ left:-116rpx;
   width: 100%;
   height: 260rpx;
   position: absolute;
-  top: -130rpx;
+  margin-top: -130rpx;
   text-align: center;
-  margin-top: 50%;
+  top: 50%;
 }
  
 /* 小图片2圆边框 */
+var format = function (text) {
+
+  if (!text) {
+    return
+  }
+  var reg = getRegExp('\\\\n', 'g')
+  return text.replace(reg, '\n')
+}
+
+module.exports = {
+  format: format
+}
+// components/userqy_pop_up/userqy_pop_up.js
+var  o = getApp().globalData.setting
+Component({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    control: 1,
+	is_full_screen_show:0,  //全屏显示
+	sec_show:3,    //倒计时的秒数
+	full_ad:null,  //全屏广告
+	url:o.imghost,
+	full_screen:0,
+	is_full_screen_men:1,
+	hidden:0,
+  },
+  
+  pageLifetimes:{
+	hide: function() {
+        // 页面被隐藏
+		clearInterval(this.data.full_screen);
+	},
+  },
+ 
+  ready: function () {
+	  var th=this;
+	  setTimeout(function(){
+		 th.setData({hidden:1,}) 
+	  },2600)
+  },
+ 
+  properties: {},
+  methods: {
+    close_full_screen(){
+    	this.setData({is_full_screen_show:0,sec_show:0,is_full_screen_men:0});
+    },
+    //-- 跳转到满屏广告的链接 --
+    go_full_ad(){
+    	if(!this.data.full_ad) return false;
+    	if(!this.data.full_ad.ad_weapplink) return false;
+    	getApp().goto(this.data.full_ad.ad_weapplink);
+		this.setData({is_full_screen_show:0,is_full_screen_men:0});
+    },   
+    get_the_full_screen(){		
+		if(this.data.full_ad) return false;		
+    	var th=this;
+    	//获取全屏的广告
+    	getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
+    		data: { enabled: 1 }
+    	}).then(res=>{
+             //判断是不是有全屏广告 	
+    		 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+    			 th.setData({
+    				 is_full_screen_show:1,
+    				 full_ad:res.data.data.pageData[0],		 
+    			 })
+				 
+				 //--定时关闭--
+				 th.data.full_screen=setInterval(function(){
+				 	 if(!th.data.sec_show) {
+				 		  clearInterval(th.data.full_screen);
+				 		  th.close_full_screen();
+				 		  return false;
+				 	 }
+				 	 th.data.sec_show--;
+				 	 th.setData({sec_show:th.data.sec_show});		 
+				 },1000)
+				 
+				 
+				 setTimeout(function(){
+					 th.setData({is_full_screen_men:0});
+				 },1000)
+    		 }else{
+				 th.setData({
+				     is_full_screen_men:0
+				 })
+			 }				
+    	})
+    }
+  },
+ 
+})
 \ No newline at end of file
+{
+	"component": true,
+    "usingComponents": {}
+}
 \ No newline at end of file
+<!-- 全屏控制 -->
+<view hidden="{{!is_full_screen_men || hidden}}" class="full_screen" style="background-color: #fff;"></view>
+<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
+	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
+</view>
+
+
+
+.full_screen{
+	position: fixed;left: 0;top: 0;
+	z-index: 1000000000000;
+	background-color: rgba(0,0,0,0.4);
+	width: 100%;
+	height: 100%;
+	background-position: center;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+}
+
+
+.skip_box{
+        float: right;  margin-top: 10rpx;  margin-right: 10rpx;
+        background-color: gainsboro;  width: 120rpx;
+        height: 48rpx;  font-size: 28rpx;  line-height: 48rpx;
+        text-align: center;  border-radius: 20rpx;
+ }
 \ No newline at end of file
@@ -182,9 +182,14 @@ Page({
 			  th.setData({share_hidden:1,share_good:null});	  	
  
 			  var ind=3;//秒杀活动分享
-			  if(item.prom_type==6){
-				  ind=4;
-			  }	  	 
+			  if(th.data.currentIndex==0){
+				  ind=3;//秒杀活动分享
+			  }else if(th.data.currentIndex==1){
+				  ind=4;//拼团
+			  }else if(th.data.currentIndex==2){
+				  ind=5;//促销
+			  }
+				  		   
 			  //插入活动			   
 			  if(item.prom_type==3){
 				  var hui_active=this.data.hui_active;
@@ -210,8 +215,12 @@ Page({
 			    title: title,path:url,
 			  };	
 			  th.setData({share_hidden:1,share_good:null});	 
+			  
+			  var ind=0;//促销
+			  if(th.data.currentIndex==2){ ind=5;}
+			  
 			  //插入活动
-			  th.insert_act_share(title,hui_active.id);			 					  					   
+			  th.insert_act_share(title,hui_active.id,ind);			 					  					   
 			  return ob;				
 		  }		
 	  }
@@ -533,10 +542,15 @@ Page({
 	    scene+="_"+user_id;
 	  }
  
+	  var ind=3;
+      if(that.data.currentIndex==1){
+		  ind=4; 
+	  }
+	  
 	  if(th.data.share_good.prom_type==3){
-		  th.insert_act_share(th.data.hui_active.name,th.data.hui_active.id);  //插入分享
+		  th.insert_act_share(th.data.hui_active.name,th.data.hui_active.id,5);  //插入分享
 	  }else{
-		  th.insert_act_share(th.data.share_good.title,th.data.share_good.id); //插入分享
+		  th.insert_act_share(th.data.share_good.title,th.data.share_good.id,ind); //插入分享
 	  }
  
  
 // packageA//pages/checkin/checkin.js
 const app = getApp();
-
+let self;
 Page({
  
 	/**
@@ -12,6 +12,9 @@ Page({
 		day: '',
 		weekArr: ['日', '一', '二', '三', '四', '五', '六'],
 		dateArr: [],
+		n_dateArr:[],  //本月的日期
+		s_dateArr:[],  //上月的日期
+		
 		firstDay: '',
 		lastDay: '',
 		param: null,
@@ -25,19 +28,27 @@ Page({
 		checkInNums: 0,		  //补签次数
 		isCheckInDay: '',
  
-		
 		flag: true,
+		isLogin: false,
+		
 	},
  
 	loadQd(callback) {
-		let self = this;
 		app.request.get('/api/weshop/qdrecord/getUser/'+ app.globalData.setting.stoid + '/' + app.globalData.user_id, {
 		  success: function (res) {
-				if(callback) callback();
-				self.setData({
-					res: res.data.data
-				});
-				self.loadCheckedRecord();
+			    if(res.data.code==0){
+					if(callback) callback();
+					self.setData({
+						res: res.data.data
+					});
+					self.loadCheckedRecord();
+				}else{
+					wx.showToast({
+					  title: "网络繁忙，请重试",
+					  icon: 'none',
+					  duration: 2000
+					})
+				}
 		  },
 		});
 	},
@@ -46,18 +57,60 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function(options) {
-		let self = this;
+		console.log('执行onload');
+		self = this;
 		this.getDate();
 		this.setDate();
 		var res = wx.getSystemInfoSync();
 		this.setData({
-			param: res.windowHeight / 12,
+			param: res.windowHeight / 12,			
 		})
  
-		this.loadQd();
+		// 判断会员是否授权登录，
+		// 没有登录则跳转到登录页，
+		// 已登录则设置已登录状态，请求加载签到数据
+		this.isLogin().then(function() {
+			console.log('loginnnn',app.globalData.userInfo);
+			self.setData({
+				isLogin: true
+			});
+			self.loadQd();
+		});
+		
  
 	},
-
+	
+	onShow() {
+		if(app.globalData.userInfo instanceof Object) {
+			if(this.data.isLogin) {
+				return;
+			} else {
+				this.setData({
+					isLogin: true
+				});
+				this.loadQd();
+			};
+		}
+	},
+	
+	onHide() {
+		console.log('执行onHide');
+	},
+	
+	// 是否登录
+	isLogin() {
+		return new Promise(function(resolve, reject) {
+			let user_info = getApp().globalData.userInfo;
+			if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+				wx.navigateTo({
+					url: '/pages/togoin/togoin',
+				})
+				return false;
+			} else {
+				resolve();
+			};
+		});
+	},
  
 	// 点击"我的积分"和"去购物"进行跳转
 	goto(e) {
@@ -65,7 +118,6 @@ Page({
 		app.goto(url);
 	},
  
-	
 	// 点击显示签到规则
 	showRules() {
 		if(this.data.isShowRules) {
@@ -82,34 +134,87 @@ Page({
  
 	// 加载签到记录
 	loadCheckedRecord() {
-		let newDateArr = this.data.dateArr;
+        let newDateArr=[]; 
 		let list;
 		let bqlist;
-		if(this.data.res.qddaylist) {
+		//--判断什么日子是签到的,上个月的--
+		if(this.data.res && this.data.res.qdsdaylist) {
+			list = this.data.res.qdsdaylist.split(',');
+			for(var i in this.data.s_dateArr){
+				var item=this.data.s_dateArr[i];
+				if(this.check_is_qd(item,list)){
+					item.isCheckIn = true;
+				}else{
+					item.isCheckIn = false;
+				}
+			}
+		}	
+		newDateArr=newDateArr.concat(this.data.s_dateArr);			
+		//--判断什么日子是签到的，这个月的--
+		if(this.data.res && this.data.res.qddaylist) {
 			list = this.data.res.qddaylist.split(',');
-			for(let item of list) {
-				newDateArr[item-1].isCheckIn = true;
-			};
+			for(var i in this.data.n_dateArr){
+				var item=this.data.n_dateArr[i];
+				if(this.check_is_qd(item,list)){
+					item.isCheckIn = true;
+				}else{
+					item.isCheckIn = false;
+				}
+			}
 		}
-		if(this.data.res.curbqdaynum) {
+		newDateArr=newDateArr.concat(this.data.n_dateArr);
+	
+		//--判断什么日子是要补签的--
+		if(this.data.res && this.data.res.curbqdaynum) {
 			bqlist = this.data.res.curbqdaynum.split(',');
-			for(let item of bqlist) {
-				var date = new Date(item);
-				newDateArr[date.getDate()-1].isBq = true;
-			}
+			for(var i in newDateArr){
+				var item=newDateArr[i];
+				if(this.check_is_bq(item,bqlist)){
+					item.isBq = true;
+				}else{
+					item.isBq = false;
+				}
+			}			
 		}
 		this.setData({
 			dateArr: newDateArr
 		});
 	},
  
+	
+	//判断是不是同一个日期，签到的
+	check_is_qd(item,bqlist){
+		for(var i in bqlist){		
+			var c_item=JSON.parse(JSON.stringify(item));
+			if(c_item.num<10) c_item.num="0"+c_item.num;			
+			if(c_item.num==bqlist[i]){
+				return true;
+			}
+		}
+		return false;
+	},
+	
+	//判断是不是同一个日期,补签到的
+    check_is_bq(item,bqlist){
+		for(var i in bqlist){
+			if(item.date==bqlist[i]){
+				return true;
+			}
+		}
+		return false;
+	},
+
 	// 点击签到
 	checkInToday() {
 		const self = this;
 		// 获取今天的签到状态
-		let isCheckInToday = this.data.dateArr[this.data.day-1].isCheckIn;
+		//let isCheckInToday = this.data.dateArr[this.data.day-1].isCheckIn;
+		var ck=this.data.day;
+		if(parseInt(ck)<10) ck="0"+ck;	 
+		var isCheckInToday=this.data.res.qddaylist.indexOf(ck); 
+		
 		// 如果还没签到, 可以点击签到
-		if(!isCheckInToday) {
+		if(isCheckInToday==-1) {
 			app.request.promisePost('/api/weshop/qdrecord/saveQd', {
 				data: {
 					store_id: app.globalData.setting.stoid,
@@ -118,8 +223,16 @@ Page({
 			}).then(res => {
 				// 改变签到状态,由false置为true
 				// let newDateArr = self.data.dateArr;
-				// newDateArr[self.data.day-1].isCheckIn = true;
-				
+				// newDateArr[self.data.day-1].isCheckIn = true;	
+							
+				for(var i in self.data.dateArr) {
+					self.data.dateArr[i].isCheckIn=false;
+					self.data.dateArr[i].isBq=false;
+				}						
+				self.setData({
+					dateArr: self.data.dateArr
+				});				
+							
 				self.loadQd(function() {
 					wx.showToast({
 					  title: self.data.res.qdintro,
@@ -147,26 +260,29 @@ Page({
 				data: {
 					store_id: app.globalData.setting.stoid,
 					user_id: app.globalData.user_id,
-					daynum: self.data.res.getBQIntegral,
+					daynum: self.data.res.getBQIntegral1,
 					bqnum: self.data.res.getbqnum2,
-					bqintegral: self.data.res.getBQIntegral1,
+					bqintegral: self.data.res.getBQIntegral,
 				}
 			}).then(res => {
 				// 改变签到状态,由false置为true
-			// 	let newDateArr = self.data.dateArr;
-			// 	newDateArr[self.data.day-1].isCheckIn = true;
-					var bqlist = self.data.res.curbqdaynum.split(',').sort();
-					var list = [];
+			    // let newDateArr = self.data.dateArr;
+			    // newDateArr[self.data.day-1].isCheckIn = true;
+					//var bqlist = self.data.res.curbqdaynum.split(',').sort();
+					//var list = [];
+					/*--
 					for(let item of bqlist) {
 						var date = new Date(item);
 						list.push(date.getDate());
-					}
-					
-					self.data.dateArr[list[0]-1].isBq = false;
+					}--*/					
+												
+					for(var i in self.data.dateArr) {
+						self.data.dateArr[i].isCheckIn=false;
+						self.data.dateArr[i].isBq=false;
+					}						
 					self.setData({
 						dateArr: self.data.dateArr
-					});
-					
+					});					
 					self.loadQd(function() {
 						self.data.flag = true;
 							wx.showToast({
@@ -182,10 +298,6 @@ Page({
 		}
 	},
  
-	
-	
-
-
 	getDate: function() { //获取当月日期
 		var mydate = new Date();
 		var year = mydate.getFullYear();
@@ -195,7 +307,7 @@ Page({
 		this.data.month = months;
 		this.data.day = mydate.getDate(); 		//获取当月日期: 1~31
 		var fist = new Date(year, month, 1);
-		this.data.firstDay = fist.getDay();		//获取当月第一天
+		this.data.firstDay = fist.getDay();		//获取当月第一天		
 		var last = new Date(year, months, 0); //0表示当月最后一天
 		this.data.lastDay = last.getDate();   //获取当月最后一天
  
@@ -204,88 +316,43 @@ Page({
 			month: this.data.month,
 			day: this.data.day,
 			firstDay: this.data.firstDay,
-			lastDay: this.data.lastDay
+			lastDay: this.data.lastDay,
+			fist:fist
 		})
 		console.log("今天：" + this.data.day);
 	},
  
 	setDate: function() {
 		var day;
-		for (var i = 1; i < this.data.lastDay + 1; i++) {
-			day = {
-				num: i,
-			};
-			this.data.dateArr.push(day);
+		for(var i=0;i<this.data.firstDay;i++){
+			//获取前几天的时间数组
+			var arr_d=this.getNextDate(this.data.fist,i-this.data.firstDay)
+			day = {num: arr_d[1],date:arr_d[0]};
+			this.data.s_dateArr.push(day);
+		}
+			
+		for (var i = 1; i < this.data.lastDay + 1; i++) {			
+			var date=this.data.month+"";
+			if(this.data.month<10) date="0"+date;	
+			if(i<10) {
+				date=date+"-0"+i;
+			}else{
+				date=date+"-"+i;
+			}			
+			day = {num: i,date:date};
+			this.data.n_dateArr.push(day);
 		}
-		this.setData({
-			dateArr: this.data.dateArr,
-			// firstDay: this.data.firstDay
-		});
 	},
  
-	// prevMonth: function() { //上一月
-	// 	var months = "";
-	// 	var years = "";
-	// 	if (this.data.month == 1) {
-	// 		years = this.data.year - 1
-	// 		this.data.month = 12;
-	// 		months = this.data.month;
-	// 	} else {
-	// 		years = this.data.year;
-	// 		months = this.data.month - 1;
-	// 	}
-
-	// 	var first = new Date(years, months - 1, 1);
-	// 	this.data.firstDay = first.getDay();
-	// 	var last = new Date(years, months, 0);
-	// 	this.data.lastDay = last.getDate();
-
-	// 	this.setData({
-	// 		month: months,
-	// 		year: years,
-	// 		firstDay: this.data.firstDay,
-	// 		lastDay: this.data.lastDay
-	// 	})
-
-	// 	this.data.dateArr = [];
-	// 	for (var i = 1; i < this.data.lastDay + 1; i++) {
-	// 		this.data.dateArr.push(i);
-	// 	}
-	// 	this.setData({
-	// 		dateArr: this.data.dateArr
-	// 	})
-	// },
+	//获取相隔是多少天的日期
+    getNextDate(date,day) {  
+	  var dd = date;
+	  dd.setDate(dd.getDate() + day);
+	  //var y = dd.getFullYear();
+	  var m = dd.getMonth() + 1 < 10 ? "0" + (dd.getMonth() + 1) : dd.getMonth() + 1;
+	  var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
+	  //return y + "-" + m + "-" + d;
+	  return [m + "-" + d,dd.getDate()];
+	}
  
-	// nextMonth: function() { //下一月
-	// 	var months = "";
-	// 	var years = "";
-	// 	if (this.data.month == 12) {
-	// 		this.data.month = 0;
-	// 		months = this.data.month;
-	// 		years = this.data.year + 1;
-	// 	} else {
-	// 		months = this.data.month + 1;
-	// 		years = this.data.year;
-	// 	}
-	// 	var months = this.data.month + 1;
-	// 	var first = new Date(years, months - 1, 1);
-	// 	this.data.firstDay = first.getDay();
-	// 	var last = new Date(years, months, 0);
-	// 	this.data.lastDay = last.getDate();
-	// 	this.setData({
-	// 		month: months,
-	// 		year: years,
-	// 		firstDay: this.data.firstDay,
-	// 		lastDay: this.data.lastDay
-	// 	})
-
-	// 	this.data.dateArr = [];
-	// 	for (var i = 1; i < this.data.lastDay + 1; i++) {
-	// 		this.data.dateArr.push(i);
-	// 	}
-	// 	this.setData({
-	// 		dateArr: this.data.dateArr
-	// 	})
-	// },
-
 })
@@ -2,61 +2,66 @@
 <wxs src="checkin.wxs" module="myUtil"></wxs>
 <view class="checkin-container">
 	<view class="rule-container flex">
-		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral"><image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分</view>
 		<view class="rule" bindtap="showRules">规则</view>
+		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral"><image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分</view>
+	
 	</view>
  
-	<view class="list flex">
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 0)-1].isCheckIn ? 'active':''}}">
+	<view class="list flex" wx:if="{{res}}">
+		<view class="list-item active}}">
 			<view class="circle">+{{res.cday1}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 0)}}日</view>
+			<view class="fs26">{{res.sday2}}</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 1)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.daynum}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 1)}}日</view>
+			<view class="fs26">今日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 2)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 1,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc1}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 2)}}日</view>
+			<view class="fs26">明日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 3)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 2,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc2}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 3)}}日</view>
+			<view class="fs26">{{myUtil.setDate(year, res.sday3, 2)}}日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 4)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 3,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc3}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 4)}}日</view>
+			<view class="fs26">{{myUtil.setDate(year, res.sday3, 3)}}日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 5)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 4,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc4}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 5)}}日</view>
+			<view class="fs26">{{myUtil.setDate(year, res.sday3, 4)}}日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 6)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 5,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc5}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 6)}}日</view>
+			<view class="fs26">{{myUtil.setDate(year, res.sday3, 5)}}日</view>
 		</view>
 	</view>
+	<view wx:else style="height: 100rpx;"></view>
  
-	<view class="btn-container">
-		<view class="btn" bindtap="checkInToday">
-			<text class="iconfont icon-rili"></text>{{!dateArr[day-1].isCheckIn ? '立即签到':'今日已签到'}}
+	<view class="btn-container" wx:if="{{res}}">
+		<view class="btn" bindtap="checkInToday" wx:if="{{isLogin}}">
+			<text class="iconfont icon-rili"></text>{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}}
 		</view>
-		<view class="btn" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-10分)</view>
+		<view class="btn" bindtap="isLogin" wx:else>
+			<text class="iconfont icon-rili"></text>签到请登录
+		</view>
+		<view class="btn" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-{{res.getBQIntegral}}分)</view>
 	</view>
  
  
 	<!-- <view class="current">
 		<view class="f-vc">当前连续签到：<text class="days fs34">{{res.getlxnum}}</text> 天</view>
 		<view class="f-vc">当前积分：<text class="fs34">{{integral}}</text></view>
-	</view> -->
-	
+	</view> -->	
 	<!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> -->
  
 	<view class="calendar-container">
 		<view class="calendar-wrapper">
 			<view class="calendar-title">
 				<view>{{year}}年{{month}}月</view>
-				<view class="fs24" style="color:#999;">补签卡：{{res.getkbqnum}}</view>
+				<!-- 有补签，才要补签卡 -->
+				<view wx:if="{{res.getkbqnum}}" class="fs24" style="color:#999;font-weight:bold">补签卡：{{res.getkbqnum}}</view>
 			</view>
 			<view class="calendar">
 			 <!-- <view class="selectDate"> -->
@@ -73,7 +78,7 @@
 			 <view class="date">
 			   <block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key">
 					 <!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> -->
-			     <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
+			     <view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
 						 <view class="day">{{item.num}}</view>
 					 </view>
 			   </block>
@@ -103,7 +108,7 @@
 		<view class="popup-wrapper">
 			<view class="popup">
 				<view class="popup-title">签到规则</view>
-				<view class="popup-content">1.每日签到领积分</view>
+				<view class="popup-content">{{res.qdrules}}</view>
 			</view>
 			<view class="popup-close">
 				<text class="btn-close" bindtap="showRules">X</text>
 var myUtil = {
-	setDate: function(year, startDate, num) {
+	setDate_is_act: function(year, startDate, num,qdlist) {
 		var date = getDate(year + '-' + startDate);
 		date.setDate(date.getDate() + num);
 		date = getDate(date).getDate();
-		return date;
+		if(date<10) date="0"+date;
+		if(!qdlist) return false;
+		if(qdlist.indexOf(date)!=-1){
+			return true
+		}
+		return false;
 	},
  
-	// dateDiff: function(firstDate,secondDate) {
-	// 	var firstDate = new Date(firstDate);
-	// 	var secondDate = new Date(secondDate);
-	// 	var diff = Math.abs(firstDate.getTime() - secondDate.getTime());
-	// 	var result = parseInt(diff / (1000 * 60 * 60 * 24));
-	// 	return result;
-	// },
+	setDate:function(year, startDate, num){
+		var date = getDate(year + '-' + startDate);
+		date.setDate(date.getDate() + num);
+		date = getDate(date).getDate();
+		return date; 
+	}
 };
  
 module.exports = {
 	setDate: myUtil.setDate,
+	setDate_is_act: myUtil.setDate_is_act,
 };
 \ No newline at end of file
@@ -25,8 +25,8 @@ page,
 	background-color: #FFBC47;
 	color: #333;
 	font-size: 26rpx;
-	border-top-right-radius: 25rpx;
-	border-bottom-right-radius: 25rpx;
+	border-top-left-radius: 25rpx;
+	border-bottom-left-radius: 25rpx;
 	display: flex;
 	align-items: center;
 	padding-right: 20rpx;
@@ -34,7 +34,7 @@ page,
 }
 .rule {
 	padding: 10rpx 20rpx;
-	color: #FFBC47;
+	color: white;
 	font-size: 26rpx;
 }
  
+// packageA//pages/hongBao/hongBao.js
+const app = getApp();
+let self = null;
+
+let ut = require("../../../utils/util.js")
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+		url: app.globalData.setting.imghost,
+		qiangHongBao: false,
+		qianging: false,
+		time: null,
+		
+		// hongBaoData: null, //保存抢红包活动的相关时间等信息
+		isStart: 0, //记录抢红包活动是否开始
+		result: null, //保存抢红包的结果
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+		console.log('onload');
+		self = this; 
+		
+		this.isLogin()
+		.then(function(data) {
+		
+			self.requestData('/api/weshop/redmoney/redConfig/get/'+app.globalData.setting.stoid, {})
+			.then(function(data) {
+				self.data.hongBaoData = data.data.data;
+				self.countDown();
+				self.setData({
+					storeName: app.globalData.config.store_name
+				});
+			});
+			
+		});
+  },
+	
+	// 判断是否授权登录
+	isLogin() {
+		return new Promise((resolve, reject) => {
+			let user_info = app.globalData.userInfo;
+			if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+			  wx.navigateTo({
+			    url: '/pages/togoin/togoin',
+			  })
+			} else {
+				resolve();
+			};
+		});
+	},
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+		console.log('onready');
+		
+		
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+		console.log('onshow');
+		
+		
+		
+		
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+		console.log('onhide');
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+	
+	// 请求数据
+	requestData(url, data) {
+		return new Promise((resolve, reject) => {
+			app.request.promiseGet(url, {data: data})
+			.then(res => {
+			  if(res.data.code == 0) {
+					console.log('resolve', res);
+					resolve(res);
+			  } else {
+					reject(res);
+				};
+			})
+		});
+	},
+	
+	//秒杀倒计时
+	//---小于10的格式化函数----
+	timeFormat(param) {
+	  return param < 10 ? '0' + param : param;
+	},
+	
+	handleTime(time) {
+		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);
+		return {
+		  day: this.timeFormat(day),
+		  hou: this.timeFormat(hou),
+		  min: this.timeFormat(min),
+		  sec: this.timeFormat(sec),
+		};
+	},
+	
+	//----秒杀倒计时函数-----
+	countDown() {
+	  // if (!this.data.is_timer) return false;
+		var time;
+	  // 获取当前时间，同时得到活动结束时间数组
+	  var newTime = ut.gettimestamp();
+	  // var List = this.data.saleGoods;
+	  // for (var j = 0; j < List.length; j++) {
+	    // var endTimeList = List[j];
+	    // 对结束时间进行处理渲染到页面
+	    // for (var i = 0; i < endTimeList.length; i++) {
+	      // var o = endTimeList[i];
+				var startTime = this.data.hongBaoData.start_time;
+				// var startTime = 1600;
+	      var endTime = this.data.hongBaoData.end_time;
+	      // if (o.status == 0) endTime = o.start_time
+	      var obj = null;
+				
+				if(startTime - newTime > 0) { //活动还没开始
+					this.setData({
+						isStart: 0,
+					});
+					time = startTime - 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),
+					// };
+					
+					obj = this.handleTime(time);
+				}
+	      // 如果活动未结束，对时间进行处理
+	      if (endTime - newTime > 0) { //活动还没结束
+					this.setData({
+						isStart: 1,
+					});
+	        time = endTime - 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),
+	        // };
+					
+					obj = this.handleTime(time);
+					
+	      } else { //活动已经结束
+	        //活动已结束，全部设置为'00'
+					this.setData({
+						isStart: 2,
+					});
+	        obj = {
+	          day: '00',
+	          hou: '00',
+	          min: '00',
+	          sec: '00'
+	        }
+	      }
+	      // var txt = "saleGoods[" + j + "][" + i + "].djs";
+	      self.setData({
+	        time: obj,
+	      });
+	    // }
+	
+	  // }
+	  setTimeout(self.countDown, 1000);
+	},
+	
+	qiangHongBao() {
+		if(!this.data.qianging) {
+			this.data.qianging = true;
+			app.request.promisePost('/api/weshop/redmoney/redRecord/saveRecord', {
+				data: {
+					store_id: app.globalData.setting.stoid,
+					user_id: app.globalData.user_id,
+					redid: this.data.hongBaoData.id,
+				}
+			})
+			.then(res => {
+			 //  if(res.data.code == 0){
+				// 	// wx.hideLoading();
+				// 	// wx.showToast({
+				// 	//   title: '领取成功',
+				// 	//   icon: 'success',
+				// 	//   duration: 2000
+				// 	// });
+				// 	console.log('请求提交成功',res.data);
+					
+				//  //  if(callback) {
+				//  //  	callback(res.data.data);
+				//  //  }
+			 //  } else if(res.data.code === -1) {
+				// 	// wx.hideLoading();
+				// 	// wx.showToast({
+				// 	//   title: '领取失败：' + res.data.msg,
+				// 	//   icon: 'none',
+				// 	//   duration: 2000
+				// 	// });
+				// 	// self.setData({
+				// 	// 	result: res.data
+				// 	// });
+					
+				// };
+				self.setData({
+					result: res.data,
+					qiangHongBao: true,
+				});
+			})
+		}
+		
+		
+	},
+	
+	receive() {
+		// app.postData('/api/wemd/stafftask/saveGuideTaskListGive', {
+		// 	store_id: app.globalData.userInfo.store_id,
+		// 	StaffId: _this.data.StaffId,
+		// 	Id: _this.data.details.Id,
+		// 	TaskType: _this.data.details.TaskType,
+		// });
+		
+		// postData(url, data, callback) {
+			wx.showLoading({
+				title: '奖励领取中'
+			});
+			app.request.promisePost('/api/wemd/stafftask/saveGuideTaskListGive', {
+				data: {
+					store_id: app.globalData.userInfo.store_id,
+					StaffId: _this.data.StaffId,
+					Id: _this.data.details.Id,
+					TaskType: _this.data.details.TaskType,
+				}
+			})
+			.then(res => {
+			  if(res.data.code == 0){
+					wx.hideLoading();
+					wx.showToast({
+					  title: '领取成功',
+					  icon: 'success',
+					  duration: 2000
+					});
+					// console.log('请求提交成功',res.data.data);
+				 //  if(callback) {
+				 //  	callback(res.data.data);
+				 //  }
+			  } else if(res.data.code === -1) {
+					wx.hideLoading();
+					wx.showToast({
+					  title: '领取失败：' + res.data.msg,
+					  icon: 'none',
+					  duration: 2000
+					});
+				};
+			})
+		// },
+	},
+	
+	
+	closePopup() {
+		this.setData({
+			qiangHongBao: false,
+			qianging: false,
+		});
+	},
+	
+	
+	gotoDetails() {
+		// this.data.qiangHongBao = false;
+		this.setData({
+			qiangHongBao: false
+		});
+		app.goto('/packageA/pages/hongBaoDetails/hongBaoDetails?redid=' + this.data.hongBaoData.id);
+	},
+ 	
+	
+})
 \ No newline at end of file
+{
+  "usingComponents": {},
+	"enablePullDownRefresh": false,
+	"navigationBarTitleText": "抢红包"
+}
 \ No newline at end of file
+<!--packageA//pages/hongBao/hongBao.wxml-->
+<view class="hongBao-container">
+	<view class="white fs26">由{{storeName}}发起抢红包</view>
+	<view class="btn-container">
+		<image src="{{url + 'miniapp/images/redmoney/redbag_btn.png'}}" class="btn" mode="aspectFit" bindtap="qiangHongBao"></image>
+	</view>
+	<view class="countdown-container">
+		<view class="countdown-txt">{{isStart == 0 ? '距离活动开始还有':(isStart == 1 ? '距离活动结束还有':'活动已经结束')}}</view>
+		<view class="countdown">
+			<view class="countdown-item">{{time.day}}天</view>
+			<view class="countdown-item">{{time.hou}}时</view>
+			<view class="countdown-item">{{time.min}}分</view>
+			<view class="countdown-item">{{time.sec}}秒</view>
+		</view>
+	</view>
+</view>
+
+<!-- 弹窗 -->
+<view class="popup-container" wx:if="{{qiangHongBao}}" bindtap="closePopup">
+	<view class="popup">
+		<block wx:if="{{result.code == 0}}">
+			<image src="{{url + 'miniapp/images/redmoney/hbtit.png'}}" mode="aspectFit"></image>
+			<view class="amount-container">
+					<view class="amount">￥{{result.data.redmoney}}</view>
+					<view class="btn-receive" catchtap="gotoDetails" data-redid="{{hongBaoData.id}}">
+						<image src="{{url + 'miniapp/images/redmoney/srhb.png'}}" class="btn-img"></image>
+					</view>
+			</view>
+		</block>
+		
+		<block wx:if="{{result.code == -1}}">
+			<image src="{{url + 'miniapp/images/redmoney/hbtit2.png'}}" mode="aspectFit"></image>
+			<!-- <view class="none">来晚了，红包已抢空~</view> -->
+			<view class="none">{{result.msg}}</view>
+			<view class="see" catchtap="gotoDetails" data-redid="{{hongBaoData.id}}">看看大家的手气 ></view>
+		</block>
+	</view>
+</view>
+
+<!-- 弹窗 -->
+<!-- <view class="popup-container">
+	<view class="popup">
+		<image src="{{url + 'miniapp/images/redmoney/hbtit2.png'}}" mode="aspectFit"></image>
+			<view class="none">来晚了，红包已抢空~</view>
+			<view class="see">看看大家的手气 ></view>
+	</view>
+</view> -->
+/* packageA//pages/hongBao/hongBao.wxss */
+page {
+	background: url('https://mshopimg.yolipai.net/miniapp/images/redmoney/hongbao_bg.jpg') center top;
+	background-size: 100% auto;
+}
+
+.hongBao-container {
+	padding: 20rpx;
+}
+
+.btn-container {
+	padding-top: 60rpx;
+	padding-bottom: 60rpx;
+	-webkit-animation: free_download 600ms linear alternate infinite;
+	animation: free_download 600ms linear alternate infinite;
+}
+
+@-webkit-keyframes free_download{
+    0% {-webkit-transform:scale(0.9);}
+    100% {-webkit-transform:scale(1.1);}
+}
+
+@keyframes free_download{
+    0% {transform:scale(0.9);}
+    100% {transform:scale(1.1);}
+}
+
+.countdown-container {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	height: 688rpx;
+	background: url('https://mshopimg.yolipai.net/miniapp/images/redmoney/indexbot.png') no-repeat left bottom;
+	background-size: 100% auto;
+	text-align: center;
+}
+
+.countdown {
+	display: flex;
+	justify-content: space-around;
+	padding: 200rpx 160rpx 0;
+}
+
+.countdown-item {
+	background: url('https://mshopimg.yolipai.net/miniapp/images/redmoney/timebox.png') no-repeat;
+	background-size: 100% 100%;
+	width: 90rpx;
+	height: 100rpx;
+	line-height: 120rpx;
+	color: white;
+}
+
+.btn {
+	width: 100%;
+	height: 400rpx;
+}
+
+.countdown-txt {
+	color: #ff6768;
+	text-align: center;
+	padding-top: 120rpx;
+	font-size: 36rpx;
+	font-weight: bold;
+}
+
+.popup-container {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	background-color: rgba(0,0,0,.7);
+}
+
+.popup {
+	position: relative;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	text-align: center;
+}
+
+
+.btn-img {
+	width: 200rpx;
+	height: 50rpx;
+}
+
+.amount-container {
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translateX(-55%);
+}
+
+.amount {
+	color: #fff005;
+	font-size: 68rpx;
+	text-align: center;
+	padding-top: 10rpx;
+	padding-bottom: 20rpx;
+}
+
+
+
+.none,
+.see {
+	position: absolute;
+	font-size: 26rpx;
+	color: white;
+	left: 50%;
+	transform: translateX(-60%);
+}
+
+.none {
+	font-size: 20rpx;
+	top: 36%;
+	margin-left: 55rpx;
+}
+
+.see {
+	top: 82%;
+	left: 50%;
+	transform: translateX(-58%);
+}
+
+.late {
+	font-size: 38;
+	color: #fff005;
+	padding-top: 40rpx;
+}
 \ No newline at end of file
+// packageA//pages/hongBao/hongBao.js
+const app = getApp();
+let reqData = {};
+let _this = null;
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+		url: app.globalData.setting.imghost,
+		list: null,
+		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+		pageNum: 1, // 当前页数
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+		_this = this;
+		console.log('options', options);
+		
+		this.isLogin()
+		.then(function(data) {
+		
+			_this.data.options = options;
+			reqData.url = '/api/weshop/redmoney/redRecord/page',
+			reqData.data = {
+				store_id: app.globalData.setting.stoid,
+				redid: _this.data.options.redid,
+			};
+			reqData.data2 = {
+				store_id: app.globalData.setting.stoid,
+				user_id: app.globalData.user_id,
+				redid: _this.data.options.redid,
+				pageSize: 1,
+				page: 1,
+			};
+			_this.getData(true, reqData.url, reqData.data);
+			_this.requestData(reqData.url, reqData.data2)
+			.then(function(data) {
+				_this.setData({
+					myRed: data.data.data.pageData[0]
+				});
+				// console.log('123', data.data.data.pageData[0]);
+			});
+			
+		});
+		
+		
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+		this.scrollToLower(reqData.url, reqData.data);
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+	
+	// 判断是否授权登录
+	isLogin() {
+		return new Promise((resolve, reject) => {
+			let user_info = app.globalData.userInfo;
+			if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+			  wx.navigateTo({
+			    url: '/pages/togoin/togoin',
+			  })
+			} else {
+				resolve();
+			};
+		});
+	},
+	
+	// 请求数据
+	requestData(url, data) {
+		return new Promise((resolve, reject) => {
+			app.request.promiseGet(url, {data: data})
+			.then(res => {
+			  if(res.data.code == 0) {
+					console.log('resolve', res);
+					resolve(res);
+			  } else {
+					reject(res);
+				};
+			})
+		});
+	},
+	
+	
+	
+	// 上拉加载请求数据
+	getData: function(isInit, url, data) {
+		wx.showLoading({
+		  title: '加载中',
+		})
+		this.requestData(url, data)
+		.then(function(res) {
+			wx.hideLoading();
+			console.log('res--->', res);
+			_this.setData({
+				isLoading: false
+			});
+			
+			if(isInit) {// 第一次加载
+				_this.setData({
+					list: res.data.data
+				});
+			} else {
+				
+				_this.setData({
+					'list.pageData': _this.data.list.pageData.concat(res.data.data.pageData)
+				});
+			};
+			
+			if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) {
+				_this.setData({
+					noMore: true
+				});
+			};
+	
+		})
+		.catch(function(reason) {
+			wx.hideLoading();
+			wx.showToast({
+			  title: reason.data.msg,
+			  icon: 'none',
+			  duration: 2000
+			})
+			_this.setData({
+				'list.pageData': []
+			});
+		});
+	},
+	
+	
+	// 上拉加载
+	scrollToLower(url, requestData, callback) {
+		// 页面数据
+		// let pageData = this.data.list.pageData;
+		// 数据总量
+		let total = this.data.list.total;
+		// 单页最大数据量
+		let pageSize = this.data.list.pageSize;
+		// 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’
+		if((total != 0)&&(total <= pageSize)) {
+			this.setData({
+				noMore: true
+			});
+		};
+		
+		if(!this.data.isLoading && !this.data.noMore) {
+			this.setData({
+				isLoading: true,
+				pageNum: this.data.pageNum + 1
+			});
+			requestData.page = this.data.pageNum;
+			this.getData(false, url, requestData);
+		};
+	},
+	
+	
+	
+})
 \ No newline at end of file
+{
+  "usingComponents": {
+		"nodata": "/components/nodata/nodata",
+		"nav_box": "/components/nav_box/nav_box"
+	},
+	"enablePullDownRefresh": false,
+	"navigationBarTitleText": "抢红包"
+}
 \ No newline at end of file
+<!--packageA//pages/hongBao/hongBao.wxml-->
+<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+<view class="hongBao-container">
+	<!-- <view class="white fs26">由美得得美妆商城发起抢红包</view> -->
+	<view class="btn-container">
+		<image src="{{url + 'miniapp/images/redmoney/redbag_pro.png'}}" class="btn" mode="aspectFit"></image>
+		<view class="amount">￥{{filter.show_default(myRed.redmoney, '0.00')}}</view>
+	</view>
+	<view class="list-container">
+		<!-- <view class="countdown-txt">获奖名单</view> -->
+		<image src="{{url + 'miniapp/images/redmoney/listit.png'}}" class="list-img" mode=""></image>
+		<view class="list">
+			<view class="list-item" wx:for="{{list.pageData}}">
+				<view class="flex ai-center">
+					<view class="avatar-container">
+						<image src="{{item.userimg}}" class="avatar"></image>
+					</view>
+					<view>
+						<view>{{item.vipname}}</view>
+						<view class="xc-ash fs24 pdt20">{{filter.format_time(item.addtime, 1)}}</view>
+					</view>
+				</view>
+				<view class="co-red">￥{{item.redmoney}}</view>
+			</view>
+			<nodata nodataContainer="txt-center" wx:if="{{list.pageData.length == 0}}"></nodata>
+			<!-- <view class="list-item">
+				<view class="flex ai-center">
+					<view class="avatar-container">
+						<image src="../../images/wx2.png" class="avatar"></image>
+					</view>
+					<view>
+						<view>good</view>
+						<view class="xc-ash fs24 pdt20">2020-12-12 18:00:00</view>
+					</view>
+				</view>
+				<view class="co-red">￥100.00</view>
+			</view> -->
+			<!-- <view class="countdown-item">50天</view>
+			<view class="countdown-item">9时</view>
+			<view class="countdown-item">23分</view>
+			<view class="countdown-item">43秒</view> -->
+		</view>
+	</view>
+	<view class="nodata" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 没有更多了 -</view>
+	<!-- <view class="no-more txt-center" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 没有更多了 -</view> -->
+</view>
+
+<nav_box></nav_box>
+
+<!-- 弹窗 -->
+<!-- <view class="popup-container">
+	<view class="popup">
+		<image src="{{url + 'miniapp/images/redmoney/hbtit.png'}}" mode="aspectFit"></image>
+		<view class="amount-container">
+			<view class="amount">0.53</view>
+			<view class="btn-receive">
+				<image src="{{url + 'miniapp/images/redmoney/srhb.png'}}" class="btn-img"></image>
+			</view>
+		</view>
+	</view>
+</view> -->
+
+<!-- 弹窗 -->
+<!-- <view class="popup-container">
+	<view class="popup">
+		<image src="{{url + 'miniapp/images/redmoney/hbtit2.png'}}" mode="aspectFit"></image>
+			<view class="none">来晚了，红包已抢空~</view>
+			<view class="see">看看大家的手气 ></view>
+	</view>
+</view> -->
+/* packageA//pages/hongBao/hongBao.wxss */
+page {
+	background: url('https://mshopimg.yolipai.net/miniapp/images/redmoney/hongbao_bg.jpg') center top;
+	background-size: 100% auto;
+}
+
+.hongBao-container {
+	padding: 20rpx;
+}
+
+.btn-container {
+	padding-top: 60rpx;
+	/* padding-bottom: 60rpx; */
+	/* transform:scale(1.2); */
+	position: relative;
+	/* -webkit-animation: free_download 600ms linear alternate infinite;
+	animation: free_download 600ms linear alternate infinite; */
+}
+
+/* @-webkit-keyframes free_download{
+    0% {-webkit-transform:scale(0.9);}
+    100% {-webkit-transform:scale(1.1);}
+}
+
+@keyframes free_download{
+    0% {transform:scale(0.9);}
+    100% {transform:scale(1.1);}
+} */
+
+.countdown-container {
+	/* position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	height: 688rpx;
+	background: url('https://mshopimg.yolipai.net/miniapp/images/redmoney/indexbot.png') no-repeat left bottom;
+	background-size: 100% auto;
+	text-align: center; */
+}
+
+.countdown {
+	/* display: flex;
+	justify-content: space-around;
+	padding: 200rpx 160rpx 0; */
+}
+
+.countdown-item {
+	/* background: url('https://mshopimg.yolipai.net/miniapp/images/redmoney/timebox.png') no-repeat;
+	background-size: 100% 100%;
+	width: 90rpx;
+	height: 100rpx;
+	line-height: 120rpx;
+	color: white; */
+}
+
+.btn {
+	width: 100%;
+	height: 400rpx;
+	transform: scale(1.1);
+}
+
+.countdown-txt {
+	/* color: #ff6768;
+	text-align: center;
+	padding-top: 120rpx;
+	font-size: 36rpx;
+	font-weight: bold; */
+}
+
+.popup-container {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	background-color: rgba(0,0,0,.7);
+}
+
+.popup {
+	position: relative;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	text-align: center;
+}
+
+
+.btn-img {
+	/* width: 200rpx;
+	height: 50rpx; */
+}
+
+.amount-container {
+	/* position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translateX(-55%); */
+}
+
+.amount {
+	color: #fff005;
+	font-size: 60rpx;
+	text-align: center;
+	position: absolute;
+	left: 49%;
+	top: 50%;
+	transform: translate(-50%);
+	padding-top: 30rpx;
+	/* padding-top: 10rpx;
+	padding-bottom: 20rpx; */
+}
+
+
+
+/* .none,
+.see {
+	position: absolute;
+	font-size: 26rpx;
+	color: white;
+	left: 50%;
+	transform: translateX(-60%);
+}
+
+.none {
+	font-size: 20rpx;
+	top: 36%;
+	margin-left: 55rpx;
+}
+
+.see {
+	top: 82%;
+	left: 50%;
+	transform: translateX(-58%);
+} */
+
+
+/* .list-container {
+	/* background: url('https://mshopimg.yolipai.net/miniapp/images/redmoney/timebox.png') no-repeat;
+} */
+
+.list-container {
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+
+.list {
+	/* position: relative; */
+	margin-top: -8rpx;
+}
+
+.list-img {
+	width: 100%;
+	height: 326rpx;
+}
+
+.list-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	background-color: white;
+	padding: 30rpx 20rpx;
+	border-bottom: 2rpx solid #f8f8f8;
+}
+
+.list-item:last-child {
+	border-bottom: none;
+}
+
+.avatar-container {
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+	overflow: hidden;
+	margin-right: 20rpx;
+}
+
+.avatar {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+
+.nodata {
+	color: white;
+	font-size: 24rpx;
+	text-align: center;
+	padding-top: 20rpx;
+}
@@ -43,7 +43,7 @@
 							data-errorimg="list2[{{index}}].original_img"></image>
 						</view>
 						<view class="details">
-							<view class="ellipsis-2 fs30 name">{{item.goods_name}}</view>
+							<view class="ellipsis-2 fs30 name">{{item.name}}</view>
 							<view>
 								<view class="red">
 									<text>{{item.integral}}积分 + ￥{{item.addmoney}}</text>						
@@ -17,6 +17,7 @@ Page({
 		currentPage:1,  //当前的页码
 		share_hidden:1,  //-- 分享的按钮隐藏 --	
 		hiddenPopup:1,
+		imghost: oo.imghost,
   },
  
   /**
@@ -29,7 +29,8 @@
 							   <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}至</text> <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text><text wx:else>不限</text>
 							</view>				
 						</view>
-						<view class="price">￥<text class="fs40">{{filters.toFix(item.money,2)}}</text></view>
+						<view class="price">￥<text class="fs40">{{filters.toFix(item.money,2)}}</text>   <image  src="{{imghost}}miniapp/images/coupon_img/sharelinke.png"  class="sharelink"></image></view>
+						
 					</view>
 					<view class="flex ai-center jc_sb pdt20">
 						<view wx:if="{{item.useobjecttype==0}}" class="coupon-ft ellipsis-2 fs28">全场任意产品通用</view>
@@ -507,7 +507,7 @@ radio .wx-radio-input.wx-radio-input-checked::before{
 .active {
 	background-color: #f2f2f2;
 }
-
+.sharelink{ width: 40rpx; height: 40rpx; padding-left:10rpx;}
  
  
  
@@ -52,7 +52,7 @@ Page({
     th.data.loading=1;
     var user_id=getApp().globalData.user_id;
     getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
-       data:{store_id:os.stoid,type:1,pageSize:10,page:th.data.curpage,user_id:user_id}
+       data:{store_id:os.stoid,type:1,pageSize:10,page:th.data.curpage,user_id:user_id,is_share:0}
     }).then(res => {
           th.data.loading=0;
           if(res.data.code==0){
+const app = getApp();
+let _this = null;
+let reqData = {};
+
+Page({
+	
+  data: {
+		list: null,
+		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+		pageNum: 1, // 当前页数
+		
+		startDate: '开始日期',
+		endDate: '结束日期',
+  },
+	
+  onLoad: function(t) {
+		_this = this;
+		
+		this.setData({
+			currentDate: this.currentDate(),	
+		});
+		
+		
+		
+		
+  },
+	
+  onShow: function() {
+    this.isLogin()
+    .then(function(data) {
+    	reqData.url = '/api/weshop/marketing/servicewrite/page';
+    	reqData.data = {
+    		storeId: app.globalData.setting.stoid,
+    		userId: app.globalData.user_id,
+    	};
+    	_this.getData(true, reqData.url, reqData.data);
+    });
+  },
+
+
+  onReachBottom: function() {
+		this.scrollToLower(reqData.url, reqData.data);
+  },
+	
+	// 判断是否授权登录
+	isLogin() {
+		return new Promise((resolve, reject) => {
+			let user_info = app.globalData.userInfo;
+			if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+			  wx.navigateTo({
+			    url: '/pages/togoin/togoin',
+			  })
+			} else {
+				resolve();
+			};
+		});
+	},
+	
+
+	bindDateChange1: function(e) {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		this.setData({
+			startDate: e.detail.value
+		})
+	},
+	
+	bindDateChange2: function(e) {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		this.setData({
+			endDate: e.detail.value
+		})
+	},
+	
+  searchOffline() {
+		console.log('执行查询');
+
+		let startDate = this.data.startDate;
+		let endDate = this.data.endDate;
+		
+		
+		
+		if(startDate == '开始日期' || endDate == '结束日期') {
+			wx.showToast({
+				title: '请选择完整的查询日期!',
+				icon: 'none',
+			})
+		} else if(new Date(startDate) > new Date(endDate)) {
+			wx.showToast({
+				title: '出错了，开始日期不能晚于结束日期!',
+				icon: 'none',
+			})
+			return;
+		} else {
+			this.setData({
+				list: null,
+				isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+				noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+				pageNum: 1, // 当前页数
+			});
+			
+			reqData.data.BeginDate = startDate;
+			reqData.data.EndDate = endDate;
+			reqData.data.page = 1;
+			this.getData(true, reqData.url, reqData.data);
+		};
+		
+		
+	},
+	
+	currentDate() { 
+		var now = new Date();
+		var year = now.getFullYear();       //年
+		var month = now.getMonth() + 1;     //月
+		var day = now.getDate();            //日
+		
+		var clock = year + "-";
+		
+		if(month < 10) month += "0";
+		clock += month + "-";
+		
+		if(day < 10) day += "0";		
+		clock += day;
+		
+		// if(hh < 10)
+		// 		clock += "0";
+				
+		// clock += hh + ":";
+		// if (mm < 10) clock += '0'; 
+		// clock += mm + ":"; 
+		 
+		// if (ss < 10) clock += '0'; 
+		// clock += ss; 
+		return clock; 
+	},
+	
+	
+	// 请求数据
+	requestData(url, data) {
+		return new Promise((resolve, reject) => {
+			app.request.promiseGet(url, {data: data})
+			.then(res => {
+			  if(res.data.code == 0) {
+					console.log('resolve', res);
+					resolve(res);
+			  } else {
+					reject(res);
+				};
+			})
+		});
+	},
+	
+	
+	// 上拉加载请求数据
+	getData: function(isInit, url, data) {
+	
+			wx.showLoading({
+			  title: '加载中',
+			});
+			this.requestData(url, data).then(function(res) {
+				
+					wx.hideLoading();
+					console.log('res--->', res);
+					_this.setData({
+						isLoading: false
+					});
+					
+					if(isInit) {// 第一次加载
+						_this.setData({
+							list: res.data.data
+						});
+	
+					} else {
+						_this.setData({
+							'list.pageData': _this.data.list.pageData.concat(res.data.data.pageData)
+						});
+					};
+					
+					if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) {
+						_this.setData({
+							noMore: true
+						});
+					};
+				
+			}).catch(function() {
+				wx.hideLoading();
+				_this.setData({
+					'list.pageData': []
+				});
+			});
+			// .catch(function(reason) {
+			// 	wx.hideLoading();
+			// 	wx.showToast({
+			// 	  title: reason.data.msg,
+			// 	  icon: 'none',
+			// 	  duration: 2000
+			// 	})
+			// 	_this.setData({
+			// 		'list.pageData': []
+			// 	});
+			// })
+			// ;
+	
+	},
+	
+	
+	// 上拉加载
+	scrollToLower(url, requestData, callback) {
+		// 页面数据
+		// let pageData = this.data.list.pageData;
+		// 数据总量
+		let total = this.data.list.total;
+		// 单页最大数据量
+		let pageSize = this.data.list.pageSize;
+		// 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’
+		if((total != 0)&&(total <= pageSize)) {
+			this.setData({
+				noMore: true
+			});
+		};
+		
+		if(!this.data.isLoading && !this.data.noMore) {
+			this.setData({
+				isLoading: true,
+				pageNum: this.data.pageNum + 1
+			});
+			requestData.page = this.data.pageNum;
+			this.getData(false, url, requestData);
+		};
+	},
+  
+  
+});
 \ No newline at end of file
+{
+    "navigationBarTitleText": "服务记录",
+		"enablePullDownRefresh": false,
+    "usingComponents": {
+			"nodata": "/components/nodata/nodata"
+		}
+}
 \ No newline at end of file
+<!--packageA//pages/service_record/service_record.wxml-->
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+<view class="container">
+		<view class="search-container">
+			<view class="flex jc_sb">
+				<view class="picker-container flex f1">
+					<picker class="picker-date" mode="date" start="2015-01-01" end="{{currentDate}}" bindchange="bindDateChange1">
+						<view class="picker">{{startDate}}</view>
+					</picker>
+					<view class="fs28 pdh10">至</view>
+					<picker class="picker-date" mode="date" start="2015-01-01" end="{{currentDate}}" bindchange="bindDateChange2">
+						<view class="picker">{{endDate}}</view>
+					</picker>
+				</view>
+				<view class="search-btn search-btn2" bindtap="searchOffline">查询</view>
+			</view>
+		</view>
+</view>
+
+<view class="offline-container">
+		<view class="offline-list">
+			<view class="item" wx:for="{{list.pageData}}">
+				<view class="subtitle">服务时间：{{item.EffectiveDay}}</view>
+				<view>
+					<view class="flex">
+						<view class="subitem">
+							<view class="key">项目名称</view>
+							<view class="val">{{item.ProjectName}}</view>
+						</view>
+						<view class="subitem">
+							<view class="key">服务门店</view>
+							<view class="val">{{item.StorageName}}</view>
+						</view>
+						<view class="subitem">
+							<view class="key">剩余次数</view>
+							<view class="val">{{item.EndQty}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 暂无数据 -->
+			<nodata nodataContainer="t-c" wx:if="{{list.pageData.length == 0}}"></nodata>
+			<!-- 没有更多了 -->
+			<view class="no-more t-c" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 没有更多了 -</view>
+		</view>
+</view>
+
+
+
+/* 背景色相关 */
+bg-white {
+	background-color: white;
+}
+
+/* 外边距相关 */
+mgt12 {
+	margin-top: 12rpx;
+}
+
+/* 边框相关 */
+.bdt {
+	border-top: 2rpx solid #F6F6F6;
+}
+
+/* 颜色相关 */
+.c-a9{
+	color: #A9A9A9;
+}
+.c-9 {
+	color: #999;
+}
+
+.c-tb {
+	color: #ff5000;
+}
+
+.c-r {
+	color: #FF3B3D;
+}
+
+/* 内边距 */
+.pdt20 {
+	padding-top: 20rpx;
+}
+
+.bold {
+	font-weight: bold;
+}
+
+.f1 {
+	flex: 1;
+}
+
+.pdh10 {
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+}
+
+
+page {
+  font-family: microsoft yahei;
+	background-color: #F5F5F5;
+	height: 100%;
+}
+
+.type-navbar {
+  white-space: nowrap;
+  display: flex;
+  height: 88rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  /* border-top: 2rpx solid #f6f6f6;  */
+}
+
+.type-box {
+  box-sizing: border-box;
+	width: 20%;
+  line-height: 88rpx;
+  text-align: center;
+  display: inline-block;
+  overflow: hidden;
+}
+
+.type-navbar-item {
+  /* border-bottom: 4rpx solid #fff; */
+}
+
+.type-item-on {
+	/* background-color: #FF3B3D; */
+	color: #FF3B3D;
+	font-weight: bold;
+  /* border-bottom: 4rpx solid #ED3036; */
+	position: relative;
+}
+.type-item-on:after {
+	content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: 40%;
+	height: 4rpx;
+	background-color: #FF3B3D;
+	margin: 0 auto;
+}
+
+.container {
+	position: fixed;
+	width: 100%;
+	top: 0;
+	z-index: 4;
+	/* position: -webkit-sticky;
+	position:sticky;
+	top: 0; */
+}
+
+.list-container {
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+	overflow: hidden;
+	/* height: calc(100% - 282rpx); */
+	padding-top: 282rpx;
+}
+
+.stay_evaluate {
+	background-color: white;
+	margin-top: 20rpx;
+	border-radius: 8rpx;
+}
+
+/* 原 */
+
+.goods-container {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  box-sizing: content-box;
+  padding: 20rpx 0;
+}
+
+.goods-box {
+  width: 100%;
+  background-color: #fff;
+  padding: 0 25rpx;
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+  border-bottom: 1rpx solid #eee;
+  padding-bottom: 25rpx;
+}
+
+.goods-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 100rpx;
+}
+
+.order-number {
+  font-size: 32rpx;
+  color: #666;
+}
+
+.pay-status {
+  color: #f23030;
+}
+
+.goods-cont {
+  padding: 20rpx 0;
+  display: flex;
+  justify-content: space-between;
+  position: relative;
+}
+
+.img-box {
+  width: 180rpx;
+  height: 180rpx;
+}
+
+.goods-mes {
+  width: 490rpx;
+}
+
+.goods-name {
+  height: 30rpx;
+  margin-bottom: 16rpx;
+  overflow: hidden;
+  line-height: 30rpx;
+  color: #333;
+  word-break: keep-all;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 30rpx;
+}
+
+.goods-price {
+  color: #f23030;
+  padding-bottom: 20rpx;
+  font-size: 30rpx;
+}
+
+.goods-num {
+  color: #999;
+  font-size: 30rpx;
+}
+
+.goods-tips {
+  height: 60rpx;
+  padding: 10rpx 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.order-total {
+  display: flex;
+  justify-content: flex-end;
+	padding-top: 24rpx;
+	padding-bottom: 24rpx;
+}
+
+.goods-total {
+  margin-right: 20rpx;
+}
+
+.order-btn {
+  width: 150rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  /* border: 1px solid #eee; */
+  margin-left: 10rpx;
+  /* float: right; */
+  border-radius: 6rpx;
+	overflow: hidden;
+	background-color: #FF3B3D;
+}
+
+.order-btn-pay {
+  color: #fff;
+  background-color: #f23030;
+  border-color: #f23030;
+}
+
+.return-btn.co-red {
+  color: #e02e24;
+}
+
+.check-btn {
+  margin-bottom: 20rpx;
+}
+
+/* 新 */
+
+
+.Commodity_number {
+  height: 80rpx;
+	color: #696969;
+  /* border-top: 13rpx solid rgb(245, 245, 245); */
+}
+
+.Commodity_number .lin {
+  border-right: 1rpx solid #C4182E;
+  margin: 0rpx 11rpx; width: 2rpx;
+  height: 31rpx;
+}
+
+.Commodity_number image {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.padding {
+  padding: 0 18rpx;
+}
+
+/* 文字基线对齐 */
+
+.baseline {
+  align-items: baseline;
+}
+
+.border_bottom {
+  border-bottom: 2rpx solid rgb(245, 245, 245);
+}
+
+/* 单个商品框架 */
+
+.detail_commodity {
+  height: 231rpx;
+}
+
+.detail_commodity image {
+	display: block;
+  /* width: 186rpx;
+  height: 186rpx; */
+	width: 100%;
+	height: 100%;
+}
+
+.detail_commodity .goods_name {
+  width: 485rpx;
+  /* height: 75rpx; */
+  line-height: 37rpx;
+	text-align: justify;
+}
+
+.Commodity_content {
+  height: 185rpx;
+  margin-left: 21rpx;
+}
+
+.Commodity_content .Commodity_goods {
+  height: 150rpx;
+}
+
+.Commodity_content .Commodity_money {
+  font-size: 16rpx;
+  letter-spacing: 1rpx;
+}
+
+/* 商品评价按钮框架 */
+
+.commodity_evaluate {
+  /* padding-top: 15rpx;
+  padding-bottom: 15rpx; */
+  /* border-bottom: 4rpx solid rgb(245, 245, 245); */
+}
+
+.commodity_evaluate .commodity_smy .commodity_money {
+  margin-left: 29rpx;
+  letter-spacing: 1rpx;
+	/* font-weight: bold; */
+	
+}
+
+.commodity_evaluate .links {
+  /* height: 92rpx; */
+  /* height: auto; */
+	padding-top: 20rpx;
+	padding-bottom: 20rpx;
+	border-top: 2rpx solid #F6F6F6;
+	display: flex;
+	align-items: center;
+}
+
+.commodity_evaluate .commodity_To_evaluate {
+  width: 155rpx;
+  height: 48rpx;
+  border-radius: 6rpx;
+  line-height: 48rpx;
+  /* margin-bottom: 10rpx; */
+}
+
+.commodity_evaluate .commodity_To_evaluate view {
+  height: 39rpx;
+  line-height: 39rpx;
+}
+
+.commodity_evaluate .comment_go {
+  /* background-color: rgb(211, 28, 52); */
+	background-color: #FF3B3D;
+  color: white;
+  margin-left: 18rpx;
+  width: 155rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.Commodity_spec {
+  height: 37rpx;
+  line-height: 37rpx;
+  max-width: 160rpx;
+  background-color: rgb(236, 236, 236);
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  margin-top: 10rpx;
+  padding:0rpx 10rpx;
+}
+
+.Commodity_evaluation .Comment_content {
+  color: rgb(153, 153, 153);
+  letter-spacing: 1rpx;
+}
+
+.Commodity_evaluation .starss {
+  height: 58rpx;
+  /* //  line-height: 58rpx; */
+  align-items: center;
+}
+
+.Commodity_evaluation .commen {
+  height: 58rpx;
+  line-height: 58rpx;
+}
+
+.Commodity_evaluation .starss .stars {
+  line-height: 58rpx;
+}
+
+.Commodity_evaluation .starss .stars image {
+  width: 29rpx;
+  height: 26rpx;
+  margin-right: 5rpx;
+}
+
+.Commodity_evaluation .Comment_images image {
+  width: 100rpx;
+  height: 100rpx;
+  margin-right: 8rpx;
+  margin-top: 18rpx;
+  border-radius: 6rpx;
+  border: 3rpx solid rgb(245, 245, 245);
+}
+
+.commodity_evaluate .View_evaluation {
+  border: 1px solid #E5E5E5;
+  color: rgb(0, 0, 0);
+  background-color: rgb(255, 255, 255);
+  margin-left: 18rpx;
+}
+
+.comment_addtime {
+  height: 50rpx;
+}
+
+.title_width {
+  width: 146rpx;
+  text-align: center;
+}
+
+.After_all {
+  height: 80rpx;
+  background-color: rgb(245, 245, 245);
+}
+
+.After_all .Line {
+  border-top: 1rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+	color: #ccc;
+}
+
+/* 无订单 */
+
+.empty_order image {
+  width: 292rpx;
+  height: 268rpx;
+  margin-top: 202rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 10rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 60rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 60rpx;
+	line-height: 60rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 8rpx;
+}
+
+.rel {
+	box-sizing: border-box;
+  width: 180rpx;
+  height: 180rpx;
+  overflow: hidden;
+  /* border: 2rpx solid rgb(236, 236, 236); */
+}
+
+.abs {
+  top: 15rpx;
+  left: -39rpx;
+  width: 154rpx;
+  height: 40rpx;
+  background-color: rgb(214, 1, 33);
+  transform: rotate(320deg);
+  color: rgb(255, 255, 255);
+  line-height: 40rpx;
+}
+.code{
+  width: 44rpx;
+  height: 44rpx;
+}
+.refund{
+  margin-top: 20rpx;
+}
+
+.tab-container {
+	display: flex;
+	justify-content: space-between;
+	text-align: center;
+	font-size: 28rpx;
+	border-bottom: 2rpx solid #f2f2f2;
+}
+.tab-container .iconfont {
+	margin-right: 10rpx;
+}
+.tab {
+	flex: 1;
+	line-height: 80rpx;
+	background-color: white;
+	position: relative;
+}
+.tab.active {
+	color: #FF3B3D;
+	font-weight: bold;
+}
+.tab.active::after {
+	content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: 50%;
+	height: 2px;
+	margin: 0 auto;
+	background-color: #FF3B3D;
+}
+.search-container {
+	/* display: flex; */
+	padding: 10px;
+	background-color: white;
+}
+.search-input {
+	background-color: #f2f2f2;
+	flex: 1;
+	border-radius: 4px 0 0 4px;
+	height: 70rpx;
+	line-height: 70rpx;
+	font-size: 14px;
+	padding: 0 10px;
+}
+.search-btn {
+	color: white;
+	font-size: 14px;
+	background-color: #FF3B3D;
+	padding: 8px 20px;
+	border-radius: 0 4px 4px 0;
+}
+.picker-container {
+	padding-right: 10rpx;
+	align-items: center;
+	
+}
+.picker-date {
+	background-color: #f5f5f5;
+	flex: 1;
+	border-radius: 10rpx;
+}
+/* .picker-date:before {
+	font-family: iconfont;
+	content: '\e64c';
+} */
+.picker {
+	color: #ccc;
+	line-height: 70rpx;
+	font-size: 26rpx;
+	position: relative;
+	padding-left: 70rpx;
+}
+
+.picker:before {
+	position: absolute;
+	font-family: iconfont;
+	content: '\e64c';
+	left: 30rpx;
+}
+
+.list2 {
+	padding-left: 18rpx;
+	padding-right: 18rpx;
+}
+.title {
+	padding: 20rpx;
+	font-size: 26rpx;
+	display: flex;
+	align-items: center;
+}
+.icon-order {
+	font-size: 26rpx;
+	color: #FF3B3D;
+	margin-right: 10rpx;
+}
+.subtitle {
+	display: flex;
+	font-size: 24rpx;
+	justify-content: space-between;
+	background-color: #f0f0f0;
+	line-height: 60rpx;
+	padding: 0 20rpx;
+	color: #999;
+}
+.item {
+	background-color: white;
+	border-radius: 16rpx;
+	margin-top: 20rpx;
+	overflow: hidden;
+}
+.subitem {
+	width: calc(100% / 3);
+	text-align: center;
+	font-size: 26rpx;
+}
+.name {
+	padding: 0 20rpx;
+	margin: 20rpx 0;
+	font-size: 26rpx;
+	word-break: break-all;
+	text-align: justify;
+}
+.key {
+	padding: 20rpx 0;
+	color: #999;
+}
+.val {
+	padding-bottom: 20rpx;
+	color: red;
+}
+
+.offline-container {
+	padding: 106rpx 20rpx 20rpx;
+}
+
+.search-btn2 {
+	border-top-left-radius: 8rpx;
+	border-bottom-left-radius: 8rpx;
+}
+
+
+.no-more {
+	font-size: 28rpx;
+	line-height: 3;
+	color: #909090;
+}
+
+
+
@@ -249,7 +249,7 @@ Page({
   bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
-    _errObj[_errImg] = "/public/images/empty.jpg";
+    _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
   },
   goto: function(e) {
@@ -24,7 +24,10 @@
     <view class="content_box">
       <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn=''">
         <view class="content_box_img">
-          <image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
+          <image src="{{iurl+items.cover_img}}" lazy-load="true" binderror="bind_bnerr2" wx:if="{{items.cover_img}}"
+		     data-errorimg="wareCard[{{index}}].cover_img"></image>
+		  <image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" wx:else
+		     data-errorimg="wareCard[{{index}}].lbUrl"></image>
         </view>
         <view class="content_box_title">
           <view class="content_ware_title">
@@ -84,7 +84,7 @@ page {
 }
  
 .content_box_img image {
-  width: 100%;
+  width: 230rpx;
   height: 230rpx;
 }
  
@@ -129,7 +129,7 @@ Page({
   bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
-    _errObj[_errImg] = "/public/images/empty.jpg";
+    _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
  
   },
@@ -26,7 +26,9 @@
       <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
-          <image src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
+          <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
+          <image wx:else src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
+		  
           <block wx:if="{{item.actType!=0}}">
             <view class="{{[item.actType==1?'content_box_img_title content_box_img_ground1':item.actType==2?'content_box_img_title content_box_img_ground2':item.actType==4?'content_box_img_title content_box_img_ground3':'content_box_img_title content_box_img_ground4']}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift01.png'}}" lazy-load="true"></image>
@@ -80,7 +80,7 @@
 }
  
 .content_box_img image {
-  width: 100%;
+  width: 230rpx;
   height: 230rpx;
 }
  
@@ -26,7 +26,7 @@
 		              <!-- 选择门店模块 -->
 		               <view  class="flex-space-between address ai_end xc-width ">
  
-		                           <view class="flex ai_end" wx:if="{{def_pick_store}}">
+		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
 		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
 		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -53,7 +53,7 @@
 		      						 </block>				       
 		      				   </block>
  
-		                         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+		                         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
  
  
 		              <!--商品的属性项目-->
@@ -28,7 +28,7 @@
 		              <!-- 选择门店模块 -->
 		               <view  class="flex-space-between address ai_end xc-width ">
  
-		                           <view class="flex ai_end" wx:if="{{def_pick_store}}">
+		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
 		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
 		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -54,7 +54,7 @@
 		      					     	  <view wx:if="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
 		      						 </block>				       
 		      				   </block>		      				   	   
-		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
  
  
 		              <!--商品的属性项目-->
@@ -492,9 +492,8 @@ Page({
               })
             }
           }
-
         }, 500)
-      },1500)
+      },700)
  
     });
  
@@ -2075,8 +2074,9 @@ Page({
  
     var timer_get = setInterval(function() {
       if (th.data.is_get_local_ok == 0) return false;
-      var dd = null,
-          i = getApp().request;
+      var dd = null,i = getApp().request;
+	  if (!th.data.sele_g) return false;	  
+		  
       var g_distr_type = th.data.sele_g.distr_type;
       if (g_distr_type != 0) {
         dd = {
@@ -2160,9 +2160,12 @@ Page({
  
   },
  
+  
   //------------处理门店---------------
   deal_pickup(e){
     var th=this;
+	if(!th.data.sele_g) return false
+	
     var g_distr_type=th.data.sele_g.distr_type;
 	wx.hideLoading(); 
  
@@ -2323,6 +2326,8 @@ Page({
   //------------处理线下门店库存--------
   deal_pickup_dline(e){
     var pkno=[],th=this;
+	if(!th.data.sele_g) return false;
+	
     if(this.data.def_pick_store){
       pkno.push(this.data.def_pick_store.pickup_no);
     }
@@ -2698,6 +2703,7 @@ Page({
 		   }else{
 			   ee.setData({prom_type: 0, isshow: 1,});
 			   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+			   ee.get_sto();
 			   return false;
 		   }					   
 		})
@@ -4596,8 +4602,8 @@ Page({
  
       getApp().request.put('/api/weshop/users/update', {
         data: {
-          user_id,
-          def_pickup_id
+          user_id:user_id,
+          def_pickup_id:def_pickup_id
         },
         success: function(res) {
           if (res.data.code == 0) {
@@ -433,7 +433,7 @@
                     </view>
                   </view>
  
-                  <view wx:if="{{def_pick_store}}">
+                  <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
                   <view  class="flex-space-between address ai_end  ">
                      <view>
                        <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
@@ -1031,7 +1031,7 @@
         <!-- 选择门店模块 -->
          <view  class="flex-space-between address ai_end xc-width ">
  
-                     <view class="flex ai_end" wx:if="{{def_pick_store}}">
+                     <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
                        <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
                          <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
                           距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -1058,7 +1058,7 @@
 						 </block>				       
 				   </block>
  
-                   <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+                   <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
          </view>
  
        <!--商品的属性项目-->
@@ -75,6 +75,8 @@ Page({
     new_nav: "", //新人页面跳转地址	
     w_holiday_pop:0,
  
+		showHongbao: true,
+		showHongbaoSmall: false,
   },
  
   onLoad: async function(tt) {
@@ -94,7 +96,27 @@ Page({
 	         }
 	     })
 	 }
-	 	 
+	 
+	// 判断是否有红包活动 
+	getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/'+getApp().globalData.setting.stoid, {
+	 	data: {}
+	}).then(function(data) {
+	 	// console.log('909090909090----->', data.data.code);
+		let code = data.data.code;
+		if(code == 0) {
+	
+			th.setData({
+				showHongbao: true,
+			});
+		} else if(code == -1) {
+			th.setData({
+				showHongbao: false,
+			});
+		};
+	});
+	 
+	 
+	 // console.log(9090909);
  
  
     //看一下商家是否开通了权益
@@ -184,8 +206,7 @@ Page({
       }
     })
  
-    
-
+  			
   },
   //关闭新用户领取广告
   close_disgraceful: function() {
@@ -205,7 +226,18 @@ Page({
 		 getApp().requestCardNum(this);
 	}  
  
-    var th = this
+    var th = this	
+	var show=getApp().globalData.isLoad_ad;
+	var userInfo=getApp().globalData.userInfo;
+	//有加载过一次首页，就显示.或者有会员就显示
+	if(show || userInfo || getApp().globalData.user_id){
+	   var full_screen = th.selectComponent("#full_screen"); //组件的id
+	   full_screen.get_the_full_screen();		   
+	}else{
+	   getApp().globalData.isLoad_ad=1;	
+	}	
+		
+	
   },
   //当隐藏的时候就关闭计时器
   onHide: function() {
@@ -251,6 +283,7 @@ Page({
       }
     })
  
+		
  
     //--首页的问题--
     if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
@@ -261,7 +294,10 @@ Page({
       wx.setNavigationBarTitle({
         title: getApp().globalData.setting.appName,
       });
-    }
+    };
+		
+		
+		
   },
   //---读取数据内容---
   async init_fir() {
@@ -273,21 +309,24 @@ Page({
         enabled: 1
       }
     }).then(res => {
-      var a = res.data.data.pageData;
-      var arr = new Array();
-      for (var i = 0; i < a.length; i++) {
-        var tt = {
-          'ad_code': o.imghost + a[i].ad_code,
-          'media_link': '',
-		  'ad_weapplink':a[i].ad_weapplink
-        };
-        arr.push(tt);
-      }
-      if (arr.length > 0) e.setData({
-        banner: arr,
-      });
+		
+      if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){			
+		  var a = res.data.data.pageData;
+		  var arr = new Array();
+		  for (var i = 0; i < a.length; i++) {
+			var tt = {
+			  'ad_code': o.imghost + a[i].ad_code,
+			  'media_link': '',
+			  'ad_weapplink':a[i].ad_weapplink
+			};
+			arr.push(tt);
+		  }
+		  if (arr.length > 0) e.setData({
+			banner: arr,
+		  });
  
-      wx.stopPullDownRefresh();
+		  wx.stopPullDownRefresh();
+	  }
     })
  
     //-----秒杀-----
@@ -875,10 +914,16 @@ Page({
  
   //导航跳转
   nav_goto:function(e){
-  		  var url=e.currentTarget.dataset.url;
-  		  if(!url || url=='') return; 
-  		  if(url[0]!='/') url='/'+url;
-  		  getApp().goto(url);
+		var url=e.currentTarget.dataset.url;
+		if(!url || url=='') return; 
+		if(url[0]!='/') url='/'+url;
+		getApp().goto(url);
+		if(this.data.showHongbao) {
+			this.setData({
+				showHongbao: false,
+				showHongbaoSmall: true, //显示抢红包小图标
+			});
+		}		
    },
  
    //----跳转到搭配购买----
@@ -898,6 +943,14 @@ Page({
 			title: '首页-' + getApp().globalData.config.store_name,
 		}
 	},
-
+	
+	
+	// 关闭首页抢红包主弹窗，显示侧边栏抢红包小图标
+	closeHongbao() {
+		this.setData({
+			showHongbao: false, //关闭抢红包主弹窗
+			showHongbaoSmall: true, //显示抢红包小图标
+		});
+	},
  
 });
 \ No newline at end of file
@@ -17,7 +17,8 @@
         "picMax": "/components/diy_picMax/diy_picMax",
         "mvideo": "/components/diy_video/diy_video",    
         "service": "/components/diy_service/diy_service",
-		"scan": "/components/diy_scan/diy_scan"
+		"scan": "/components/diy_scan/diy_scan",
+		"full_screen": "/components/full_screen/full_screen"
     },
 	"enablePullDownRefresh": false
 }
 \ No newline at end of file
@@ -287,8 +287,11 @@
     <!-- 商品列表 -->
  
   </view>
+	
+	
  
 </view>
+
 <!--是否是自定义-->
 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}">
   <block wx:for="{{template_arr}}" wx:key="{{index}}">
@@ -377,6 +380,27 @@
   </view>
 </block>
  
+<!-- 抢红包 -->
+<block wx:if="{{showHongbao}}">
+	<view class="hongbao-container">
+		<view class="hongbao">
+			<image src="{{url + 'miniapp/images/redmoney/hongBao.png'}}" class="hongbao-img" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao"/>
+			<image src="{{url + 'miniapp/images/redmoney/xlose.png'}}" class="close" bindtap="closeHongbao"/>
+		</view>
+	</view>
+</block>
+
+
+	
+<block wx:if="{{showHongbaoSmall}}">
+	<view>
+		<image src="{{url + 'miniapp/images/redmoney/hongbao_sm.gif'}}" class="hongbao_sm-img" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao"/>
+	</view>
+</block>
+
+<!-- <hongbao id="hongbao" bind:closeHongbao="closeHongbao" wx:if="{{showHongbao}}" url="{{url}}"></hongbao> -->
+ <full_screen id="full_screen"></full_screen>
+
  
  
  
@@ -925,4 +925,43 @@ page {
   overflow-x: hidden;
   padding-bottom: 120rpx;
 }
-.container{ overflow: hidden;}
 \ No newline at end of file
+.container{ overflow: hidden;}
+
+
+.hongbao-container {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	background-color: rgba(0,0,0,.5);
+	z-index: 999;
+}
+
+.hongbao {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.hongbao-img {
+	width: 440rpx;
+	height: 640rpx;
+}
+
+.close {
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+
+.hongbao_sm-img {
+	width: 124rpx;
+	height: 170rpx;
+	position: fixed;
+	top: 50%;
+	right: 0;
+	/* transform: translateY(-50%); */
+	z-index: 10000;
+}
 \ No newline at end of file
@@ -63,7 +63,7 @@
       <view wx:else>
         <view class="text">有效期:不限</view>
       </view>
-	  <view wx:if="{{detail.Remark}}" class="textss">{{detail.Remark}}</view>	
+	  <view wx:if="{{detail.Remark1}}" class="textss"> {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark1}}</view>	
       <view wx:else class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
       </view>
  
@@ -102,7 +102,8 @@
       <view wx:else>
         <view class="text">有效期: 不限</view>
       </view>
-      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{detail.UseObjectID==null || detail.UseObjectID==''?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
+      <view wx:if="{{detail.Remark1}}" class="textss"> {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</view>	
+      <view wx:else class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
       </view>
     </view>
     </view>
@@ -350,7 +350,8 @@ color:#999999;
   font-size: 25rpx;
   text-align: center;
  
-  height: 47rpx;
+  min-height: 47rpx;
+  height:auto;
   color: #999999;
 }
  
@@ -48,6 +48,7 @@ module.exports = {
       console.log("thirdLogin");
       console.log(e);
       a.request.get("/api/weshop/users/openidandkey", {
+		isShowLoading:0,
         data: {
           js_code: e,
           store_id: a.globalData.setting.stoid,
@@ -174,6 +175,7 @@ module.exports = {
     if (app_d.user_id != "" && app_d.user_id != null) {
       var ab = this.app().request;
       ab.get("/api/weshop/users/get/" + oo.stoid + "/" + app_d.user_id, {
+		isShowLoading:0,
         success: function (e) {
           app_d.userInfo = e.data.data;
           "function" == typeof t && t(e.data.data);
@@ -29,7 +29,7 @@ var filters = {
 		var fm = [d.getFullYear(), d.getMonth() + 1, d.getDate()].join('-');
 		var md = (d.getMonth() + 1) + '月' + d.getDate() + '日';
 		if (isFull == 1)
-			fm = fm + ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':');
+			fm = fm + ' ' + [appendZero(d.getHours()), appendZero(d.getMinutes()), appendZero(d.getSeconds())].join(':');
 		if (isFull == 2) {
 			fm = md + ' ' + [appendZero(d.getHours()), appendZero(d.getMinutes())].join(':');
 		}
@@ -55,7 +55,30 @@ var filters = {
 				return spec + "/" + color;
 			}
 		}
-	}
+	},
+	
+	
+	show_default: function (value, placeholder, multiple) {
+		if(typeof value === 'number') {
+			if(isNaN(value) || value === 0) {
+				return placeholder || '0';
+			} else {
+				if(multiple) {
+					return value / multiple;
+				} else {
+					return value;
+				}
+			};	
+		} else if(value === '' || value === undefined || value === null) {
+			return placeholder || '-';
+		} else {
+			return value;
+		}
+	},
+	
+	
+	
+	
 };
  
 module.exports = {
@@ -65,4 +88,5 @@ module.exports = {
 	format_time: filters.format_time,
 	pInt: filters.pInt,
 	show_gui_ge: filters.show_gui_ge,
+	show_default: filters.show_default,
 }
 \ No newline at end of file