From 903c584ac7f97089e32aff700d23907d5800f3f9 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 24 Dec 2024 10:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue |  7 +++++--
 pages/task/index.vue  | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index d80ff35..90764ed 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,7 +7,7 @@
 			<u-navbar :background="background" height="60" :is-back="false" :title="title" :border-bottom="false">
 			<!-- #endif -->
 				<!-- #ifndef H5 -->
-				<u-navbar height="60" :background="background" :is-back="false" :title="title" :border-bottom="false">
+				<u-navbar height="60" :background="background" :is-back="true" :title="title" :border-bottom="false">
 				<!-- #endif -->
 					<!-- #ifdef MP-TOUTIAO -->
 					<view :style="{marginTop:barHeight/2+'px'}" class="nvavBar flex" style="padding-left: 80rpx;">
@@ -220,7 +220,7 @@
 		},
 		data() {
 			return {
-				showSearch: false,
+				showSearch: true,
 				showzls: true,
 				shodrags: true,
 				shodrag: false, //是否显示拖拽悬浮
@@ -262,6 +262,8 @@
 				isIos: true,
 				scrollTop: 0,
 				isShowMoneyPay: true,
+				isIos: true,
+				isIosApp: false,
 			};
 		},
 		onShareAppMessage(res) {
@@ -442,6 +444,7 @@
 				if (res.code == 0) {
 					const sysInfo = uni.getSystemInfoSync();
 					let isIos = sysInfo.platform == 'ios'
+					this.isIosApp = isIos
 					this.isShowMoneyPay = !(res.data.value == '1' && isIos)
 				}
 			});
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 6023854..0dd9737 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -8,7 +8,7 @@
 		<view class="navTitle">
 			<view></view>
 			<view class="title">任务大厅</view>
-			<image @click="goNav({jumpType:1,buttonUrl:'/pages/me/index'})" class="navTitleIcon" src="../../static/images/my.png" ></image>
+			<image @click="goNav({jumpType:1,buttonUrl:'/pages/iSiAnfghCC/abKTySghjA'})" class="navTitleIcon" src="../../static/images/my.png" ></image>
 		</view>
 		<view class="icon u-relative padding">
 			<image class="task_icon1 u-relative" src="../../static/images/me/task_icon1.png"></image>
@@ -30,9 +30,9 @@
 					:class="{active: item.showText == '待签到'||item.showText == '未签到'||item.showText == '已签到'}" 
 					v-for="(item,index) in signInList" :key="index"
 					>
-					<image class="signIn_icon" v-if="item.showText == '未签到'" src="../../static/images/signIn_icon2.png" mode="">
-					<image class="signIn_icon" v-if="item.showText == '已签到'" src="../../static/images/signIn_icon3.png" mode="">
-					<image class="signIn_icon" v-if="item.showText != '未签到'&&item.showText != '已签到'" src="../../static/images/signIn_icon1.png" mode="">
+					<image class="signIn_icon" v-if="item.showText == '未签到'" src="../../static/images/signIn_icon2.png" mode="" />
+					<image class="signIn_icon" v-if="item.showText == '已签到'" src="../../static/images/signIn_icon3.png" mode="" />
+					<image class="signIn_icon" v-if="item.showText != '未签到'&&item.showText != '已签到'" src="../../static/images/signIn_icon1.png" mode="" />
 					<view class="radius"></view>
 					<view class="_label">{{item.showText}}</view>
 				</view>
@@ -50,7 +50,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'"
+				v-if="(item.buttonUrl=='/me/yaoqing/ymf-yaoqing-home'&&isShowMoneyPay)||item.buttonUrl!='/me/yaoqing/ymf-yaoqing-home'&&item.title!='观看视频奖励'"
 				>
 				<view class="cell_left flex">
 					<view class="cell_title flex">
@@ -146,18 +146,30 @@
 				// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
 				// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
 				// buttonUrl
+				let source,buttonUrl;
+				buttonUrl = item.buttonUrl
+
 				console.log(item)
+				if ( item.buttonUrl == '/me/invite/index') {
+					buttonUrl = "/me/yaoqing/ymf-yaoqing-home"
+				}
+				if ( item.buttonUrl == '/me/invite/zhifubao') {
+					buttonUrl = "/me/yaoqing/zhifubao-tixain"
+				}
+				if ( item.buttonUrl == '/me/choujiang/choujiang') {
+					buttonUrl = "/me/VjgyqAzklr/VjgyqAzklr"
+				}
 				if ( item.jumpType == 0) {
+					console.log("============", item.buttonTitle);
 					if ( item.buttonTitle.indexOf("领取") != -1) {
 						this.taskReceive(item.id)
 					} else {
-						uni.switchTab({
-							url: "/pages/index/index"
+						uni.navigateTo({
+							url:'/pages/index/index'
 						})
 					}
 				} else if ( item.jumpType == 1) {
-					let source,buttonUrl;
-					buttonUrl = item.buttonUrl
+					console.log("--------------");
 					if ( item.title && item.title.indexOf('每周') != -1 ) {
 						source = 2
 						buttonUrl = item.buttonUrl+'?source='+source
@@ -171,11 +183,11 @@
 						url: buttonUrl
 					})
 				} else if( item.jumpType == 3) {
-					uni.switchTab({
-						url: item.buttonUrl
+					uni.navigateTo({
+						url:'/pages/index/index'
 					})
 				} else if( item.jumpType == 2) {
-					plus.runtime.openURL(item.buttonUrl)
+					plus.runtime.openURL(buttonUrl)
 				}
 				
 			},
@@ -198,8 +210,8 @@
 							this.getsignIn()
 						},1000)
 					} else {
-						uni.switchTab({
-							url: "/pages/index/index"
+						uni.navigateTo({
+							url:'/pages/index/index'
 						})
 					}
 				})