From 48f83a14cbdbb096b958aa6d52d7b33f7dd4bf9f Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 31 Dec 2024 13:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/contentlist.vue | 48 ++++++++++++++++++-
 pages/index/index.vue                  |  1 +
 pages/me/index.vue                     | 65 ++++++++++++++++++++------
 pages/task/index.vue                   |  2 +-
 4 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/pages/index/components/contentlist.vue b/pages/index/components/contentlist.vue
index 620bf08..dce6811 100644
--- a/pages/index/components/contentlist.vue
+++ b/pages/index/components/contentlist.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="df" style=" justify-content: space-around;flex-wrap: wrap; margin-top: 10rpx;">
 			<view style="border-radius:21rpx 21rpx 21rpx 21rpx;width: 33%;text-align: center;margin-top: 20rpx;padding:0 26rpx;"
-				class="liststyle" v-for="item in $props.list" :key="item">
+				class="liststyle" v-for="item in $props.list" :key="item" @tap="seVideo(item)">
 				<image :src="item.titleImg" style="width: 188rpx;height: 247rpx;border-radius:21rpx 21rpx 21rpx 21rpx"
 					mode=""></image>
 				<view style="font-weight: 400;font-size: 25rpx;color: #333333;text-align: left;">
@@ -17,6 +17,9 @@
 </template>
 
 <script>
+	import {
+		returnIsSafari
+	} from '@/utils/app.js'
 	export default {
 		props: {
 			list: {
@@ -30,7 +33,50 @@
 			}
 		},
 		methods: {
+			pageScrollTo(time = 100) {
+				uni.pageScrollTo({
+					scrollTop: this.scrollTop - 50,
+					duration: time,
+					complete() {
+			
+					}
+				})
+			},
+	//查看视频
+			seVideo(item) {
+				console.log(item,'dubyg2')
+				const time = 100;
+				// #ifdef H5
+				if (returnIsSafari()) {
+					this.pageScrollTo(time)
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item
+								.courseDetailsId +
+								'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+								.dyEpisodeId
+						})
+					}, time)
+				} else {
+					uni.navigateTo({
+						url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+							'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+							.dyEpisodeId
+					})
+				}
 
+				// #endif
+				// #ifndef H5
+				uni.navigateTo({
+					url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+						'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+						.dyEpisodeId
+				})
+				// #endif
+
+
+			},
+		
 		}
 	}
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f3c6346..567f20a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -649,6 +649,7 @@
 			},
 			//查看视频
 			seVideo(item) {
+				console.log(item,'dubyg2')
 				const time = 100;
 				// #ifdef H5
 				if (returnIsSafari()) {
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 37a9e44..69d5728 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -8,7 +8,7 @@
 				style="background-color: #f5f1f1;padding: 20rpx; display: flex;align-items: center;justify-content: space-between;"
 				class="">
 				<image src="../../static/logo.png" style="width: 170rpx;height: 51rpx;z-index: 999;" mode=""></image>
-			<!-- 	<view class="">
+				<!-- 	<view class="">
 					<image src="../../static/dwbimgs/one.png" style="width: 46rpx;height: 46rpx;z-index: 999;" mode="">
 					</image>
 					<image src="../../static/dwbimgs/two.png" style="width: 46rpx;height: 46rpx;z-index: 999;" mode="">
@@ -66,15 +66,14 @@
 						我的积分
 					</view>
 				</view> -->
-			<!-- 	<view v-if="isShowMoneyPay" class="statistics-box-item"
-					@click="goNav('/me/yaoqing/ymg-yaoqing-tixian')">
+				<view v-if="isiosExamine" class="statistics-box-item" @click="goNav('/me/yaoqing/ymg-yaoqing-tixian')">
 					<view class="statistics-box-item-btn">
 						我的红包
 					</view>
 					<view class="statistics-box-item-top">
 						{{userInfo.amount || '0.00'}}
 					</view>
-				</view> -->
+				</view>
 			</view>
 		</view>
 		<!-- <view v-if="isVips == '是' && isWxIosPay == true" class="vip flex align-center justify-center">
@@ -108,25 +107,25 @@
 						mode=""></image>
 					<view style="font-weight: bold;font-size: 36rpx;color: #FFFFFF;">
 						{{formatNumber(moneyNum)}}
-						元
 					</view>
 				</view>
-				<view
-				 @tap="goNav('/me/yaoqing/redPack-mingxi?moneyType=2&viewType=2')"
+				<view @tap="goNav('/me/yaoqing/redPack-mingxi?moneyType=2&viewType=2')"
 					style="font-weight: bold;font-size: 25rpx;color: #977641;width: 160rpx;text-align:center;line-height: 50rpx;background: linear-gradient( 90deg, #FEE7BC 0%, #FDCC89 100%);border-radius: 46rpx 46rpx 46rpx 46rpx;">
 					金币明细
 				</view>
-				<view style="position: absolute;background-color: #fff;width: 40rpx;height: 40rpx;transform: rotate(45deg);bottom: -10rpx;left: 48%;background-color: #f2b5b5;">
-					
+				<view
+					style="position: absolute;background-color: #fff;width: 40rpx;height: 40rpx;transform: rotate(45deg);bottom: -10rpx;left: 48%;background-color: #f2b5b5;">
+
 				</view>
 			</view>
 			<view style="margin-top: 40rpx;">观看历史</view>
 			<view class="df" style=" justify-content: space-between;margin-top: 28rpx;">
-				<view style="border-radius:21rpx 21rpx 21rpx 21rpx" v-for="item in list" :key="item">
+				<view style="border-radius:21rpx 21rpx 21rpx 21rpx" v-for="item in list" :key="item"
+					@tap="seVideo(item)">
 					<image :src="item.titleImg"
 						style="width: 188rpx;height: 247rpx;border-radius:21rpx 21rpx 21rpx 21rpx" mode=""></image>
 					<view style="font-weight: 400;font-size: 25rpx;color: #333333;">
-						{{item.title}}
+						{{item.title.substr(0,8)}}
 					</view>
 					<view style="font-weight: 400;font-size: 21rpx;color: #999999;">
 						看到{{item.courseDetailsName}}
@@ -305,7 +304,9 @@
 	import ttMsg from '../../components/ttMsg/ttMsg.vue'
 	import httpsRequest from '../../common/httpRequest.js'
 	import otherXuanfu from '@/components/other-xuafu.vue'
-
+	import {
+		returnIsSafari
+	} from '@/utils/app.js'
 
 	export default {
 		components: {
@@ -346,6 +347,7 @@
 				isWxIosPay: true, //微信下是否显示支付功能
 				userInfo: {},
 				isShowMoneyPay: true,
+				isiosExamine: false, // 我的金币审核
 			}
 		},
 		onLoad() {
@@ -426,6 +428,12 @@
 					const sysInfo = uni.getSystemInfoSync();
 					let isIos = sysInfo.platform === 'ios'
 					this.isShowMoneyPay = !(res.data.value === '1' && isIos)
+					if (res.data.value == 1) {
+						// debug
+						this.isiosExamine = true
+					}else{
+						this.isiosExamine = false
+					}
 				}
 			});
 		},
@@ -480,6 +488,38 @@
 				}
 
 			},
+			pageScrollTo(time = 100) {
+				uni.pageScrollTo({
+					scrollTop: this.scrollTop - 50,
+					duration: time,
+					complete() {
+
+					}
+				})
+			},
+			//查看视频
+			seVideo(item) {
+				const time = 100;
+				// #ifdef H5
+				if (returnIsSafari()) {
+					this.pageScrollTo(time)
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item
+								.courseDetailsId +
+								'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+								.dyEpisodeId
+						})
+					}, time)
+				} else {
+					uni.navigateTo({
+						url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+							'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+							.dyEpisodeId
+					})
+				}
+			},
+
 			//获取我喜欢的数量
 			getMyLoveNum() {
 				let data = {
@@ -519,7 +559,6 @@
 				}
 				this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
 					if (res.code === 0) {
-						console.log(res,'debug')
 						let arr = []
 						res.data.records.forEach((ele, index) => {
 							if (index < 3) {
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 52dfc34..b8f15db 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -67,7 +67,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/yaoqing/ymf-yaoqing-home'&&isShowMoneyPay)||item.buttonUrl!='/me/yaoqing/ymf-yaoqing-home'&&item.title!='观看视频奖励'">
+				v-if="(item.buttonUrl=='/me/yaoqing/ymf-yaoqing-home'&&isShowMoneyPay)||item.buttonUrl!='/me/yaoqing/ymf-yaoqing-home'">
 				<view class="cell_left flex">
 					<view class="cell_title flex">
 						<view class="u-font-28 text-bold title"