1

pages/task/index.vue

@@ -24,7 +24,7 @@
 					<text style="margin-right: 20rpx;">打卡提醒</text>
 					<u-switch v-model="checked" size="35" active-color="#EA9EA8 "></u-switch>
 				</view> -->
-			</view>
+			</view> 
 			<view class="signInList flex justify-between">
 				<text class="line"></text>
 				<view class="signIn-Item"
@@ -42,12 +42,12 @@
 			</view>
 
 			<view class="tishi">连续签到7天即可获得7元奖励</view>
-
-			<view class="signInBtn" @click="goNav({jumpType: 0, id:15, buttonTitle: '去领取'})">
+			
+			<!-- <view class="signInBtn" @click="goNav({jumpType: 0, id:15, buttonTitle: '去领取'})">
 				<view>{{signInBtn}}</view>
 				<view class="signInBtnBg"></view>
-			</view>
-
+			</view> -->
+			
 		</view>
 
 		<view class="content margin-lr padding bg-white u-relative" v-if="list.length">
@@ -73,7 +73,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 u-font-24 text-bold" @click="goNav(item)">{{ item.buttonTitle }}</view> -->
-					<!-- <view v-if=" item.type ==4 " class="u-font-20 tip" @click="goNav('/me/gift/gift', item.type)">查看奖品列表</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>
 			<view class="">
@@ -192,10 +192,10 @@
 							}
 						})
 					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
+						// uni.showToast({
+						// 	title: res.msg,
+						// 	icon: 'none'
+						// })
 					}
 				})
 			},
@@ -215,18 +215,29 @@
 				// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
 				// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
 				// buttonUrl
-
-				if (item.jumpType == 0) {
-					if (item.buttonTitle == '去领取') {
+				console.log(item)
+				if ( item.jumpType == 0) {
+					if ( item.buttonTitle.indexOf("领取") != -1) {
 						this.taskReceive(item.id)
 					} else {
 						uni.switchTab({
 							url: "/pages/index/index"
 						})
 					}
-				} else if (item.jumpType == 1) {
+				} else if ( item.jumpType == 1) {
+					let source,buttonUrl;
+					buttonUrl = item.buttonUrl
+					if ( item.title && item.title.indexOf('每周') != -1 ) {
+						source = 2
+						buttonUrl = item.buttonUrl+'?source='+source
+					}
+					if ( item.title && item.title.indexOf('每月') != -1 ) {
+						source = 3
+						buttonUrl = item.buttonUrl+'?source='+source
+					}
+					console.log(buttonUrl)
 					uni.navigateTo({
-						url: item.buttonUrl
+						url: buttonUrl
 					})
 				} else if (item.jumpType == 3) {
 					uni.switchTab({
@@ -291,10 +302,17 @@
 <style lang="scss">
 	.container {
 		width: 100%;
+<<<<<<< HEAD
 
 		.task_bg {
 			width: 100% !important;
 			height: 494rpx !important;
+=======
+		background-color: #F3F4F8;
+		.task_bg{
+			width: 100%!important;
+			height: 494rpx!important;
+>>>>>>> 2ff5ebfd71042121cad90bd9b88c9372dbf8871d
 		}
 
 		.icon {
@@ -395,11 +413,17 @@
 						color: #FFFFFF;
 						border-radius: 12rpx 12rpx 12rpx 12rpx;
 					}
+<<<<<<< HEAD
 
 					.tip {
 						color: #666;
+=======
+					.tip{
+						color: #EC6F48;
+>>>>>>> 2ff5ebfd71042121cad90bd9b88c9372dbf8871d
 						height: 44rpx;
 						line-height: 44rpx;
+						margin-top: 5rpx;
 					}
 
 					.opt {