From ae33f415b0a42b4ee069ba4a6a33d4ffbfbfbcb0 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 17 Jan 2025 10:17:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index/index.js           |   1 +
 api/task/index.js            |  14 ++
 http/http.js                 |   2 +-
 pages/task/receiveMember.vue | 410 +++++++++++++++++++++++------------
 static/task/receive1.png     | Bin 0 -> 3767 bytes
 static/task/receive2.png     | Bin 0 -> 4234 bytes
 6 files changed, 282 insertions(+), 145 deletions(-)
 create mode 100644 static/task/receive1.png
 create mode 100644 static/task/receive2.png

diff --git a/api/index/index.js b/api/index/index.js
index 519b041..4891f2a 100644
--- a/api/index/index.js
+++ b/api/index/index.js
@@ -56,6 +56,7 @@ export const discSpinningdraw = (data) => {
 	})
 }
 
+
 export const selectUserMoney = (data) => {
 	return http.request({
 		url: '/moneyDetails/selectUserMoney',
diff --git a/api/task/index.js b/api/task/index.js
index 562bab5..2bb9820 100644
--- a/api/task/index.js
+++ b/api/task/index.js
@@ -7,6 +7,14 @@ export const selectTaskCenter = (data) => {
         data
     })
 } 
+// 兑换列表
+export const selectTaskCenterUserReward = (data) => {
+	return http.request({
+		url: '/taskCenterReward/selectTaskCenterUserReward',
+		data,
+		isreturm:true
+	})
+}
 // 获取签到
 export const getUserSignData = (data) => {
     return http.request({
@@ -14,6 +22,12 @@ export const getUserSignData = (data) => {
         data
     })
 } 
+export const receiveGoods = (data) => {
+    return http.request({
+        url: 'taskCenter/receiveGoods',
+        data
+    })
+} 
 //  任务-签到
 export const taskReceive = (data) => {
     return http.request({
diff --git a/http/http.js b/http/http.js
index 201fd1a..97a13e6 100644
--- a/http/http.js
+++ b/http/http.js
@@ -58,7 +58,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 			// 避免混淆重新命名
 			let bodyData = data;
 			if (isreturm) {
-				return Promise.resolve(bodyData.data || bodyData.page || bodyData);
+				return Promise.resolve(bodyData);
 			}
 			if (statusCode == 500) {
 				isShowErrorToast = true;
diff --git a/pages/task/receiveMember.vue b/pages/task/receiveMember.vue
index 1ab9fb4..c8462a8 100644
--- a/pages/task/receiveMember.vue
+++ b/pages/task/receiveMember.vue
@@ -12,11 +12,35 @@
 			</view>
 			<view class="cell " v-for="(item, index) in datas.list" :key="index">
 				<view class="cell_left ">
-					<image class="cell_icon" :src="item.url"></image>
+					<image class="cell_icon" :src="item.img"></image>
 					<view class="cell_title ">
 						<view class=" title">{{ item.name }}</view>
 					</view>
 				</view>
+
+				<view class="cell_right" v-if="datas.standard=='true'">
+					<viwe v-if="!datas.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"
+								style="	width: 32rpx!important;height: 36rpx!important;position: absolute;	right: 0;bottom: 0;"
+								src="@/static/task/receive2.png"></u-image>
+						</view>
+
+					</view>
+				</view>
+				<image v-else src="@/static/task/receive1.png"
+					style="width: 130rpx!important;height: 130rpx!important;position: absolute;	right: 0;bottom: 0;"
+					mode=""></image>
+
+
 			</view>
 
 		</view>
@@ -25,169 +49,267 @@
 </template>
 
 <script setup>
-import { reactive, ref, onMounted, onUnmounted, getCurrentInstance } from 'vue'
-import {
-	onLoad
-} from '@dcloudio/uni-app'
-import { selectDiscSpinning } from '@/api/task/index.js'
-let datas = reactive({
-	list: [],
-	source: null
+	import {
+		reactive,
+		ref,
+		onMounted,
+		onUnmounted,
+		getCurrentInstance
+	} from 'vue'
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+	import {
+		selectTaskCenterUserReward
+	} from '@/api/task/index.js'
+	let datas = reactive({
+		list: [],
+		source: null,
+		standard: true,
+		receive: null,
+		record: null,
+		taskId: "",
 
-})
-onLoad(options => {
-	datas.source = options.source
-	getList()
-})
+	})
+	onLoad(options => {
+		console.log(options, '调试1')
+		if (options.source) {
+			datas.source = options.source
+		}
+		if (options.standard) {
+			datas.standard = options.standard
+		}
+		if (options.taskId) {
+			datas.taskId = options.taskId
+		}
+		getList()
+	})
+	// 去兑换
+	function toDuiHuan(item) {
+		uni.navigateTo({
+			url: `/pages/index/prizeDraw/duihuan?id=${datas.record}&foreignType=task`
+		})
+	}
+	/**
+	 * 领取
+	 */
+	async function taskReceive(item) {
+		let res = await receiveGoods({
+			taskId: datas.taskId,
+			sourceId: item.id
+		})
+		uni.showToast({
+			title: '领取成功',
+			icon: 'none'
+		})
+		getList()
+	}
+	async function getList() {
+		let res = await selectTaskCenterUserReward({
+			taskId: datas.taskId
+		})
+		if (res.code == 0) {
+			datas.list = res.data
+			datas.list.map(item => {
+				item.disabled = true
+			})
+			datas.receive = res.receive
+			datas.record = res.record
+			if (datas.receive) {
+				datas.list.map(item => {
+					if (item.id == datas.receive) {
+						item.disabled = false
+					}
+				})
+			}
 
-async function getList() {
-	let res = await selectDiscSpinning({ source: datas.source })
-	datas.list = res.records
-
-}
+		}
+	}
 </script>
 
 <style lang="scss">
-.container {
-	width: 100%;
-	height: 100vh;
-
-	// display: flex;
-	// flex-direction: column;
-	.task_bg {
-		width: 100% !important;
-		height: 470rpx !important;
+	.container {
+		width: 100%;
+		height: 100vh;
 		position: relative;
 
-		.title {
-			width: 314rpx;
-			height: 72rpx;
-			line-height: 72rpx;
-			text-align: center;
-			border-radius: 108rpx 108rpx 108rpx 108rpx;
-			border: 6rpx solid #3D6DC6;
-			font-weight: bold;
-			font-size: 34rpx;
-			color: #3D6DC6;
-			position: absolute;
-			top: 210rpx;
-			left: 26rpx;
-		}
-	}
+		// display: flex;
+		// flex-direction: column;
+		.task_bg {
+			width: 100% !important;
+			height: 470rpx !important;
+			position: relative;
 
-	.content {
-		color: #666666;
-		height: calc(100% - 410rpx);
-		border-radius: 16rpx;
-		top: -60rpx;
-		z-index: 9;
-		padding: 64rpx 28rpx;
-		background: linear-gradient(-45deg, #DDEAFC 0%, #FFFFFF 100%);
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		overflow-y: auto;
-		position: relative;
-
-		>.title {
-			display: flex;
-			align-items: center;
-			font-weight: bold;
-			font-size: 32rpx;
-			color: #333333;
-			margin-bottom: 22rpx;
-
-			.tip {
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #666666;
-				margin-left: 10rpx;
+			.title {
+				width: 314rpx;
+				height: 72rpx;
+				line-height: 72rpx;
+				text-align: center;
+				border-radius: 108rpx 108rpx 108rpx 108rpx;
+				border: 6rpx solid #3D6DC6;
+				font-weight: bold;
+				font-size: 34rpx;
+				color: #3D6DC6;
+				position: absolute;
+				top: 210rpx;
+				left: 26rpx;
 			}
 		}
 
-		.cell {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			background: linear-gradient(90deg, #FFF4E0 0%, #FFFBF5 100%);
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-			margin-bottom: 32rpx;
-			padding: 32rpx 28rpx;
+		.content {
+			color: #666666;
+			height: calc(100% - 410rpx);
+			border-radius: 16rpx;
+			top: -60rpx;
+			z-index: 9;
+			padding: 64rpx 28rpx;
+			background: linear-gradient(-45deg, #DDEAFC 0%, #FFFFFF 100%);
+			border-radius: 32rpx 32rpx 0rpx 0rpx;
+			overflow-y: auto;
+			position: relative;
 
-			.cell_left {
-			display: flex;
-
-				flex-direction: row;
+			>.title {
+				display: flex;
 				align-items: center;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+				margin-bottom: 22rpx;
 
-				.cell_icon {
-					width: 84rpx !important;
-					height: 84rpx !important;
-					margin-right: 30rpx;
-					border-radius: 4rpx !important;
-				}
-
-				.cell_title {
-					display: flex;
-					align-items: center;
-					color: #333;
-
-					.title {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-
-					}
-
-					.tip {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-					}
-				}
-
-			}
-
-			.cell_right {
-				flex-direction: column;
-				align-items: center;
-				flex-shrink: 0;
-				margin-left: 20rpx;
-
-				.btn {
-					width: 148rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					text-align: center;
-					background: #6DA9F7;
-					border-radius: 12rpx 12rpx 12rpx 12rpx;
-					font-weight: 500;
+				.tip {
+					font-weight: 400;
 					font-size: 24rpx;
-					color: #FFFFFF;
-					border: 2rpx solid transparent;
-				}
-
-				.opt {
-					color: #D39B7E;
-					background-color: #FBF3EB;
-				}
-
-				.disabled {
-					color: #999999;
-					background-color: #E2E2E2;
-				}
-
-				.receive {
-					background: rgba(178, 223, 255, 0.62);
-					border: 2rpx solid #6DA9F7;
-					color: #6DA9F7;
+					color: #666666;
+					margin-left: 10rpx;
 				}
 			}
 
+			.cell {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				background: linear-gradient(90deg, #FFF4E0 0%, #FFFBF5 100%);
+				border-radius: 8rpx 8rpx 8rpx 8rpx;
+				margin-bottom: 32rpx;
+				padding: 32rpx 28rpx;
+				position: relative;
+
+				.cell_left {
+					display: flex;
+
+					flex-direction: row;
+					align-items: center;
+
+					.cell_icon {
+						width: 84rpx !important;
+						height: 84rpx !important;
+						margin-right: 30rpx;
+						border-radius: 4rpx !important;
+					}
+
+					.cell_title {
+						display: flex;
+						align-items: center;
+						color: #333;
+
+						.title {
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #333333;
+
+						}
+
+						.tip {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #999999;
+						}
+					}
+
+				}
+
+				.cell_right {
+					flex-direction: column;
+					align-items: center;
+					flex-shrink: 0;
+					margin-left: 20rpx;
+
+					.btn {
+						width: 148rpx;
+						height: 56rpx;
+						line-height: 56rpx;
+						text-align: center;
+						background: #6DA9F7;
+						border-radius: 12rpx 12rpx 12rpx 12rpx;
+						font-weight: 500;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						border: 2rpx solid transparent;
+					}
+
+					.opt {
+						color: #D39B7E;
+						background-color: #FBF3EB;
+					}
+
+					.disabled {
+						color: #999999;
+						background-color: #E2E2E2;
+					}
+
+					.receive {
+						background: rgba(178, 223, 255, 0.62);
+						border: 2rpx solid #6DA9F7;
+						color: #6DA9F7;
+					}
+				}
+
+			}
+
+			.cell:last-child {
+				border-bottom: none;
+			}
 		}
 
-		.cell:last-child {
-			border-bottom: none;
+
+		.cell_right {
+			flex-direction: column;
+			align-items: center;
+			flex-shrink: 0;
+			margin-left: 20rpx;
+
+			.btn {
+				width: 148rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				text-align: center;
+				background: #6DA9F7;
+				border-radius: 12rpx 12rpx 12rpx 12rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				border: 2rpx solid transparent;
+				position: relative;
+				z-index: 99;
+			}
+
+			.opt {
+				color: #D39B7E;
+				background-color: #FBF3EB;
+			}
+
+			.disabled {
+				color: #999999;
+				background-color: #E2E2E2;
+			}
+
+			.receive {
+				background: rgba(178, 223, 255, 0.62);
+				border: 2rpx solid #6DA9F7;
+				color: #6DA9F7;
+			}
 		}
+
+
 	}
-
-}
 </style>
\ No newline at end of file
diff --git a/static/task/receive1.png b/static/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/task/receive2.png b/static/task/receive2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e152e87df11b80542e05c45c05caf1b524ba5470
GIT binary patch
literal 4234
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

literal 0
HcmV?d00001


From 64d7d9a317ab3a5970067fb139e57bae978ff88f Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Fri, 17 Jan 2025 14:28:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/me/index.vue   | 47 ++++++++++++++++++++++++--------------------
 pages/me/setting.vue |  8 +++++---
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/pages/me/index.vue b/pages/me/index.vue
index 952d302..dc638fb 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -9,14 +9,12 @@
 						<image class="img" src="/static/logo.png" mode="widthFix"></image>
 					</view>
 					<view class="quick-menu">
-						<image class="icon" src="/static/me/logo_btn1.png" mode="aspectFit" @click="linkTo('/pages/share/index')"></image>
+						<image class="icon" src="/static/me/logo_btn1.png" mode="aspectFit" @click="linkTo('/pages/share/index', true)"></image>
 						<image class="icon" src="/static/me/logo_btn2.png" mode="aspectFit" @click="linkTo('/pages/me/message', true)"></image>
-						<navigator hover-class="none" url="/pages/me/contact">
-							<image class="icon" src="/static/me/logo_btn3.png" mode="aspectFit"></image>
-						</navigator>
+						<image class="icon" src="/static/me/logo_btn3.png" mode="aspectFit" @click="linkTo('/pages/me/contact', true)"></image>
 					</view>
 				</view>
-				<view class="top" @click="linkTo('/pages/me/userInfo')">
+				<view class="top" @click="linkTo(userInfo.phone?'/pages/me/userInfo':'/pages/login/login')">
 					<image class="avatar" :src="userInfo.avatar || '/static/default_avatar.png'" mode="aspectFill"></image>
 					<view class="info-wrap">
 						<view class="name">{{ userInfo.phone || '请登录' }}</view>
@@ -31,7 +29,7 @@
 						<view class="title">我的追剧</view>
 						<view class="num">{{ likeData.collectCount }}</view>
 					</navigator>
-					<view class="item" v-if="$common.isIosExamine()" @click="linkTo('/pages/me/withdraw/index')">
+					<view class="item" v-if="$common.isIosExamine()" @click="linkTo('/pages/me/withdraw/index', true)">
 						<view class="title">我的红包</view>
 						<view class="num">{{ amount || 0 }}</view>
 					</view>
@@ -43,16 +41,18 @@
 						<image class="icon" src="/static/me/gold_icon.png" mode="aspectFit"></image>
 						<view class="num">{{ gold }}</view>
 					</view>
-					<navigator hover-class="none" url="/pages/me/gold_record">
+					<div @click="linkTo('/pages/me/gold_record', true)">
 						<view class="btn">金币明细</view>
-					</navigator>
+					</div>
+				
 				</view>
-				<navigator class="title-wrap" hover-class="none" url="/pages/watching_history/watching_history?type=3">
+				<div class="title-wrap" @click="linkTo('/pages/watching_history/watching_history?type=3', true)">
 					<view class="a">
 						<view class="t">观看历史</view>
 						<up-icon name="arrow-right"></up-icon>
 					</view>
-				</navigator>
+				</div>
+			
 				<view class="history-list">
 					<view
 						class="item"
@@ -111,19 +111,21 @@
 
 <script setup>
 import { ref, reactive } from 'vue';
-import { onLoad, onShow, onPullDownRefresh } from '@dcloudio/uni-app';
+import { onLoad,onShow, onPullDownRefresh } from '@dcloudio/uni-app';
 import { selectByUserId, collectVideoSummary, selectUserMoney } from '@/api/me/me.js';
 import { linkTo } from '@/utils/app.js';
-import { useCommonStore } from '@/store/common.js';
-const $common = useCommonStore();
+import {
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
 const userInfo = ref({});
 
 // 获取最近的三条观看历史
 const recordThree = ref([]);
-onShow(() => {
+onShow(()=>{
 	// 判断ios是否审核
-	$common.init();
-});
+	$common.init()
+})
 async function selectByUserIdAjax() {
 	try {
 		const res = await selectByUserId({ page: 1, limit: 3, classify: 3 });
@@ -177,11 +179,14 @@ onPullDownRefresh(async () => {
 	}, 500);
 });
 
-onShow(() => {
-	selectByUserIdAjax();
-	collectVideoSummaryAjax();
-	selectUserMoneyAjax();
-	userInfo.value = uni.getStorageSync('userInfo');
+onLoad(() => {
+	if(uni.getStorageSync('token')){
+		selectByUserIdAjax();
+		collectVideoSummaryAjax();
+		selectUserMoneyAjax();
+		userInfo.value = uni.getStorageSync('userInfo');
+	}
+	
 });
 </script>
 
diff --git a/pages/me/setting.vue b/pages/me/setting.vue
index 123fa2c..de153b8 100644
--- a/pages/me/setting.vue
+++ b/pages/me/setting.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="list">
-			<view class="item" @click="linkTo('/pages/login/bind')">
+			<view class="item" @click="linkTo('/pages/login/bind',true)">
 				<view class="title">修改手机号</view>
 				<up-icon name="arrow-right" />
 			</view>
@@ -9,7 +9,7 @@
 				<view class="title">帮助中心</view>
 				<up-icon name="arrow-right" />
 			</view>
-			<view class="item" @click="linkTo('/pages/me/feedback')">
+			<view class="item" @click="linkTo('/pages/me/feedback',true)">
 				<view class="title">意见反馈</view>
 				<up-icon name="arrow-right" />
 			</view>
@@ -21,7 +21,7 @@
 				<view class="title">隐私协议</view>
 				<up-icon name="arrow-right" />
 			</view>
-			<view class="item" @click="logout">
+			<view class="item" @click="logout" v-if="token">
 				<view class="title">退出登录</view>
 				<up-icon name="arrow-right" />
 			</view>
@@ -36,6 +36,7 @@ import { linkTo } from '@/utils/app.js';
 import { onLoad } from '@dcloudio/uni-app';
 
 const version = ref('');
+const token = ref('');
 
 // 退出登录
 function logout() {
@@ -54,6 +55,7 @@ function logout() {
 }
 
 onLoad(() => {
+	token.value = uni.getStorageSync('token');
 	const systemInfo = uni.getSystemInfoSync();
 	//#ifdef APP-PLUS
 	version.value = systemInfo.appWgtVersion;