From cb26cfe7aa77d72d1eaca444d7d7a4b31a58286e Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Wed, 29 Dec 2021 20:46:44 +0800
Subject: [PATCH] oa/115415

---
 packageA/pages/checkin/checkin.js     | 29 ++++++++++++++++++++++++++++-
 packageA/pages/checkin/checkin.wxml   | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 packageA/pages/checkin/checkin.wxss   |  2 +-
 packageB/pages/zuhegou/list/list.js   |  8 +++++++-
 packageC/pages/presell/list/list.js   | 10 ++++++----
 pages/activity/pind_list/pind_list.js |  6 ++++++
 6 files changed, 109 insertions(+), 42 deletions(-)

diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js
index 3d5d7d5..4d70ce1 100644
--- a/packageA/pages/checkin/checkin.js
+++ b/packageA/pages/checkin/checkin.js
@@ -2,6 +2,7 @@
 var md5 = require("../../../utils/md5.js");
 var ut = require("../../../utils/util.js");
 const app = getApp();
+const os=app.globalData.setting;
 let self;
 Page({
 
@@ -77,6 +78,27 @@ Page({
 			});
 			self.loadQd();
 		});
+
+		// 广告
+		getApp().request.promiseGet("/api/weshop/ad/page?pid=1205&store_id=" + os.stoid, {
+		  data: {
+		    enabled: 1
+		  }
+		}).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 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);
+				}
+				self.setData({ad_data:narr});				
+			}					 			
+		});
 		
 		
 	},
@@ -362,6 +384,11 @@ Page({
 	  var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
 	  //return y + "-" + m + "-" + d;
 	  return [m + "-" + d,dd.getDate()];
+	},
+	go_url(e){
+		let url=e.currentTarget.dataset.url;
+		if(url){
+			getApp().goto(url);
+		}
 	}
-	
 })
diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml
index 04b5b9b..98ca168 100644
--- a/packageA/pages/checkin/checkin.wxml
+++ b/packageA/pages/checkin/checkin.wxml
@@ -1,12 +1,15 @@
-<!--packageA//pages/checkin/checkin.wxml-->
+<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <wxs src="checkin.wxs" module="myUtil"></wxs>
 <view class="checkin-container">
 	<view class="rule-container flex">
 		<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 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" wx:if="{{res}}">
 		<view class="list-item active}}">
 			<view class="circle">+{{res.cday1}}</view>
@@ -38,7 +41,7 @@
 		</view>
 	</view>
 	<view wx:else style="height: 100rpx;"></view>
-	
+
 	<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) ? '立即签到':'今日已签到'}}
@@ -48,14 +51,14 @@
 		</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">
@@ -64,35 +67,35 @@
 				<view wx:if="{{res.getkbqnum}}" class="fs24" style="color:#999;font-weight:bold">补签卡：{{res.getkbqnum}}</view>
 			</view>
 			<view class="calendar">
-			 <!-- <view class="selectDate"> -->
-			 <!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> -->
-			 <!-- <view class="date-wrap">
+				<!-- <view class="selectDate"> -->
+				<!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> -->
+				<!-- <view class="date-wrap">
 			  {{year}}年{{month}}月
 			 </view> -->
-			 <!-- <view class="goright iconfont icon-jianzuo" bindtap="nextMonth">b</view> -->
-			 <!-- </view> -->
-			 <view class="week">
-				 <view wx:for="{{weekArr}}" wx:for-index="index" wx:for-item="item" wx:key="key" style="height:{{param-17}}px;line-height:{{param-17}}px;flex:1;">{{item}}</view>
-			 </view>
-			 
-			 <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 * 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>
-			 </view>
-			 
+				<!-- <view class="goright iconfont icon-jianzuo" bindtap="nextMonth">b</view> -->
+				<!-- </view> -->
+				<view class="week">
+					<view wx:for="{{weekArr}}" wx:for-index="index" wx:for-item="item" wx:key="key" style="height:{{param-17}}px;line-height:{{param-17}}px;flex:1;">{{item}}</view>
+				</view>
+
+				<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 * 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>
+				</view>
+
 			</view>
 		</view>
-		
+
 	</view>
-	
+
 	<view class="jfbuy-container">
 		<view class="jfbuy flex">
-			<image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image>
-			<view class="right">
+			<!-- <image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image> -->
+			<!-- <view class="right">
 				<view>
 					<view class="t1">小积分大作为</view>
 					<view class="t2">积分抵用现金，积少成多</view>
@@ -100,10 +103,33 @@
 				<view class="t-c">
 					<view class="btn-buy" bindtap="goto" data-url="/packageA/pages/jfbuy/jfbuy">去购物 Go!</view>
 				</view>
-			</view>
+			</view> -->
+			<block wx:if="{{ad_data}}">
+				<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" style="height:240rpx;width: 670rpx;">
+					<block wx:for="{{ad_data}}">
+
+						<navigator url="{{item.ad_weapplink}}"  wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
+							<swiper-item>
+								<image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
+							</swiper-item>
+						</navigator>
+
+						<view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url">
+							<swiper-item>
+								<image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" 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>
+			</block>
 		</view>
 	</view>
-	
+
 	<view class="popup-container" wx:if="{{isShowRules}}">
 		<view class="popup-wrapper">
 			<view class="popup">
@@ -115,5 +141,5 @@
 			</view>
 		</view>
 	</view>
-	
-</view>
+
+</view>
\ No newline at end of file
diff --git a/packageA/pages/checkin/checkin.wxss b/packageA/pages/checkin/checkin.wxss
index 597b366..f524734 100644
--- a/packageA/pages/checkin/checkin.wxss
+++ b/packageA/pages/checkin/checkin.wxss
@@ -197,7 +197,7 @@ page,
 .jfbuy {
 	/* border: 2rpx solid black; */
 	border-radius: 16rpx;
-	padding: 40rpx 30rpx;
+	/* padding: 40rpx 30rpx; */
 	background-color: #FF980F;
 	box-shadow: 0 2rpx 16rpx #FF7A07;
 	/* position: fixed;
diff --git a/packageB/pages/zuhegou/list/list.js b/packageB/pages/zuhegou/list/list.js
index 3060968..662d908 100644
--- a/packageB/pages/zuhegou/list/list.js
+++ b/packageB/pages/zuhegou/list/list.js
@@ -251,6 +251,12 @@ Page({
 		  if (hei< viewHeight) {
 		      this.setData({ max_sw_height: viewHeight });
 		   }
-		}
+    },
+    go_url(e){
+      let url=e.currentTarget.dataset.url;
+      if(url){
+        getApp().goto(url);
+      }
+    }
 
 });
diff --git a/packageC/pages/presell/list/list.js b/packageC/pages/presell/list/list.js
index 0667eff..c6323d9 100644
--- a/packageC/pages/presell/list/list.js
+++ b/packageC/pages/presell/list/list.js
@@ -228,9 +228,11 @@ Page({
           th.setData({ [txt]: obj});
         }
    },
-
-
-
-    
+   go_url(e){
+        let url=e.currentTarget.dataset.url;
+        if(url){
+            getApp().goto(url);
+        }
+   },
 
 });
diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index 82fb069..0eaca33 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -266,5 +266,11 @@ Page({
       title: '秒杀活动-' + store_name,
     }
   },
+  go_url(e){
+    let url=e.currentTarget.dataset.url;
+    if(url){
+        getApp().goto(url);
+    }
+},
 
 });
\ No newline at end of file
--
libgit2 0.21.4