From 71f0e2215cfd36b2d90db122e37f8b90a246935d Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 18 Dec 2024 17:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chasingDrama/chasingDrama.vue |  4 ++--
 pages/task/index.vue                | 31 ++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/pages/chasingDrama/chasingDrama.vue b/pages/chasingDrama/chasingDrama.vue
index 6937d92..ef736b5 100644
--- a/pages/chasingDrama/chasingDrama.vue
+++ b/pages/chasingDrama/chasingDrama.vue
@@ -1,6 +1,6 @@
 <template>
 	<view style="padding-bottom: 100rpx;">
-		<!-- <view class="title flex align-center justify-center">
+		<view class="title flex align-center justify-center">
 			<view class="title-box">
 				<view class="title-box-title flex align-center justify-between">
 					<view class="title-box-title-l">
@@ -45,7 +45,7 @@
 					</view>
 				</view>
 			</view>
-		</view> -->
+		</view>
 		<view v-if="list.length>0" class="itemTitle flex align-center justify-center">
 			<view class="itemTitle-box flex align-center justify-between">
 				<view class="itemTitle-box-l">
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 50cca0e..eeefb9b 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -10,6 +10,26 @@
 			<view class="icon_title u-font-32 text-bold u-relative">新人好礼送不停</view>
 			<u-image class="task_icon2 u-relative" src="../../static/images/me/task_icon2.png"></u-image>
 		</view>
+		<view class="content margin-lr padding bg-white u-relative" v-if="list.length" style="margin-bottom: 32rpx;">
+			<u-steps :list="numList" :current="1" active-color="#EA9EA8" un-active-color="#D8D5D5"></u-steps>
+			<view class="cell flex justify-between" v-for="(item,index) in list" :key="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>
+						<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-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.type ==4 " class="u-font-20 tip" @click="goNav('/me/gift/gift', item.type)">查看奖品列表</view> -->
+				</view>
+			</view>
+		
+		</view>
 		<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">
@@ -43,7 +63,16 @@
 				background: {
 					backgroundImage: 'linear-gradient(to right, #FFE5EA 0%, #E4F5FB 49%, #FFF0EE 100%)'
 				},
-				list: []	
+				list: [],
+				numList: [
+					{ 	name: '第一天' }, 
+					{   name: '第二天' }, 
+					{   name: '第三天' }, 
+					{   name: '第四天' }, 
+					{   name: '第五天' }, 
+					{   name: '第六天' }, 
+					{   name: '第七天' }, 
+				],
 			}
 		},
 		onShow() {