From 5280de71c01d1424f9b050f52c21c4f8c7db5b72 Mon Sep 17 00:00:00 2001
From: wwz <114797966@qq.com>
Date: Mon, 23 Dec 2024 15:52:12 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=BF=80=E5=8A=B1=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 12 +-
pages/task/index.vue | 336 ++++++++++++++++++++++++++++---------------
2 files changed, 224 insertions(+), 124 deletions(-)
diff --git a/manifest.json b/manifest.json
index 2f0fa3a..6a8626a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -27,8 +27,7 @@
"VideoPlayer" : {},
"Camera" : {},
"Record" : {},
- "OAuth" : {},
- "Push" : {}
+ "OAuth" : {}
},
/* 应用发布信息 */
"distribute" : {
@@ -85,14 +84,15 @@
},
"oauth" : {
"apple" : {},
- "univerify" : {},
"weixin" : {
"appid" : "wxeaffcaea958472d3",
- "appsecret" : "32f6f3ce599abff2fa0191a36780c66c",
"UniversalLinks" : "https://maxiong.xianmxkj.com/"
- }
+ },
+ "univerify" : {}
+ },
+ "ad" : {
+ "gdt" : {}
},
- "ad" : {},
"push" : {
"unipush" : {}
}
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 0bf1a24..88fdd11 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -3,79 +3,96 @@
-
+
任务大厅
-
+
新人好礼送不停
-
+
已连续签到 {{signDays}} 天
-
-
-
-
-
-
- {{item.showText}}
+
+
+
+
+
+ {{item.showText}}
-
+
连续签到7天即可获得7元奖励
-
+
{{signInBtn}}
-
+
-
+
-
+
- {{ item.title}}
+ {{ item.title}}
{{ item.rewardDetail }}
{{ item.detail }}
- {{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
- {{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
+
+ {{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
+
+
+ {{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
+
-
+
+
+
+ {{error}}
+
+
+
-
+
\ No newline at end of file
From 33e462c64f834f02d2c26c0d473da91889d00abb Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 24 Dec 2024 09:53:00 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ios=E5=88=A4=E6=96=AD?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/task/index.vue | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pages/task/index.vue b/pages/task/index.vue
index b06c054..07b25af 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -1,11 +1,11 @@
-
-
+
+
任务大厅
@@ -96,15 +96,18 @@
],
signInBtn: '点击签到',
isShowMoneyPay: true,
+ isIos: false,
}
},
onShow() {
+
this.getTaskdata()
this.getsignIn()
this.$Request.getT("app/common/type/919", {}).then(res => {
if (res.code == 0) {
const sysInfo = uni.getSystemInfoSync();
let isIos = sysInfo.platform == 'ios'
+ this.isIos = /iOS/.test(systemInfo.platform);
this.isShowMoneyPay = !(res.data.value == '1' && isIos)
}
});
From 0661a4d616821d57665ae9ea95916edac081a67f Mon Sep 17 00:00:00 2001
From: wwz <114797966@qq.com>
Date: Tue, 24 Dec 2024 11:15:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/task/index.vue | 63 ++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 37 deletions(-)
diff --git a/pages/task/index.vue b/pages/task/index.vue
index c920a9d..7786fd3 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -24,7 +24,7 @@
打卡提醒
-->
-
+
连续签到7天即可获得7元奖励
-
+
-
+
@@ -73,18 +73,18 @@
{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
- {{ item.buttonUnderContent}}
+
+ {{ item.buttonUnderContent}}
+
-
-
-
- {{error}}
-
-
-
+
+
+ {{error}}
+
@@ -140,7 +140,7 @@
}
});
},
- onReady() {
+ async onReady() {
this.isLoading = true;
// 首次加载广告
setTimeout(() => {
@@ -158,16 +158,17 @@
this.isLoading = false;
console.log('广告数据加载成功');
},
- onadclose(e) {
+ async onadclose(e) {
const detail = e.detail
// 用户点击了【关闭广告】按钮
console.log(e.detail)
if (detail && detail.isEnded) {
// 正常播放结束
- console.log("onClose " + detail.isEnded);
+ // /sqx_fast/app/ad/state
+ let res = this.$Request.getT('app/ad/state')
+ console.log(res)
} else {
// 播放中途退出
- console.log("onClose " + detail.isEnded);
}
//this.isLoading = true;
//this.$refs.adRewardedVideo.load();
@@ -216,24 +217,24 @@
// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
// buttonUrl
console.log(item)
- if ( item.jumpType == 0) {
- if ( item.buttonTitle.indexOf("领取") != -1) {
+ if (item.jumpType == 0) {
+ if (item.buttonTitle.indexOf("领取") != -1) {
this.taskReceive(item.id)
} else {
uni.switchTab({
url: "/pages/index/index"
})
}
- } else if ( item.jumpType == 1) {
- let source,buttonUrl;
+ } 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
+ buttonUrl = item.buttonUrl + '?source=' + source
}
- if ( item.title && item.title.indexOf('每月') != -1 ) {
+ if (item.title && item.title.indexOf('每月') != -1) {
source = 3
- buttonUrl = item.buttonUrl+'?source='+source
+ buttonUrl = item.buttonUrl + '?source=' + source
}
console.log(buttonUrl)
uni.navigateTo({
@@ -302,17 +303,10 @@