任务merit领取

pages/task/index.vue

@@ -48,7 +48,7 @@
 						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : (
 							item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
 					</view>
-					<view v-else class="btn  disabled">
+					<view v-else class="btn disabled">
 						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}`
 									: (item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
 						<view v-if="item.buttonUnderContent && item.buttonUnderUrl" class=" tip"
@@ -62,8 +62,8 @@
 		<!-- 激励视频广告 -->
 		<view style="width: 0;height: 0;overflow: hidden;">
 			<!-- 激励视频广告 -->
-			<ad-rewarded-video ref="adRewarded" :adpid="datas.adpid" :loadnext="true"
+			<ad-rewarded-video ref="adRewarded" :adpid="datas.adpid" :loadnext="true" :url-callback="datas.urlCallback"
-				:url-callback="datas.urlCallback" @load="onadload" @close="onadclose" @error="onaderror">
+				@load="onadload" @close="onadclose" @error="onaderror">
 			</ad-rewarded-video>
 		</view>
 	</view>
@@ -112,10 +112,10 @@
 	onShow(() => {
 		$common.init()
 		// if ( uni.getSystemInfoSync().platform == 'android' ) {
-			// datas.adpid = 1531580352
+		// datas.adpid = 1531580352
 		// }
 		// if ( uni.getSystemInfoSync().platform == 'ios' ) {
-			datas.adpid = 1373604770
+		datas.adpid = 1373604770
 		// }
 		if (uni.getStorageSync("token")) {
 			getTaskdata()
@@ -296,7 +296,27 @@
 			})
 		} else {
 			if (item.jumpType == 0) {
-				if (item.title.indexOf("新人福利") != -1) {
+				if (item.buttonTitle.indexOf("领取") != -1) {
+					let res = await taskReceive({
+						id: item.id
+					})
+					console.log(res,'调试')
+					if (res.code == 0) {
+						uni.showToast({
+							title: res.id == 15 ? '签到成功' : '领取成功',
+							icon: 'none'
+						})
+						setTimeout(() => {
+							getTaskdata()
+							getsignIn()
+						}, 1000)
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				} else if (item.title.indexOf("新人福利") != -1) {
 					let res = await taskReceive({
 						id: item.id
 					})
@@ -316,7 +336,7 @@
 					}
 				} else if (item.buttonTitle.indexOf("观看视频") != -1) {
 					// 首次加载广告 
-					if(!datas.adRewardedShow){
+					if (!datas.adRewardedShow) {
 						uni.showToast({
 							icon: 'none',
 							title: '广告加载失败，请稍后重试'