Merge branch 'dev' into 'test'

Dev See merge request !653

Merge branch 'dev' into 'test'
Dev See merge request !653
后端研发-苏明海
2 parents 6bf1e62c 5191dfd9
Showing 18 changed files with 322 additions and 52 deletions
components/diy_advertising/diy_advertising.js
components/diy_advertising/diy_advertising.wxml
components/diy_notice/g_filter.wxs
components/diy_scan/diy_scan.wxml
pages/activity/pind_list/g_filter.wxs
pages/activity/pind_list/pind_list.js
pages/activity/pind_list/pind_list.wxml
pages/activity/pind_list/pind_list.wxss
pages/activity/seckill_list/g_filter.wxs
pages/activity/seckill_list/seckill_list.js
pages/activity/seckill_list/seckill_list.wxml
pages/activity/seckill_list/seckill_list.wxss
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart/cart.wxss
pages/cart/cart/g_filter.wxs
pages/cart/cart2/cart2.js
utils/util.js
@@ -18,6 +18,23 @@ Component({
     someData: {},
     max_sw_height:260,
   },
+
+  ready: function () {
+    var data_arr=this.properties.object.data;
+    var is_show=0;
+    for(var i in data_arr){
+         var item=data_arr[i];
+         var now=new Date();
+         if((!item.beg_date || now>new Date(item.beg_date))
+           && (!item.end_date || now<new Date(item.end_date)))
+         {
+              this.setData({is_show:1});
+              break;
+         }
+    }
+
+
+  },
   methods: {
     customMethod: function () { },
@@ -398,7 +398,7 @@
 </view>
 <!--幻灯片-->
-<block wx:if='{{object.style==4}}'>
+<block wx:if='{{object.style==4 && is_show}}'>
   <swiper class="swiper" circular="true"  autoplay="{{autoplay}}" current="{{object.sw_index}}"
@@ -409,19 +409,21 @@
           style="height:{{max_sw_height}}rpx" >
     <block wx:for="{{object.data}}" wx:for-index="index" >
+      <block wx:if="{{(!item.begin_date || g_filter.beg_time(item.begin_date) ) && (!item.end_date || g_filter.end_time(item.end_date) )}}">
         <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
           <swiper-item>
                <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" lazy-load="true"/>
-               <view class="title" wx:if="{{title}}">{{item.title}}</view>
+               <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
           </swiper-item>
         </navigator>
         <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url" wx:else>
           <swiper-item>
               <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" lazy-load="true"/>
-              <view class="title" wx:if="{{title}}">{{item.title}}</view>
+              <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
           </swiper-item>
         </view>
+      </block>
     </block>
   </swiper>
@@ -2,8 +2,28 @@ var g_filters = {
 	has_char:function(url,key){
 	  if(!url)	return -1;
 	  return url.indexOf(key);		
+	},
+	beg_time:function(beg_date){
+	    var fmt1 = beg_date.substring(0, 19);
+        var reg = getRegExp("-", "g");
+        var fmt2 = fmt1.replace(reg, '/');
+        var t1 = getDate(fmt2);
+        var tnow=getDate();
+        if(t1<=tnow) return 1;
+        return 0;
+	},
+	end_time:function(end_date){
+	        var fmt1 = end_date.substring(0, 19);
+            var reg = getRegExp("-", "g");
+            var fmt2 = fmt1.replace(reg, '/');
+            var t1 = getDate(fmt2);
+            var tnow=getDate();
+            if(t1>=tnow) return 1;
+            return 0;
 	}
 }
 module.exports = {
-	has_char: g_filters.has_char
+	has_char: g_filters.has_char,
+	beg_time: g_filters.beg_time,
+	end_time: g_filters.end_time,
 }
 \ No newline at end of file
-<view  class="scan_view" disable-scroll="true"  bindtap='getScancode'  style="top:{{top}}px;left:{{left}}px;" bindtouchmove="setTouchMove">
+<block wx:if="{{object.bg_color}}">
+<view  class="scan_view" disable-scroll="true"  bindtap='getScancode'
+       style="top:{{top}}px;left:{{left}}px; background-color:{{object.bg_color}}; opacity: 0.5 " bindtouchmove="setTouchMove">
     <view style="text-align: center;">
       <image class="cs-img" src="{{object.img}}"></image>
-      <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
+      <view class="s_title"  wx:if="{{object.title!=''}}">
+          <text wx:if="{{object.word_color}}" style="color:{{object.word_color}}">{{object.title}}</text>
+          <text wx:else >{{object.title}}</text>
+      </view>
     </view>	
 </view>
- 
+</block>
+
+<block wx:else>
+<view  class="scan_view" disable-scroll="true"  bindtap='getScancode'  style="top:{{top}}px;left:{{left}}px;" bindtouchmove="setTouchMove">
+    <view style="text-align: center;">
+        <image class="cs-img" src="{{object.img}}"></image>
+        <view class="s_title"  wx:if="{{object.title!=''}}">
+            <text wx:if="{{object.word_color}}" style="color:{{object.word_color}}">{{object.title}}</text>
+            <text wx:else>{{object.title}}</text>
+        </view>
+    </view>
+</view>
+</block>
+var g_filters = {
+	has_char:function(url,key){
+	  if(!url)	return -1;
+	  return url.indexOf(key);		
+	},
+	beg_time:function(beg_date){
+	    var fmt1 = beg_date.substring(0, 19);
+        var reg = getRegExp("-", "g");
+        var fmt2 = fmt1.replace(reg, '/');
+        var t1 = getDate(fmt2);
+        var tnow=getDate();
+        if(t1<=tnow) return 1;
+        return 0;
+	},
+	end_time:function(end_date){
+	        var fmt1 = end_date.substring(0, 19);
+            var reg = getRegExp("-", "g");
+            var fmt2 = fmt1.replace(reg, '/');
+            var t1 = getDate(fmt2);
+            var tnow=getDate();
+            if(t1>=tnow) return 1;
+            return 0;
+	}
+}
+module.exports = {
+	has_char: g_filters.has_char,
+	beg_time: g_filters.beg_time,
+	end_time: g_filters.end_time,
+}
 \ No newline at end of file
@@ -44,12 +44,17 @@ Page({
 		}).then(res => {
 			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
 				var a = res.data.data.pageData;
-				var tt = {
-				  'ad_code': os.imghost + a[0].ad_code,
-				  'media_link': '',
-				  'ad_weapplink':a[0].ad_weapplink
-				};
-				th.setData({ad_data:tt});				
+				var narr=[];
+				for(var i in a){
+					var tt = {
+					  'ad_code': os.imghost + a[0].ad_code,
+					  'media_link': '',
+					  'ad_weapplink':a[0].ad_weapplink
+					};
+					narr.push(tt);
+				}
+				
+				th.setData({ad_data:narr});				
 			}					 			
 		})
     },
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class=" body_frame">
 <block wx:if="{{ad_data}}">
-  <image mode="widthFix" src="{{ad_data.ad_code}}" style="width: 100%;"></image>
+   <swiper class="swiper" circular="true"
+             indicator-dots="true"
+            style="height:{{max_sw_height}}rpx" >
+      <block wx:for="{{ad_data}}">    
+     	
+          <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
+            <swiper-item>
+                 <image src="{{item.ad_code}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" lazy-load="true"/>
+            </swiper-item>
+          </navigator>
+     
+          <view data-url="{{item.ad_weapplink}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+            <swiper-item>
+                <image src="{{item.ad_code}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" lazy-load="true"/>
+            </swiper-item>
+          </view>     
+     
+      </block>
+    </swiper>
 </block>
 <block wx:else>
   <image class="xc-top-img" src="{{url}}/miniapp/images/team.jpg"></image>
@@ -3,7 +3,7 @@ page{
 }
 .kill-list{
   width: 95%;
-  margin-top: -50rpx;
+  margin-top: -10rpx;
   position:absolute;
   left: 2.5%;
+var g_filters = {
+	has_char:function(url,key){
+	  if(!url)	return -1;
+	  return url.indexOf(key);		
+	},
+	beg_time:function(beg_date){
+	    var fmt1 = beg_date.substring(0, 19);
+        var reg = getRegExp("-", "g");
+        var fmt2 = fmt1.replace(reg, '/');
+        var t1 = getDate(fmt2);
+        var tnow=getDate();
+        if(t1<=tnow) return 1;
+        return 0;
+	},
+	end_time:function(end_date){
+	        var fmt1 = end_date.substring(0, 19);
+            var reg = getRegExp("-", "g");
+            var fmt2 = fmt1.replace(reg, '/');
+            var t1 = getDate(fmt2);
+            var tnow=getDate();
+            if(t1>=tnow) return 1;
+            return 0;
+	}
+}
+module.exports = {
+	has_char: g_filters.has_char,
+	beg_time: g_filters.beg_time,
+	end_time: g_filters.end_time,
+}
 \ No newline at end of file
@@ -41,12 +41,16 @@ Page({
 		}).then(res => {
 			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
 				var a = res.data.data.pageData;
-				var tt = {
-				  'ad_code': os.imghost + a[0].ad_code,
-				  'media_link': '',
-				  'ad_weapplink':a[0].ad_weapplink
-				};
-				th.setData({ad_data:tt});				
+				var narr=[];
+				for(var i in a){
+					var tt = {
+					  'ad_code': os.imghost + a[0].ad_code,
+					  'media_link': '',
+					  'ad_weapplink':a[0].ad_weapplink
+					};
+					narr.push(tt);
+				}
+				th.setData({ad_data:narr});				
 			}					 			
 		})
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
-
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class=" body_frame">
 <block wx:if="{{ad_data}}">
-  <image mode="widthFix" src="{{ad_data.ad_code}}" style="width: 100%;"></image>
+ 
+   <swiper class="swiper" circular="true" 
+             indicator-dots="true"
+            style="height:{{max_sw_height}}rpx" >
+      <block wx:for="{{ad_data}}">    
+  	
+          <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
+            <swiper-item>
+                 <image src="{{item.ad_code}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" lazy-load="true"/>
+            </swiper-item>
+          </navigator>
+  
+          <view data-url="{{item.ad_weapplink}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+            <swiper-item>
+                <image src="{{item.ad_code}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" lazy-load="true"/>
+            </swiper-item>
+          </view>     
+  
+      </block>
+    </swiper>
+
+  
 </block>
 <block wx:else>
   <image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"></image>
@@ -17,7 +17,7 @@
     /* overflow-y: scroll; */
 }
 .seckill_list{
-margin-top: -50rpx;
+margin-top: -10rpx;
 left: 2%;
 }
 .seckill{
@@ -31,6 +31,7 @@ Page({
         btn_click:1,
 		service_data:null,
+		max_sw_height:200,
     },
     onLoad: function() {
         var a = this,ee=a;
@@ -100,12 +101,16 @@ Page({
 		}).then(res => {
 			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
 				var a = res.data.data.pageData;
-				var tt = {
-				  'ad_code': os.imghost + a[0].ad_code,
-				  'media_link': '',
-				  'ad_weapplink':a[0].ad_weapplink
-				};
-				th.setData({ad_data:tt});				
+				var narr=[];
+				for(var i in a){
+					var tt = {
+					  'ad_code': os.imghost + a[i].ad_code,
+					  'media_link': '',
+					  'ad_weapplink':a[i].ad_weapplink
+					};
+					narr.push(tt);
+				}				
+				th.setData({ad_data:narr});				
 			}else{
 				//--获取是否又秒杀活动--
 				getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
@@ -2038,5 +2043,19 @@ Page({
     refresh_input:function(){
         this.data.btn_click=0;
-    }
+    },
+	
+	imageLoad:function(e){
+	  var imgwidth = e.detail.width;
+	  var imgheight = e.detail.height;
+	  //宽高比
+	  var ratio = imgwidth / imgheight;
+	  //计算的高度值
+	  var viewHeight = 715 / ratio;
+	  var hei=this.data.max_sw_height;
+	
+	  if (hei< viewHeight) {
+	      this.setData({ max_sw_height: viewHeight });
+	   }
+	}
 });
 \ No newline at end of file
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <!-- <import src="../../tabbar/tabbar.wxml" />
 <template is="tabBar" data="{{tabBar}}" />
  -->
@@ -7,9 +8,30 @@
   <image mode="widthFix" class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
 </navigator>
-<navigator bindtap="nav_goto" class="picture" data-url="{{ad_data.ad_weapplink}}" wx:if="{{ad_data}}">
-  <image mode="widthFix" class="picture" src="{{ad_data.ad_code}}"></image>
-</navigator>
+<block wx:if="{{ad_data}}">
+ <swiper class="swiper" circular="true" 
+           indicator-dots="true"
+          style="height:{{max_sw_height}}rpx" >
+    <block wx:for="{{ad_data}}">    
+	
+        <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
+          <swiper-item>
+               <image src="{{item.ad_code}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" lazy-load="true"/>
+          </swiper-item>
+        </navigator>
+
+        <view data-url="{{item.ad_weapplink}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <swiper-item>
+              <image src="{{item.ad_code}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" lazy-load="true"/>
+          </swiper-item>
+        </view>     
+
+    </block>
+  </swiper>
+</block>
+
+
+
@@ -353,3 +353,12 @@ page {
 .quan_color{ background-color: #ff5306; height: 40rpx;color: #fff; padding: 0 10rpx; border-radius: 10rpx; margin-left: 10rpx}
 .red_c{color:#ff5306}
 .title_show{ margin: 10rpx 0 10px 0;padding: 0 20rpx}
+
+
+.swiper image {
+  height: auto;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+}
+var g_filters = {
+	has_char:function(url,key){
+	  if(!url)	return -1;
+	  return url.indexOf(key);		
+	},
+	beg_time:function(beg_date){
+	    var fmt1 = beg_date.substring(0, 19);
+        var reg = getRegExp("-", "g");
+        var fmt2 = fmt1.replace(reg, '/');
+        var t1 = getDate(fmt2);
+        var tnow=getDate();
+        if(t1<=tnow) return 1;
+        return 0;
+	},
+	end_time:function(end_date){
+	        var fmt1 = end_date.substring(0, 19);
+            var reg = getRegExp("-", "g");
+            var fmt2 = fmt1.replace(reg, '/');
+            var t1 = getDate(fmt2);
+            var tnow=getDate();
+            if(t1>=tnow) return 1;
+            return 0;
+	}
+}
+module.exports = {
+	has_char: g_filters.has_char,
+	beg_time: g_filters.beg_time,
+	end_time: g_filters.end_time,
+}
 \ No newline at end of file
@@ -1118,6 +1118,7 @@ Page({
             }
             //如果有设置不包邮区商品
             if(by_qc.goods_list!="" && by_qc.goods_list!=undefined && by_qc!=null && freight_free>0){
+			  freight_free=0;
               no_ex_good=by_qc.goods_list;
             }
           }
@@ -1210,24 +1211,34 @@ Page({
                   continue;
               }
+
+               var no_ex_good_arr=null;
+               if(no_ex_good) no_ex_good_arr=no_ex_good.split(',');
+
 			  //----------------如果是选择了物流---------------------
-			  if(cart_item.exp_type == 0 && item[j].is_free_shipping==0){
-			     //如果地址不为空
-			     if (th.data.user_addr!=null){
-			       switch (item[j]['exp_sum_type']) {
-			         case 1:
-			           //统一运费
-			           o_shipping_price += item[j]['uniform_exp_sum'];break;
-			         case 2:
-			           if (goods_weight < 0) goods_weight = 0;
-			           //累积商品重量 每种商品的重量 * 数量
-			           goods_weight += item[j]['weight'] * item[j]['goods_num']; break;
-			         case 3:
-			           if (goods_piece < 0) goods_piece = 0;
-			           //累积商品数量
-			           goods_piece += item[j]['goods_num'];break;
-			       }
-			     }
+			  if(cart_item.exp_type == 0 && item[j].is_free_shipping==0 && (!no_ex_good_arr || no_ex_good_arr.indexOf(item[j].goods_id+'')>-1 )){
+				  
+					  
+					  //如果地址不为空
+					  if (th.data.user_addr!=null){
+					    switch (item[j]['exp_sum_type']) {
+					      case 1:
+					        //统一运费
+					        o_shipping_price += item[j]['uniform_exp_sum'];break;
+					      case 2:+''
+					        if (goods_weight < 0) goods_weight = 0;
+					        //累积商品重量 每种商品的重量 * 数量
+					        goods_weight += item[j]['weight'] * item[j]['goods_num']; 
+				  					   
+					  		 break;
+					      case 3:
+					        if (goods_piece < 0) goods_piece = 0;
+					        //累积商品数量
+					        goods_piece += item[j]['goods_num'];
+					  		 break;
+					    }
+					  }
+			    
 			   }
 		  }
@@ -467,6 +467,21 @@ function convert_arr_key(list,key){
 	})
 	return keyObs;
 }
+
+function ajax_ok(res){
+	if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+		return 1;
+	}	
+	return 0;
+}
+function ajax_ok2(res){
+	if(res.data.code==0 && res.data.data && res.data.data.length>0){
+		return 1;
+	}	
+	return 0;
+}
+
+
 module.exports = {
     formatTime: function(e, r) {
         var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
@@ -574,5 +589,7 @@ module.exports = {
     base64_encode:base64_encode,  //64位加密
     ob_to_parm:ob_to_parm   ,//对象变成参数
 	sha1:sha1,                //sha1进行签名
-	convert_arr_key:convert_arr_key //将JS数组对象按其某个键值重组成Map对象
+	convert_arr_key:convert_arr_key, //将JS数组对象按其某个键值重组成Map对象
+	ajax_ok:ajax_ok, //将JS数组对象按其某个键值重组成Map对象
+	ajax_ok2:ajax_ok2 //将JS数组对象按其某个键值重组成Map对象
 };