From 1fee3f3d0f5fbe9d249998ce911727b0ba99e3db Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 24 Dec 2024 18:10:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9A=82=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=8A=9F=E8=83=BD=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json               | 10 +++++-
 pages/task/index.vue     |  2 +-
 pages/task/stayTuned.vue | 70 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 pages/task/stayTuned.vue

diff --git a/pages.json b/pages.json
index 5586565..c67f232 100644
--- a/pages.json
+++ b/pages.json
@@ -22,13 +22,21 @@
 			}
 		},
 		{
-			"path": "pages/task/prizeList",
+			"path": "pages/task/stayTuned",
 			"style": {
 				"navigationBarTitleText": "任务",
 				"navigationStyle": "custom"
 
 			}
 		},
+		{
+			"path": "pages/task/prizeList",
+			"style": {
+				"navigationBarTitleText": "任务",
+				"navigationStyle": "custom"
+		
+			}
+		},
 		{
 			"path": "pages/task/receiveMember",
 			"style": {
diff --git a/pages/task/index.vue b/pages/task/index.vue
index ec907c8..07afa68 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -322,7 +322,7 @@
 <style lang="scss">
 	.container {
 		width: 100%;
-		height: 100vh;
+		min-height: 100vh;
 		background-color: #F3F4F8;
 		.task_bg {
 			width: 100% !important;
diff --git a/pages/task/stayTuned.vue b/pages/task/stayTuned.vue
new file mode 100644
index 0000000..844abec
--- /dev/null
+++ b/pages/task/stayTuned.vue
@@ -0,0 +1,70 @@
+<!-- 任务中心 -->
+<template>
+	<view class="container">
+		<u-navbar :background="background" :is-back="true" :title="title" :border-bottom="false"></u-navbar>
+		<view class="centre">
+		  <image src="../../static/images/learn/none.png" mode=""></image>
+		  <view class="tips">
+		    功能暂未开启~敬请期待
+		  </view>
+		</view>
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		
+		data() {
+			return {
+				title: '',
+				background: {
+					backgroundImage: 'transparent'
+				},
+			}
+		},
+		onLoad(options) {
+			
+		},
+		methods: {
+			
+			
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.centre {
+	  text-align: center;
+	  padding: 200rpx 0;
+	  font-size: 32rpx;
+	  box-sizing: border-box;
+	
+	  image {
+	    width: 360rpx;
+	    height: 360rpx;
+	    // margin-bottom: 20rpx;
+	    margin: 0 auto 20rpx;
+	    // border: 1px dotted #000000;
+	  }
+	
+	  .tips {
+	    font-size: 34rpx;
+	    color: #999999;
+	    margin-top: 20rpx;
+	  }
+	
+	  .btn {
+	    margin: 80rpx auto;
+	    width: 600rpx;
+	    border-radius: 32rpx;
+	    line-height: 90rpx;
+	    color: #ffffff;
+	    font-size: 34rpx;
+	    background: #ff7581;
+	  }
+	}
+	
+
+</style>
\ No newline at end of file

From 32725014a22e9c933f35660d1fee39d118a27779 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 24 Dec 2024 18:13:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9A=82=E6=9C=AA=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/task/index.vue b/pages/task/index.vue
index 07afa68..e43ddfa 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -321,8 +321,8 @@
 
 <style lang="scss">
 	.container {
-		width: 100%;
-		min-height: 100vh;
+		// width: 100%;
+		// min-height: 100vh;
 		background-color: #F3F4F8;
 		.task_bg {
 			width: 100% !important;
diff --git a/pages/task/stayTuned.vue b/pages/task/stayTuned.vue
index 844abec..7e2dd5f 100644
--- a/pages/task/stayTuned.vue
+++ b/pages/task/stayTuned.vue
@@ -5,7 +5,7 @@
 		<view class="centre">
 		  <image src="../../static/images/learn/none.png" mode=""></image>
 		  <view class="tips">
-		    功能暂未开启~敬请期待
+		    活动正在进行中~敬请期待开奖结果
 		  </view>
 		</view>
 	

From 3960ff75867812099c7927a0b85b7a8ba25130fb Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 24 Dec 2024 18:33:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js     | 12 ++++++------
 manifest.json        |  4 ++--
 pages/task/index.vue |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/config.js b/common/config.js
index ff61669..f8c138b 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,10 +1,10 @@
-// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
-// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
-// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
+const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
+const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
+const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
 
-const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
-const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 
+// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
+// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
+// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 
 
 // const ROOTPATH1 = "http://192.168.1.5:8100/sqx_fast/"; //
 // const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名
diff --git a/manifest.json b/manifest.json
index 70102ff..24025ec 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "斯耀短剧",
     "appid" : "__UNI__E0B05B1",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.0.9",
+    "versionCode" : 109,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/task/index.vue b/pages/task/index.vue
index e43ddfa..6b0b790 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -54,7 +54,7 @@
 		<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')||(isAndroid&&item.title =='观看视频奖励')">
+				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"
@@ -126,7 +126,7 @@
 				signInBtn: '点击签到',
 				isShowMoneyPay: true,
 				isIos: false,
-				isAndroid: true,
+				isAndroid: false, 
 				adRewardedVideo: true,
 				urlCallback: null,
 			}
@@ -141,7 +141,7 @@
 					let isIos = sysInfo.platform == 'ios'
 					this.isIos = /iOS/.test(sysInfo.platform);
 					// 判断是否是安卓设备
-					// #ifdef APP
+					// #ifdef APP-PLUS
 					this.isAndroid = sysInfo.platform === 'android'
 					// #endif
 

From 28bab311d39e484a76eac619872aaae19cb3906c Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 25 Dec 2024 17:10:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=91=98=E6=9D=83=E7=9B=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js                |  12 +--
 me/choujiang/choujiang.vue      |   6 +-
 me/gift/duihuan.vue             |   9 +-
 me/invite/cashDetail.vue        |   1 -
 me/invite/moneyList.vue         |   3 +-
 pages/me/index.vue              |   1 -
 pages/task/index.vue            | 152 ++++++++++++++++++++++++--------
 pages/task/prizeList.vue        |  23 ++---
 pages/task/receiveMember.vue    | 117 ++++++++++++++++++++++--
 static/images/signIn_icon2.png  | Bin 1285 -> 1119 bytes
 static/images/task/receive1.png | Bin 0 -> 3767 bytes
 static/images/task/receive2.png | Bin 0 -> 4234 bytes
 12 files changed, 255 insertions(+), 69 deletions(-)
 create mode 100644 static/images/task/receive1.png
 create mode 100644 static/images/task/receive2.png

diff --git a/common/config.js b/common/config.js
index f8c138b..ff61669 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,10 +1,10 @@
-const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
-const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
-const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
+// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
+// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
 
-// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
-// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 
+const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
+const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
+const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 
 
 // const ROOTPATH1 = "http://192.168.1.5:8100/sqx_fast/"; //
 // const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名
diff --git a/me/choujiang/choujiang.vue b/me/choujiang/choujiang.vue
index a4691ef..2d5e9cb 100644
--- a/me/choujiang/choujiang.vue
+++ b/me/choujiang/choujiang.vue
@@ -477,12 +477,16 @@
 
 				if (name.type ==1) {
 					tipContent = '很遗憾，没有中奖，请再接再厉！'
+					uni.showToast({
+						title: tipContent,
+						icon: "none"
+					})
 				} else {
 					tipContent = `恭喜您，获得 ${name}${this.result.type==2?(this.result.number+'元'):''} ！`
+					this.showLingPop({...this.result})
 				}
 				const _this=this;
 				console.log(this.result);
-				 this.showLingPop({...this.result})
 				 this.result=''
 				 this.prizeing = false
 				 return
diff --git a/me/gift/duihuan.vue b/me/gift/duihuan.vue
index 0e3b625..35a466e 100644
--- a/me/gift/duihuan.vue
+++ b/me/gift/duihuan.vue
@@ -34,7 +34,8 @@
 		data() {
 			return {
 				query: {
-					discSpinningRecordId: null,
+					foreignId: null,
+					foreignType: 'spinning',
 					phone: "",
 					address: "",
 					remark: "",
@@ -44,9 +45,11 @@
 		onLoad(options) {
 			console.log(options)
 			if ( options.id ) {
-				this.query.discSpinningRecordId = options.id
+				this.query.foreignId = options.id
+			}
+			if ( options.foreignType ) {
+				this.query.foreignType = options.foreignType
 			}
-		
 			
 		},
 		methods: {
diff --git a/me/invite/cashDetail.vue b/me/invite/cashDetail.vue
index 4f04ce3..333c92c 100644
--- a/me/invite/cashDetail.vue
+++ b/me/invite/cashDetail.vue
@@ -184,7 +184,6 @@ export default {
     getMoneyDetail() {
       let that = this;
       let token = uni.getStorageSync('token')
-      console.log(1);
       if (token) {
         //可以提现金额查询预估收入查询
         let data = {
diff --git a/me/invite/moneyList.vue b/me/invite/moneyList.vue
index 1a51722..a4968b5 100644
--- a/me/invite/moneyList.vue
+++ b/me/invite/moneyList.vue
@@ -41,11 +41,10 @@
 			}
 		},
 		onLoad: function(e) {
-			console.log(e)
 			if (e.moneyType) {
 				this.moneyType = e.moneyType
 				uni.setNavigationBarTitle({
-					title: e.moneyType === 1 ? '红包明细' : '金币明细'
+					title: e.moneyType == 1 ? '红包明细' : '金币明细'
 				});
 			}
 			if (e.viewType) {
diff --git a/pages/me/index.vue b/pages/me/index.vue
index cef097f..1de8e76 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -579,7 +579,6 @@
 				}
 			},
 			goNav(e,type) {
-				console.log(e)
 				let token = uni.getStorageSync('token')
 				if (token) {
 					if (type === 'tabbar') {
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 6b0b790..97c41a8 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -17,14 +17,22 @@
 			<view class="icon_title u-font-32 text-bold u-relative">新人好礼送不停</view>
 			<image class="task_icon2 u-relative" src="../../static/images/me/task_icon2.png"></image>
 		</view>
-
-		<view class="content signIn margin-lr padding bg-white u-relative" style="margin-bottom: 32rpx;">
+		<view v-if="enable!=0&&signInList.length>0" class="content signIn margin-lr padding bg-white u-relative" style="margin-bottom: 32rpx;">
+			
 			<view class="title flex justify-between">
 				<view>已连续签到 <text class="num">{{signDays}}</text> 天</view>
 				<!-- 	<view class="dk flex">
 					<text style="margin-right: 20rpx;">打卡提醒</text>
 					<u-switch v-model="checked" size="35" active-color="#EA9EA8 "></u-switch>
 				</view> -->
+				<view class="tooltip-trigger" @click="showTooltip">
+					<u-icon name="question-circle" :size="40"></u-icon>
+					<view class="tooltip" v-if="isTooltipVisible">
+					    签到中断后需重新签到
+						<view class="triangle"></view>
+						<view class="trianglef"></view>
+					</view>
+				</view>
 			</view>
 			<view class="signInList flex justify-between">
 				<text class="line"></text>
@@ -39,6 +47,7 @@
 						src="../../static/images/signIn_icon1.png" mode="" />
 					<view class="radius"></view>
 					<view class="_label">{{item.showText}}</view>
+					<view class="_label" style="font-size: 18rpx;color: #999;margin-top: 2rpx;">{{item.signDay.slice(6,10)}}</view>
 				</view>
 			</view>
 
@@ -50,11 +59,10 @@
 			</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"
-				v-if="((item.buttonUrl=='/me/invite/index'&&isShowMoneyPay))||((item.buttonUrl!='/me/invite/index'))">
+				v-if="item.show">
 				<view class="cell_left flex">
 					<view class="cell_title flex">
 						<view class="u-font-28 text-bold title"
@@ -75,7 +83,7 @@
 					</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})">
+						@click="goNav({id: item.id,buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title, disabled: item.disabled, discNumber: item.discNumber})">
 						{{ item.buttonUnderContent}}
 					</view>
 				</view>
@@ -101,27 +109,9 @@
 				list: [],
 				checked: false,
 				signDays: 0,
-				signInList: [{
-						name: '第一天'
-					},
-					{
-						name: '第二天'
-					},
-					{
-						name: '第三天'
-					},
-					{
-						name: '第四天'
-					},
-					{
-						name: '第五天'
-					},
-					{
-						name: '第六天'
-					},
-					{
-						name: '第七天'
-					},
+				enable: 0,
+				signInList: [],
+				recordList: [
 				],
 				signInBtn: '点击签到',
 				isShowMoneyPay: true,
@@ -129,9 +119,12 @@
 				isAndroid: false, 
 				adRewardedVideo: true,
 				urlCallback: null,
+				    isTooltipVisible: false,
+				      tooltipTimeout: null,
 			}
 		},
 		onShow() {
+			this.signInList = []
 			this.adRewardedVideo = true;
 			this.getTaskdata()
 			this.getsignIn()
@@ -141,9 +134,7 @@
 					let isIos = sysInfo.platform == 'ios'
 					this.isIos = /iOS/.test(sysInfo.platform);
 					// 判断是否是安卓设备
-					// #ifdef APP-PLUS
-					this.isAndroid = sysInfo.platform === 'android'
-					// #endif
+				
 
 					this.isShowMoneyPay = !(res.data.value == '1' && isIos)
 				}
@@ -153,9 +144,28 @@
 		},
 	
 		methods: {
+			/**
+			 * 签到提示出发
+			 */
+			showTooltip() {
+		        clearTimeout(this.tooltipTimeout);
+		        this.isTooltipVisible = !this.isTooltipVisible;
+				this.tooltipTimeout = setTimeout(() => {
+					this.isTooltipVisible = false;
+				}, 1000); // 1000毫秒后隐藏tooltip
+			},
+			
+			/**
+			 * 广告数据加载成功回调
+			 * @param {Object} e
+			 */
 			onadload(e) {
 				console.log('广告数据加载成功');
 			},
+			/**
+			 * 广告播放成功回调
+			 * @param {Object} e
+			 */
 			async onadclose(e) {
 				const detail = e.detail
 				if (detail && detail.isEnded) {
@@ -177,6 +187,10 @@
 					// 播放中途退出
 				}
 			},
+			/**
+			 * 广告加载失败回调
+			 * @param {Object} e
+			 */
 			onaderror(e) { // 广告加载失败
 				this.adRewardedVideo = false;
 				console.log("广告加载失败")
@@ -189,6 +203,7 @@
 					if (res.code == 0) {
 						this.signInList = res.data.recordList
 						this.signDays = res.data.signDays
+						this.enable = res.data.enable
 						this.signInList.map((item, index) => {
 							if (item.showText == '待签到' && index > 0) {
 								this.signInBtn = this.signInList[index - 1].status == 0 ? '重新签到' : '点击签到'
@@ -247,14 +262,17 @@
 				} else if (item.jumpType == 1) {
 					let source, buttonUrl;
 					buttonUrl = item.buttonUrl
-					if (item.title && item.title.indexOf('每周') != -1) {
+					if (item.title && item.title.indexOf('每周打卡奖励') != -1) {
 						source = 2
 						buttonUrl = item.buttonUrl + '?source=' + source
 					}
-					if (item.title && item.title.indexOf('每月') != -1) {
+					if (item.title && item.title.indexOf('每月打卡奖励1') != -1) {
 						source = 3
 						buttonUrl = item.buttonUrl + '?source=' + source
 					}
+					if (item.title && item.title.indexOf('每月打卡奖励2') != -1) {
+						buttonUrl = `${item.buttonUrl}?standard=${item.discNumber==null?true:false}&taskId=${item.id}`
+					}
 					console.log(buttonUrl)
 					uni.navigateTo({
 						url: buttonUrl
@@ -298,10 +316,21 @@
 			 * 获取任务列表
 			 */
 			getTaskdata() {
-
+				this.list= [];
 				this.$Request.getT('app/taskCenter/selectTaskCenter', {}).then(res => {
 					if (res.code == 0) {
 						this.list = res.data
+						this.list.map(item=>{
+							item.show = true
+						})
+						// #ifdef H5
+						this.list.map(item=>{
+							if(item.title.indexOf("观看视频") != -1) {
+								item.show = false
+							} 
+						})
+						// #endif
+						
 					}
 					uni.stopPullDownRefresh();
 				})
@@ -320,10 +349,59 @@
 </script>
 
 <style lang="scss">
-	.container {
-		// width: 100%;
-		// min-height: 100vh;
+	page{
 		background-color: #F3F4F8;
+	}
+	.tooltip-trigger {
+	  // background-color: #f0f0f0;
+	  // border: 1px solid #ddd;
+	  text-align: center;
+	
+	}
+	 
+	.tooltip {
+	  padding: 10px;
+	  background-color: #fff;
+	  color: #999;
+	  box-shadow: 0rpx 4rpx 10rpx 4rpx rgba(140,140,140,0.35);
+	  border-radius: 10rpx 10rpx 10rpx 10rpx;
+	  position: absolute;
+	  top: 80rpx;
+	  right: 30rpx;
+	  z-index: 10;
+	  font-weight: 400;
+	  font-size: 20rpx;
+	  color: #999999;
+	}
+	.triangle,.trianglef {
+		position: absolute;
+		z-index: 99;
+		right: 15rpx;
+		top: -16rpx;
+		width: 0;
+		height: 0;
+		border-left: 17rpx solid transparent;
+		/* 左边的边框为透明 */
+		border-right: 17rpx solid transparent;
+		/* 右边的边框为透明 */
+		border-bottom: 17rpx solid rgba(140,140,140,0.15);
+		opacity: .9;
+		z-index: 8;
+	}
+	.trianglef{
+		top: -15rpx;
+		right: 17rpx;
+		border-left: 15rpx solid transparent;
+		/* 左边的边框为透明 */
+		border-right: 15rpx solid transparent;
+		border-bottom: 15rpx solid #fff;
+		z-index: 11;
+	}
+	.container {
+		width: 100%;
+		// height: 100vh;
+		background-color: #F3F4F8;
+		// padding-bottom: 132rpx;
 		.task_bg {
 			width: 100% !important;
 			height: 494rpx !important;
@@ -486,7 +564,7 @@
 					position: absolute;
 					left: 0;
 					right: 0;
-					bottom: 57rpx;
+					bottom: 82rpx;
 					margin: auto;
 				}
 
diff --git a/pages/task/prizeList.vue b/pages/task/prizeList.vue
index 31ccbb9..77729e6 100644
--- a/pages/task/prizeList.vue
+++ b/pages/task/prizeList.vue
@@ -2,9 +2,9 @@
 <template>
 	<view class="container">
 		<u-navbar :background="background" :is-back="true" :title="title" :border-bottom="false"></u-navbar>
-		<view class="task_bg u-relative"></view>
-		
-		
+		<view style="width: 100%;position: absolute;">
+			<image class="task_bg" src="../../static/images/task/prize_bg.png" mode="widthFix"></image>
+		</view>
 		<view class="content u-relative" v-if="list.length">
 			
 			<view class="cell flex justify-between" v-for="(item,index) in list" :key="index"  >
@@ -24,7 +24,7 @@
 			return {
 				title: '',
 				background: {
-					backgroundImage: 'transparent'
+					backgroundImage: 'linear-gradient(to right, #F0987B 0%, #F0987B 49%, #F0987B 100%)'
 				},
 				list: [],
 				source: null
@@ -55,23 +55,26 @@
 </script>
 
 <style lang="scss">
+	page{
+		background-color: #FAF8F3;
+	}
 	.container{
 		width: 100%;
-		height: 100vh;
+		min-height: 100vh;
 		// display: flex;
 		// flex-direction: column;
 		.task_bg{
 			width: 100%;
-			height: 100%;
-			position: absolute;
-			top: 0;
-			background: url('../../static/images/task/prize_bg.png') no-repeat top center / cover;
+			// height: 100%;
+			// position: absolute;
+			// top: 88rpx;
+			// background: url('../../static/images/task/prize_bg.png') no-repeat top center / cover;
 			
 		}
 		
 		.content{
 			z-index: 9;
-			padding: 370rpx 28rpx 0 28rpx;
+			padding: 282rpx 28rpx 0 28rpx;
 			display: flex;
 			flex-direction: row;
 			flex-wrap: wrap;
diff --git a/pages/task/receiveMember.vue b/pages/task/receiveMember.vue
index 478f9e0..a1c0b12 100644
--- a/pages/task/receiveMember.vue
+++ b/pages/task/receiveMember.vue
@@ -1,7 +1,7 @@
 <!-- 任务中心 -->
 <template>
 	<view class="container">
-		<u-navbar :background="background" :is-back="true" :title="title" :border-bottom="false"></u-navbar>
+		<u-navbar :background="background" :is-back="true" :title="title" :border-bottom="false" style="position: absolute;"></u-navbar>
 		<view class="task_bg u-relative">
 			<u-image class="task_bg" src="../../static/images/task/member_bg.png" ></u-image>
 			<view class="title ">每月打卡免费领</view>
@@ -15,12 +15,32 @@
 			</view>
 			<view class="cell flex justify-between" v-for="(item,index) in list" :key="index"  >
 				<view class="cell_left flex">
-					<image class="cell_icon" :src="item.url"></image>
+					<image class="cell_icon" :src="item.img"></image>
 					<view class="cell_title flex">
 						<view class="u-font-28 text-bold title">{{ item.name}}</view>
-						<!-- <view class="u-font-24 tip">{{ item.rewardDetail  }}</view> -->
+						<view class="u-font-24 tip">{{ item.rewardDetail  }}</view>
 					</view>
 				</view>
+				<view class="cell_right" v-if="standard=='true'">
+					<viwe v-if="!receive">
+						<view class="btn"  @click="taskReceive(item)">领取</view>
+					</viwe>
+					<view v-else>
+						<view v-if="item.disabled" >
+							<view class="btn disabled" >领取</view>
+						</view>
+						<view v-else>
+							<view v-if="!item.targetId" class="btn" @click="toDuiHuan(item)">去兑换</view>
+							<view v-else class="btn receive" >已兑换</view>
+							<u-image v-if="!item.targetId" class="icon" src="../../static/images/task/receive2.png"></u-image>
+						</view>
+						
+					</view>
+				</view>
+				<view class="standard" v-else>
+					<u-image class="icon" src="../../static/images/task/receive1.png"></u-image>
+				</view>
+			
 			</view>
 
 		</view>
@@ -37,7 +57,14 @@
 				background: {
 					backgroundImage: 'transparent',
 				},
+				query: {
+					taskId: null,
+				
+				},
 				list: [],
+				standard: true,
+				receive: null,
+				record: null,
 				source: null,
 			}
 		},
@@ -46,21 +73,75 @@
 			if ( options.source ) {
 				this.source = options.source
 			}
-			this.getList()
+			if ( options.standard ) {
+				this.standard = options.standard
+			}
+			if ( options.taskId ) {
+				this.query.taskId = options.taskId
+			}
+		},
+		onShow() {
+			this.getList()	
 		},
 		methods: {
-		
+			/**
+			 * 去兑换
+			 * @param {Object} item
+			 */
+			toDuiHuan(item){
+				uni.navigateTo({
+					url:`/me/gift/duihuan?id=${this.record}&foreignType=task`
+				})
+			},
+			
 			/**
 			 * 获取列表
 			 */
 			getList() {
-				this.$Request.getT('app/discSpinning/selectDiscSpinning', {source:this.source}).then(res => {
+				this.$Request.getT('app/taskCenterReward/selectTaskCenterUserReward', this.query).then(res => {
 					if (res.code == 0 ) {
-						this.list = res.data.records
+						this.list = res.data
+						this.list.map(item=>{
+							item.disabled = true
+						})
+						this.receive = res.receive
+						this.record = res.record
+						if ( this.receive ) {
+							this.list.map(item=>{
+								if ( item.id == this.receive ) {
+									item.disabled = false
+								}
+							})
+						}
+						console.log(this.list)
+						
 					}
 				})
 			},
 			
+			/**
+			 * 领取
+			 */
+			taskReceive(item) {
+				let data = {
+					taskId: this.query.taskId,
+					sourceId: item.id
+				}
+				this.$Request.postT('app/taskCenter/receiveGoods', data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '领取成功',
+							icon: 'none'
+						})
+						this.getList()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -120,6 +201,17 @@
 				border-radius: 8rpx 8rpx 8rpx 8rpx;
 				margin-bottom: 32rpx;
 				padding: 32rpx 28rpx;
+				position: relative;
+				.standard{
+					width: 100%;
+					height: 100%;
+					background: rgba(43,43,43,0.19);
+					border-radius: 8rpx 8rpx 8rpx 8rpx;
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					
+				}
 				.cell_left{
 					flex-direction: row;
 					align-items: center;
@@ -147,7 +239,7 @@
 					}
 					
 				}
-				.cell_right{
+				.cell_right{				
 					flex-direction: column;
 					align-items: center;
 					flex-shrink: 0;
@@ -163,6 +255,8 @@
 						font-size: 24rpx;
 						color: #FFFFFF;
 						border: 2rpx solid transparent;
+						position: relative;
+						z-index: 99;
 					}
 					
 					.opt{
@@ -179,6 +273,13 @@
 						color: #6DA9F7;
 					}
 				}
+				.icon{
+					width: 132rpx!important;
+					height: 136rpx!important;
+					position: absolute;
+					right: 0;
+					bottom: 0;
+				}
 				
 			}
 			.cell:last-child{
diff --git a/static/images/signIn_icon2.png b/static/images/signIn_icon2.png
index 39a255a0509ee66067e81e83d24cc5fe9f239bd4..12756897f9b6705ca2094defa35d91d1c9dabc61 100644
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq001=r001-y1^@s6D!Oph00001b5ch_0Itp)
z=>Px(8A(JzRA@uZnz2$8K@f)jA-8UM0fiS(cmPX@wMtA)gb))T!w857ITBMaF$JqM
z<^pri@&Q0!z&#$ok$+|u_vUtQW_Ejz>#8fRj@_C0rh9sNx<^4!bcW{uR`3^3ps)fU
z1F+<Ekps9kAB7(P1^|XC2Y(k4)wUG}@(LOo4x(w311NmFos^5VfQ_Mah7D+J8_med
zH8ciTz@f^GMw2BO%4kO8w8E^CI}f~&L!+;5aG2U~G?dPeIhgg-PFg<CwYQd{wJ0c^
zVFeoJGtf>wzs5nV)`C#_0p4N({gzIkrLx@X)*N?3jZKAeKxd&wX8M1PGj)T_X?@m0
z%_UGl5&)}&(ixVZ@qI2#u1+OW*4PA;1G>Cdrx0t;)+;h18IvlgQx_e?HhrJZ<+oAD
zvLAtrLAfY_8*9D1SO-3w0^bI}yG>vu7P8qsx3+=31K`sc@IL71;5O*72gjj$xC)xx
zQQvk<`8fn$uE~Mz?OPxUC+pE-oE3Oxcn1}wC3f*}3HWkp|4M?Df!HpsfZB?aff`}0
zc=SJ1jFyVGq`}$&*-@3WWuRP;N{<&WQeYB57V6~IVeHti7OI)YYYQd?WL1%?5zHdA
zP${P8>#`}BEYO$<sz#>Q7OV@Pk_i%O2O7umi>c<xSdDcBWQS$EAfe8oA#?BxfprUX
zx2}}#fnJYUAQ`CxD<XxWm$ZE-erybzbcQSFi8NMxBUMlOV2loW%$7On3dpXjRccDN
zBZypMvjDPCue*a{2S>-ime~)j{JsXBuFA!VRr9H^*&USc6p8^z2f;p=)6^gF6Rr=$
zBLp3VbP!yvDdW;*9Yvkn4!L`&h0VZLbe{_CL$d%=SR_>6<;2^~RS2kPy<0F7)Dnt`
z{^>{f5N<3`*I)_*m0R;;I*iBoW|9ijC78ml%F!>*Q_Y-3Q=qQE7)|6D7ElM!*iTYb
zTOfI`Yc;~M4Jz!(mt`96S8*Z*BnieyB8SP;loKy;(fXSWoA)b3DmeAMBJ+w&zr~78
zYMRPpIYq__VL16x&ihFLRcVZI;$ve?VetwEeljzxEzT&l#hK(sT8j3+Uf5)5SSBis
ze%g8ds~tY1bK~Wos|o}%Ig9WNOFS`DBdktxRx~Ys#FrTUWE-^w?z*BIT|A3!{%w_R
zhS#Lkn%dNu_w(DG>*8B!PpX=a>4j_?7tU8zF#t4GQ^gF-k;YgxWWXA%?*#8r5YB{A
z0OLbfZELa!TD_BW>m>@Rq&1$s82HZ4fhe4CLQ`&*B|$l@5r}(Pw^~!C>du>F$ze+}
z)Yw|HCizTMb1h(su{DM&uMnM?0>gSkKso>hd7p15=Pbp{>Q<=;ln2O5jWp5Xx@oVX
l^Iz`DDX*DEMXf1r<{$E+`kX03_kI8X002ovPDHLkV1jyL|DFH<

literal 1285
zcmV+g1^W7lP)<h;3K|Lk000e1NJLTq001@s001-y1^@s6!Hvt-00001b5ch_0Itp)
z=>Px(zez+vRA@uZnmtY%K@`W|tdOu9L?~!z9EpMkgefSXNYb%(11AVMLC6V0PLSjT
zNlpL_JMMsjhJqkbK!FrfP(VTGyb_p=|C`;_?6My-v$NPES(fbCx9>Oqd2c=$87@0J
zJCoz%<8O)R4G}dMV~dQjNzd~p6R+wLQP=ald&{y8`u+Z4yWKuD<qk7p2r%_}{k`XT
z>qG=7-2&JHBKl?9Homn>DKG%lYPBuK*vAw_w4Dkb1mw1D+rM-SX@OM?l;i;52UP`?
z!8qsWYCjM^IxVUD%pgv`^?JQ88yg$<GB%XJIOp3$^jXGmMRlOwJKMJLom-^AIOji!
z=zWpFs{cn8WsGeUb<IMsAf9$gX1gkQH}eupA=s!WmC-WjmZ`%+F4zdfRIbuNw```x
zTqYRjd^5;?RdgehHoLCtHj~*h6>QM`kjnR8I;HE<VklT!Tl*wFp9O|-3W|+XX*3#C
ztJUb@;v&tjSiC(03kG1QH8Q1MuhabeJWWka(Zj<79UdOi<Ktt}zXRL0--SOu1M74;
zzdg@e92F|4G&?&>V`F2!OV`)ebar-@<zA#(3~ZFt5>*N*3ZPIeQY{HK60wCYx3shr
zsU)G4sGzS}1h&7wKk2&e-(hz_bUS>+BB4}NeXxA`)@rprMPQEOtTV<ibs9=R3@t1y
z(Dd|l?EQClcXWJwtm0F5Fx7e;fpN}<)(sI)%gf7zZ?W`xJvur%O3Q$`pifUvjR<U5
z*>GZFf||`{Dio9goJQI7!G;xIX-NY9V2pxNnoxu|^TGD^_7*M6`mND2+K<f4%=m+D
zS~)p6q1)SAZQFx!c-IHh9lsFpDKmgVhte`%_|WC$CE-)DbVD$unY@_6&d<;3>gr0`
zk31--1hotlb+EJy*6nt)CZ;hT^Pmt<C6Yz5E!4mOwYs_*n-PQ-iyXt8Z*FcbQw&UO
zb(2MkQ8h3aC~9>~P%)^AB`;B+o}suBUm1a6uTXlak_VS`6ywy&%1WkE8Z!%-5d1$^
z3|7p4WS$7?6v5rx-1tc)IhhsTQFgq_@;6HNsL<(j{;KZ37r_-ZlxjvTvM2n%EzT9u
z6_rm)bm1!Mf<7B#Y+alyejRLQZ7H-$R8<Gga2AZY?YizOQ8A?il57AKxC*kM=#IaN
zj;)||;!LzC1BbB+YE@YLt?%U408UbHqM}`j;4sc%MO<Ndjh*2bn5pGU7TgP{_0zWP
z4}Jnkww$SzbQ)aQ<%opJzFJveIO)gUV)B$<!fw2Z2v=o#58fK7l?sL*Ip?KgEkq3A
zDvqsZC!Lw6EhhIsFtf+fro!^<5HRl;$yk@H5Xj%(z&>K~9YqI!N-OIs0Wxf-o{eS3
zm}tagycq`1y+KfT25mZ-7=kOj79j-&XB@}D)uOM49Md*4xUY2@T!+ZbM$%w`azj1B
z%}Nw$t)v771HrTl%Dv=KF0TJ=wpuOe*|RcO*gC;>0uC~i7pJoQkTG@-l?Lmp@3MEO
zLfhJ4p#jHn-dL8k72H*n^*Og*86aa|2?e1Z?px`oi0-yaM7t_oE~|w~E0$##N;1Zf
vY{E~hYH(%NzdqaV_fOmHw){T1M8Eh4NC0q{!y_4T00000NkvXXu0mjfLZn;J

diff --git a/static/images/task/receive1.png b/static/images/task/receive1.png
new file mode 100644
index 0000000000000000000000000000000000000000..888d1f406d38e54ccaae49337d84c420f116853c
GIT binary patch
literal 3767
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

literal 0
HcmV?d00001

diff --git a/static/images/task/receive2.png b/static/images/task/receive2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e152e87df11b80542e05c45c05caf1b524ba5470
GIT binary patch
literal 4234
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

literal 0
HcmV?d00001