From 60aa312bdb33514659b01498b469f350764e6c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 13 Sep 2021 11:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90=E5=BC=80?=
 =?UTF-8?q?=E5=B1=8F=E9=A1=B5=E5=92=8C=E9=A6=96=E9=A1=B5ad=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                   |  5 +--
 components/lf-adModal/lf-adModal.vue      | 14 ++++---
 pages/index/index/index.vue               | 39 +++++++++++++++---
 pages/index/openScreenAd/openScreenAd.vue | 48 +++++++++++++++++------
 4 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/App.vue b/App.vue
index 1d7aa65..95c407b 100644
--- a/App.vue
+++ b/App.vue
@@ -5,11 +5,10 @@ export default {
 	globalData:{
 		 giftLogin:false,
 		 share: false,  // 分享默认为false
+		 app_first_full: true,
+		 app_first_alert: true
 	},
 	onLaunch: function(e) {
-		// 进入开屏广告页 TODO 暂时注释
-		// this.$url('/pages/index/openScreenAd/openScreenAd', {type: 'redirect'});
-		
 		// #ifdef MP-WEIXIN
 		var referrerInfo = e.referrerInfo;
         if (referrerInfo.appId) {
diff --git a/components/lf-adModal/lf-adModal.vue b/components/lf-adModal/lf-adModal.vue
index 58c3fbe..4b59d2e 100644
--- a/components/lf-adModal/lf-adModal.vue
+++ b/components/lf-adModal/lf-adModal.vue
@@ -1,12 +1,12 @@
 <template>
-	<view class="content" v-if="value">
+	<view class="content" v-if="value && list.length">
 		<view class="box">
 			<swiper class="swiper" :circular="true" 
 				indicator-active-color="#0091ff" 
 				:current="current" 
 				:indicator-dots="list.length > 1">
 				<swiper-item v-for="(item, index) in list" :key="index">
-					<image class="img" :src="item" mode="aspectFill" @click="clickAd"></image>
+					<image class="img" :src="item.image" mode="aspectFill" @click="clickAd(item)"></image>
 				</swiper-item>
 			</swiper>
 			<view class="close" @click="close">
@@ -22,19 +22,23 @@
 			value: {
 				type: Boolean,
 				default: true
+			},
+			list: {
+				type: Array,
+				default: []
 			}
 		},
 		data(){
 			return {
-				list: ['https://picsum.photos/200', 'https://picsum.photos/200']
+				
 			}
 		},
 		created(){
 			
 		},
 		methods: {
-			clickAd(){
-				this.$msg('您点击了广告图')
+			clickAd(item){
+				this.$url(item.url);
 			},
 			close(){
 				this.$emit('update:value', false);
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 5de24b9..9ca7464 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -379,7 +379,7 @@
 			</view>
 		</view>
 		<!-- ad广告弹出组件 TODO 暂时先注释 -->
-		<!-- <lf-ad-modal :value.sync="show_ad"></lf-ad-modal> -->
+		<lf-ad-modal :value.sync="show_ad" :list="ad_modal_list"></lf-ad-modal>
 		<!-- 回到顶部组件 -->
 		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
 		<!-- tabbar组件 -->
@@ -452,7 +452,8 @@
                 userInfo: '',
                 microData:"",
 				is_login:'',// 是否是登陆状态
-				show_ad: true, // 是否显示ad广告
+				show_ad: false, // 是否显示ad广告
+				ad_modal_list: [], // ad广告列表
 				nav_bg_color: 'transparent' ,// 导航背景颜色
 				recommend_list: [
 					{
@@ -532,7 +533,7 @@
 			this.isLogin=!!this.$cookieStorage.get('user_token')
 			
 		    let toekn = this.$cookieStorage.get('user_token');
-		
+			
 		    if (toekn) {
 		      this.getUserInfo();
 		    }
@@ -550,8 +551,17 @@
 		        
         // 生命周期
         onLoad(e) {
-		   // 第三方平台配置颜色
-				var gbConfig = this.$cookieStorage.get('globalConfig') || '';
+			// 进入开屏广告页
+			if(app.globalData.app_first_full){
+				getApp().globalData.app_first_full = false;
+				this.$url('/pages/index/openScreenAd/openScreenAd', {type: 'launch'});
+			}else if(app.globalData.app_first_alert){
+				getApp().globalData.app_first_alert = false;
+				this.getAlertAd();
+			}
+		    
+			// 第三方平台配置颜色
+			var gbConfig = this.$cookieStorage.get('globalConfig') || '';
 				
 			this.config=gbConfig;
 		
@@ -598,6 +608,25 @@
 		},
         // 方法，需要将小程序的方法都放到这个里面
         methods: {
+			getAlertAd(){
+				this.$http.get({
+					api: '/api/ad'
+				}).then(res => {
+					let alert = res.data.data.alert;
+					this.alert = alert;
+					if(this.$isRight(alert)){
+						if(this.$shared.isValueType(alert.image) == 'array'){
+							this.ad_modal_list = alert.image;
+						}else{
+							this.ad_modal_list.push({
+								image: alert.image,
+								url: alert.url
+							})
+						}
+						this.show_ad = true;
+					}
+				});
+			},
 			close(){
 			        this.setData({
 			            showNoGift:false
diff --git a/pages/index/openScreenAd/openScreenAd.vue b/pages/index/openScreenAd/openScreenAd.vue
index 376eb13..9762a91 100644
--- a/pages/index/openScreenAd/openScreenAd.vue
+++ b/pages/index/openScreenAd/openScreenAd.vue
@@ -1,7 +1,9 @@
 <template>
 	<view class="content">
-		<image class="img" src="https://picsum.photos/200" mode="aspectFill"></image>
-		<view class="tips" @click="next">跳过 {{ num }}s</view>
+		<block v-if="$isRight(full)">
+			<image class="img" :src="full.image" mode="aspectFill" @click="clickAd"></image>
+			<view class="tips" @click="next">跳过 {{ num }}s</view>
+		</block>
 	</view>
 </template>
 
@@ -10,18 +12,12 @@
 		data(){
 			return {
 				num: 5,
-				timer: null
+				timer: null,
+				full: {}
 			}
 		},
 		onLoad(){
-			this.timer = setInterval(() => {
-				this.num--;
-				if(this.num <= 0){
-					clearInterval(this.timer);
-					this.timer = null;
-					this.next();
-				}
-			}, 1000);
+			this.getAd();
 		},
 		onUnload(){
 			if(this.timer){
@@ -30,8 +26,35 @@
 			}
 		},
 		methods: {
+			getAd(){
+				this.$http.get({
+					api: '/api/ad'
+				}).then(res => {
+					this.full = res.data.data.full;
+					if(this.$isRight(res.data.data.full)){
+						this.startTime();
+					}else{
+						this.next();
+					}
+				}).catch(rej => {
+					this.next();
+				})
+			},
+			startTime(){
+				this.timer = setInterval(() => {
+					this.num--;
+					if(this.num <= 0){
+						clearInterval(this.timer);
+						this.timer = null;
+						this.next();
+					}
+				}, 1000);
+			},
 			next(){
 				this.$url('/pages/index/index/index', {type: 'redirect'});
+			},
+			clickAd(){
+				this.$url(this.full.url, {type: 'redirect'});
 			}
 		}
 	}
@@ -50,6 +73,8 @@
 		.img{
 			width: 100%;
 			height: 100%;
+			position: absolute;
+			z-index: 9;
 		}
 		.tips{
 			position: absolute;
@@ -64,6 +89,7 @@
 			justify-content: center;
 			align-items: center;
 			border-radius: 28rpx;
+			z-index: 999;
 		}
 	}
 </style>