Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/video_app into gaohao

manifest.json

@@ -27,8 +27,7 @@
             "VideoPlayer" : {},
             "Camera" : {},
             "Record" : {},
-            "OAuth" : {},
+            "OAuth" : {}
-            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -85,14 +84,15 @@
                 },
                 "oauth" : {
                     "apple" : {},
-                    "univerify" : {},
                     "weixin" : {
                         "appid" : "wxeaffcaea958472d3",
-                        "appsecret" : "32f6f3ce599abff2fa0191a36780c66c",
                         "UniversalLinks" : "https://maxiong.xianmxkj.com/"
-                    }
                     },
-                "ad" : {},
+                    "univerify" : {}
+                },
+                "ad" : {
+                    "gdt" : {}
+                },
                 "push" : {
                     "unipush" : {}
                 }

pages/task/index.vue

@@ -8,7 +8,8 @@
 		<view class="navTitle" v-else>
 			<view></view>
 			<view class="title">任务大厅</view>
-			<image @click="goNav({jumpType:1,buttonUrl:'/pages/me/index'})" class="navTitleIcon" src="../../static/images/my.png" ></image>
+			<image @click="goNav({jumpType:1,buttonUrl:'/pages/me/index'})" class="navTitleIcon"
+				src="../../static/images/my.png"></image>
 		</view>
 		<view class="icon u-relative padding">
 			<image class="task_icon1 u-relative" src="../../static/images/me/task_icon1.png"></image>
@@ -28,11 +29,13 @@
 				<text class="line"></text>
 				<view class="signIn-Item"
 					:class="{active: item.showText == '待签到'||item.showText == '未签到'||item.showText == '已签到'}"
-					v-for="(item,index) in signInList" :key="index"
+					v-for="(item,index) in signInList" :key="index">
-					>
+					<image class="signIn_icon" v-if="item.showText == '未签到'" src="../../static/images/signIn_icon2.png"
-					<image class="signIn_icon" v-if="item.showText == '未签到'" src="../../static/images/signIn_icon2.png" mode="">
+						mode="">
-					<image class="signIn_icon" v-if="item.showText == '已签到'" src="../../static/images/signIn_icon3.png" mode="">
+						<image class="signIn_icon" v-if="item.showText == '已签到'"
-					<image class="signIn_icon" v-if="item.showText != '未签到'&&item.showText != '已签到'" src="../../static/images/signIn_icon1.png" mode="">
+							src="../../static/images/signIn_icon3.png" mode="">
+							<image class="signIn_icon" v-if="item.showText != '未签到'&&item.showText != '已签到'"
+								src="../../static/images/signIn_icon1.png" mode="">
 								<view class="radius"></view>
 								<view class="_label">{{item.showText}}</view>
 				</view>
@@ -50,24 +53,38 @@
 		<view class="content margin-lr padding bg-white u-relative" v-if="list.length">
 
 			<view class="cell flex justify-between" v-for="(item,index) in list" :key="index"
-				v-if="(item.buttonUrl=='/me/invite/index'&&isShowMoneyPay)||item.buttonUrl!='/me/invite/index'"
+				v-if="(item.buttonUrl=='/me/invite/index'&&isShowMoneyPay)||item.buttonUrl!='/me/invite/index'">
-				>
 				<view class="cell_left flex">
 					<view class="cell_title flex">
-						<view class="u-font-28 text-bold title" :style="{alignSelf: item.rewardImg?'center':'flex-start'}">{{ item.title}}</view>
+						<view class="u-font-28 text-bold title"
+							:style="{alignSelf: item.rewardImg?'center':'flex-start'}">{{ item.title}}</view>
 						<u-image v-if="item.rewardImg" class="cell_icon" :src="item.rewardImg "></u-image>
 						<view class="u-font-24 tip">{{ item.rewardDetail  }}</view>
 					</view>
 					<view class="subhead u-font-24">{{ item.detail }}</view>
 				</view>
 				<view class="cell_right flex">
-					<view v-if=" item.disabled " class="btn u-font-24 text-bold" :style="{backgroundColor: item.buttonBgColor,color: item.buttonFontColor }" @click="goNav(item)">{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}</view>
+					<view v-if=" item.disabled " class="btn u-font-24 text-bold"
-					<view v-else class="btn u-font-24 text-bold disabled">{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}</view>
+						:style="{backgroundColor: item.buttonBgColor,color: item.buttonFontColor }"
+						@click="goNav(item)">
+						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
+					</view>
+					<view v-else class="btn u-font-24 text-bold disabled">
+						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
+					</view>
 					<!-- <view v-else class="btn u-font-24 text-bold" @click="goNav(item)">{{ item.buttonTitle }}</view> -->
-					<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip" @click="goNav({buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title})">{{ item.buttonUnderContent}}</view>
+					<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip"
+						@click="goNav({buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title})">
+						{{ item.buttonUnderContent}}
 					</view>
 				</view>
-
+			</view>
+			<!-- 激励视频广告 -->
+			<ad-rewarded-video ref="adRewardedVideo" adpid="1531580352" :preload="false" :loadnext="false"
+				:disabled="true" v-slot:default="{loading, error}" @load="onadload" @close="onadclose"
+				@error="onaderror">
+				<view class="ad-error" v-if="error">{{error}}</view>
+			</ad-rewarded-video>
 		</view>
 
 	</view>
@@ -85,18 +102,32 @@
 				list: [],
 				checked: false,
 				signDays: 0,
-				signInList: [
+				signInList: [{
-					{ 	name: '第一天' }, 
+						name: '第一天'
-					{   name: '第二天' }, 
+					},
-					{   name: '第三天' }, 
+					{
-					{   name: '第四天' }, 
+						name: '第二天'
-					{   name: '第五天' }, 
+					},
-					{   name: '第六天' }, 
+					{
-					{   name: '第七天' }, 
+						name: '第三天'
+					},
+					{
+						name: '第四天'
+					},
+					{
+						name: '第五天'
+					},
+					{
+						name: '第六天'
+					},
+					{
+						name: '第七天'
+					},
 				],
 				signInBtn: '点击签到',
 				isShowMoneyPay: true,
 				isIos: false,
+				isLoading: false
 			}
 		},
 		onShow() {
@@ -112,7 +143,43 @@
 				}
 			});
 		},
+		async onReady() {
+			this.isLoading = true;
+			// 首次加载广告
+			setTimeout(() => {
+				this.$refs.adRewardedVideo.load();
+			}, 1000)
+		},
 		methods: {
+			showAd() {
+				if (this.isLoading) {
+					return
+				}
+				this.$refs.adRewardedVideo.show();
+			},
+			onadload(e) {
+				this.isLoading = false;
+				console.log('广告数据加载成功');
+			},
+			async onadclose(e) {
+				const detail = e.detail
+				if (detail && detail.isEnded) {
+					// 正常播放结束
+					// /sqx_fast/app/ad/state
+					let res = this.$Request.getT('app/ad/state', {
+						extraKey: 1
+					})
+					console.log(res)
+				} else {
+					// 播放中途退出
+				}
+				//this.isLoading = true;
+				//this.$refs.adRewardedVideo.load();
+			},
+			onaderror(e) {
+				// 广告加载失败
+				this.isLoading = false;
+			},
 			getsignIn() {
 				this.$Request.getT('app/userSignRecord/getUserSignData', {}).then(res => {
 					if (res.code == 0) {
@@ -138,8 +205,10 @@
 			isToday(date) {
 				const today = new Date();
 				return date.getDate() === today.getDate() // 比较日期
-				    && date.getMonth() === today.getMonth() // 比较月份
+					&&
-				    && date.getFullYear() === today.getFullYear(); // 比较年份
+					date.getMonth() === today.getMonth() // 比较月份
+					&&
+					date.getFullYear() === today.getFullYear(); // 比较年份
 			},
 			/**
 			 * 跳转
@@ -236,11 +305,12 @@
 <style lang="scss">
 	.container {
 		width: 100%;
-		background-color: #F3F4F8;
+
 		.task_bg {
 			width: 100% !important;
 			height: 494rpx !important;
 		}
+
 		.icon {
 			.icon_title {
 				color: #000000;
@@ -248,17 +318,20 @@
 				top: -20rpx;
 
 			}
+
 			.task_icon1 {
 				width: 74rpx !important;
 				height: 78rpx !important;
 				margin-left: 235rpx;
 			}
+
 			.task_icon2 {
 				width: 126rpx !important;
 				height: 120rpx !important;
 				top: -40rpx;
 			}
 		}
+
 		.navTitle {
 			width: 100%;
 			position: relative;
@@ -267,17 +340,20 @@
 			align-items: center;
 			justify-content: space-between;
 			padding: 106rpx 28rpx 0 28rpx;
+
 			.title {
 				font-weight: bold;
 				font-size: 40rpx;
 				color: #000000;
 			}
+
 			.navTitleIcon {
 				width: 40.48rpx !important;
 				height: 46rpx !important;
 				align-self: flex-end;
 			}
 		}
+
 		.content {
 			border-radius: 16rpx;
 			top: -115rpx;
@@ -288,34 +364,42 @@
 				align-items: center;
 				padding: 32rpx 0;
 				border-bottom: 2rpx solid #EBEBEB;
+
 				.cell_left {
 					flex-direction: column;
+
 					.cell_title {
 						align-items: center;
 						margin-bottom: 12rpx;
 						color: #333;
+
 						.title {
 							flex-shrink: 0;
 						}
+
 						.cell_icon {
 							width: 34rpx !important;
 							height: 34rpx !important;
 							margin-left: 16rpx;
 						}
+
 						.tip {
 							margin-left: 22rpx;
 							color: #FC5B67;
 						}
 					}
+
 					.subhead {
 						color: #999;
 					}
 				}
+
 				.cell_right {
 					flex-direction: column;
 					align-items: center;
 					flex-shrink: 0;
 					margin-left: 20rpx;
+
 					.btn {
 						width: 148rpx;
 						height: 56rpx;
@@ -325,16 +409,19 @@
 						color: #FFFFFF;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
 					}
+
 					.tip {
 						color: #EC6F48;
 						height: 44rpx;
 						line-height: 44rpx;
 						margin-top: 5rpx;
 					}
+
 					.opt {
 						color: #D39B7E;
 						background-color: #FBF3EB;
 					}
+
 					.disabled {
 						color: #999999;
 						background-color: #E2E2E2;
@@ -342,20 +429,24 @@
 				}
 
 			}
+
 			.cell:last-child {
 				border-bottom: none;
 			}
 		}
+
 		.signIn {
 			>.title {
 				font-weight: 400;
 				font-size: 32rpx;
 				color: #666666;
+
 				.num {
 					font-weight: bold;
 					color: #EC6F48;
 					margin: 0 10rpx;
 				}
+
 				.dk {
 					font-weight: 400;
 					font-size: 24rpx;
@@ -363,10 +454,12 @@
 					align-items: center;
 				}
 			}
+
 			.signInList {
 				margin-top: 24rpx;
 				margin-bottom: 26rpx;
 				position: relative;
+
 				.line {
 					width: 92%;
 					height: 0rpx;
@@ -378,17 +471,20 @@
 					bottom: 57rpx;
 					margin: auto;
 				}
+
 				.signIn-Item {
 					display: flex;
 					flex-direction: column;
 					align-items: center;
 					position: relative;
 					z-index: 5;
+
 					.signIn_icon {
 						width: 52.33rpx;
 						height: 51.68rpx;
 						margin-bottom: 32rpx;
 					}
+
 					.radius {
 						width: 26rpx;
 						height: 26rpx;
@@ -396,6 +492,7 @@
 						background-color: #D8D5D5;
 
 					}
+
 					._label {
 						font-weight: 400;
 						font-size: 18rpx;
@@ -403,6 +500,7 @@
 						margin-top: 24rpx;
 					}
 				}
+
 				.signIn-Item.active {
 					.radius {
 						background-color: #EA9EA8;
@@ -410,6 +508,7 @@
 					}
 				}
 			}
+
 			.tishi {
 				width: 100%;
 				text-align: center;
@@ -417,6 +516,7 @@
 				font-size: 20rpx;
 				color: #7F7F7F;
 			}
+
 			.signInBtn {
 				width: 355rpx;
 				height: 64rpx;
@@ -431,6 +531,7 @@
 				box-shadow: 0 0 0 rgba(234, 158, 168, 0.75);
 				position: relative;
 			}
+
 			.signInBtnBg {
 				width: 327rpx;
 				height: 52rpx;
@@ -445,6 +546,4 @@
 			}
 		}
 	}
-	
-
 </style>