Browse Source

Merge branch 'new-dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-app into new-dev

@dongkboy 1 year ago
parent
commit
f946e9dbb9
1 changed files with 11 additions and 6 deletions
  1. 11 6
      pages/ad/index.vue

+ 11 - 6
pages/ad/index.vue

@@ -6,11 +6,11 @@
 		<view class="contents">
 			<image class="contents-text" src="/static/icon/ad/wcrw.png" mode="widthFix"></image>
 			<view class="daynum">
-				<image class="contents-bg" src="/static/icon/ad/cjcs.png" mode="widthFix"></image>
+				<image class="contents-bg" src="/static/icon/ad/cjcs.png" mode="aspectFill"></image>
 				<view style="flex: 1;"></view>
 				<text class="daynumtitle">今日奖励</text>
 				<text class="daydraw">抽奖次数1次</text>
-				<text class="todraw todraw1" v-if="taskStatus" @click="toChoujiang">去抽奖</text>
+				<text class="todraw todraw1" v-if="taskStatus1" @click="toChoujiang">去抽奖</text>
 				<text class="todraw" v-else>去抽奖</text>
 			</view>
 			<view class="daytask">
@@ -18,7 +18,7 @@
 				<view class="daytask-line">
 					<image src="/static/icon/ad/ad-video.png" mode="widthFix"></image>
 					<view class="line-title">
-						<view class="title1">观看视任务</view>
+						<view class="title1">观看视任务</view>
 						<view class="title2">已观看{{ taskObj.watchCount }}/{{ taskObj.total }}</view>
 					</view>
 					<view style="flex: 1;"></view>
@@ -57,6 +57,7 @@
 				},
 				error: "",
 				taskStatus: false,
+				taskStatus1: false,
 				isLoading: false,
 				adId: '',
 			}
@@ -146,6 +147,9 @@
 					this.taskObj = res.data;
 					this.progress = this.taskObj.watchCount / this.taskObj.total * 100
 					this.taskStatus = res.data.total <= res.data.watchCount
+					if (this.taskObj.drawCount > 0) {
+						this.taskStatus1 = true
+					}
 				})
 			},
 			getErrorInfo() {
@@ -162,7 +166,7 @@
 							id: "gh_71ff3b2409d8", //微信小程序原生id
 							path: "pages/index/bigWheel/bigWheel?userId=" + this.userInfo.sysUser.id +
 								"&activityId=" + this.activityId, //    打开小程序的页面路径,不传默认跳转首页
-							type: 2 //     微信小程序版本类型,可取值: 0-正式版; 1-测试版; 2-体验版。 默认值为0。
+							type: 0 //     微信小程序版本类型,可取值: 0-正式版; 1-测试版; 2-体验版。 默认值为0。
 						})
 					} else {
 						uni.showToast({
@@ -193,6 +197,7 @@
 <style>
 	page {
 		background: #ffe9c6;
+		padding: 30rpx;
 	}
 </style>
 <style lang="scss" scoped>
@@ -214,12 +219,11 @@
 		top: 0;
 		left: 0;
 		z-index: 0;
-		width: 750rpx;
+		width: 100%;
 	}
 
 	.contents {
 		position: relative;
-		padding: 30rpx;
 		box-sizing: border-box;
 
 		.contents-text {
@@ -247,6 +251,7 @@
 				top: 0;
 				left: 0;
 				width: 100%;
+				height: 808rpx;
 			}
 
 			.daynumtitle {