{{countPrice}}元解锁单集视频
@@ -369,6 +369,7 @@
getRedEnvelopeTips: '',
scale: 1,
paddingBottom: '0',
+ isShowMoneyPay: true,
};
},
computed: {
@@ -492,6 +493,13 @@
console.log('this bottom padding = ' + this.paddingBottom);
+ httpsRequest.getT("app/common/type/919", {}).then(res => {
+ if (res.code == 0) {
+ const sysInfo = uni.getSystemInfoSync();
+ let isIos = sysInfo.platform == 'ios'
+ this.isShowMoneyPay = !(res.data.value == '1' && isIos)
+ }
+ });
},
onLoad(e) {
let that = this
@@ -711,7 +719,10 @@
// #endif
// APP支付宝支付
httpsRequest.getT("/app/wuyou/payOrder/" + this.ordersId + '?payType=' + paytype, {}).then(ret => {
- plus.runtime.openURL(ret.data.h5Url)
+ // plus.runtime.openURL(ret.data.h5Url)
+ uni.navigateTo({
+ url: '/pages/pays/pays?ordersId=' + this.ordersId + '&url=' + ret.data.h5Url
+ });
// this.isCheckPay(ret.code, 'wxpay', JSON.stringify(ret.data));
});
} else if (this.openWay == 3) {
@@ -1051,7 +1062,7 @@
// const index = this.meunList.findIndex(menu => menu.courseDetailsId === item.courseDetailsId);
// this.videoList = [this.meunList[index]]
this.current = index
- if ( this.videoList[this.current].videoUrl == '' && this.videoList[this.current].price <= 0 && !type ) {
+ if (this.videoList[this.current].videoUrl == '' && this.videoList[this.current].price <= 0 && !type) {
this.getDataList(this.courseId, this.courseDetailsId, true, 'select')
return;
}
@@ -1399,8 +1410,8 @@
} else { //不能播放则需要购买
this.openPay()
}
- if ( t == 'select') {
- this.selectPlay(this.videoList[this.current],this.current,true)
+ if (t == 'select') {
+ this.selectPlay(this.videoList[this.current], this.current, true)
}
this.$forceUpdate();
//插入历史记录
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 701b09e..f8fd2fc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -185,8 +185,8 @@
-
+
@@ -209,6 +209,7 @@
import recommendVideo from '../../components/recommendVideo/recommendVideo.vue'
import activityComp from '../../components/activityComp/activityComp.vue'
import dragButton from "@/components/drag-button/drag-button.vue";
+ import httpsRequest from '../../common/httpRequest.js'
export default {
components: {
videoList,
@@ -260,6 +261,7 @@
isWeixin: false,
isIos: true,
scrollTop: 0,
+ isShowMoneyPay: true,
};
},
onShareAppMessage(res) {
@@ -279,7 +281,6 @@
}
},
onPageScroll(e) {
- console.log(e);
this.scrollTop = e.scrollTop
},
onLoad(options) {
@@ -293,6 +294,7 @@
// #endif
+ console.log(options, '22222222222222222')
if (uni.getStorageSync('qdCode')) {
this.qdCode = uni.getStorageSync('qdCode')
}
@@ -435,6 +437,14 @@
this.shodrag = false
this.videoInfo = []
}
+
+ httpsRequest.getT("app/common/type/919", {}).then(res => {
+ if (res.code == 0) {
+ const sysInfo = uni.getSystemInfoSync();
+ let isIos = sysInfo.platform == 'ios'
+ this.isShowMoneyPay = !(res.data.value == '1' && isIos)
+ }
+ });
},
onReachBottom() {
if (this.page < this.pages) {
diff --git a/pages/me/index.vue b/pages/me/index.vue
index f30158d..d074982 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -53,7 +53,7 @@
我的积分
-->
-
+
{{userInfo.amount || '0.00'}}
@@ -146,7 +146,7 @@
转盘抽奖
-->
-
@@ -184,7 +184,7 @@
观看历史
-
@@ -257,6 +257,7 @@
From 423276573189d215b76c4a762c17edd46639721d Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 19 Dec 2024 16:42:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/task/index.vue | 90 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 74 insertions(+), 16 deletions(-)
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 9fd713e..ac94de0 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -11,27 +11,32 @@
-
+
- 已连续签到 3 天
-
+ 已连续签到 {{signDays}} 天
+
-
-
+
+
+
+
- {{item.name}}
+ {{item.showText}}
- 连续签到7天即可享受惊喜大礼包
+ 连续签到7天即可获得7元奖励
-
- 点击签到
+
+ {{signInBtn}}
@@ -39,7 +44,9 @@
-
+
{{ item.title}}
@@ -72,6 +79,7 @@
},
list: [],
checked:false,
+ signDays: 0,
signInList: [
{ name: '第一天' },
{ name: '第二天' },
@@ -81,12 +89,50 @@
{ name: '第六天' },
{ name: '第七天' },
],
+ signInBtn: '点击签到',
+ isShowMoneyPay: true,
}
},
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.isShowMoneyPay = !(res.data.value == '1' && isIos)
+ }
+ });
},
methods: {
+ getsignIn() {
+ this.$Request.getT('app/userSignRecord/getUserSignData', {}).then(res => {
+ if (res.code == 0 ) {
+ this.signInList = res.data.recordList
+ this.signDays = res.data.signDays
+ this.signInList.map((item,index)=>{
+ if (item.showText == '待签到'&&index>0) {
+ this.signInBtn = this.signInList[index-1].status == 0 ? '重新签到' : '点击签到'
+ }
+ let someDate = new Date(item.signDay); // 假设这是需要判断的日期
+ if (item.signDay && this.isToday(someDate)) {
+ this.signInBtn = '已签到'
+ }
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ }
+ })
+ },
+ isToday (date) {
+ const today = new Date();
+ return date.getDate() === today.getDate() // 比较日期
+ && date.getMonth() === today.getMonth() // 比较月份
+ && date.getFullYear() === today.getFullYear(); // 比较年份
+ },
/**
* 跳转
* @param {Object} item
@@ -123,16 +169,16 @@
this.$Request.getT('app/taskCenter/taskReceive', data).then(res => {
if (res.code == 0 ) {
uni.showToast({
- title: '领取成功',
+ title: id==15?'签到成功':'领取成功',
icon: 'none'
})
setTimeout(()=>{
this.getTaskdata()
+ this.getsignIn()
},1000)
} else {
- uni.showToast({
- title: res.msg,
- icon: 'none'
+ uni.switchTab({
+ url: "/pages/index/index"
})
}
})
@@ -312,8 +358,20 @@
margin-top: 24rpx;
}
}
+ .signIn-Item.active{
+ .radius{
+ background-color: #EA9EA8;
+
+ }
+ }
+ }
+ .tishi{
+ width: 100%;
+ text-align: center;
+ font-weight: 400;
+ font-size: 20rpx;
+ color: #7F7F7F;
}
-
.signInBtn{
width: 355rpx;
height: 64rpx;
From 86af5ab3a9e3dc653a40bed3d91125fb51c8c661 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 19 Dec 2024 16:46:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B7=B2=E7=AD=BE?=
=?UTF-8?q?=E5=88=B0=E4=BA=8B=E4=BB=B6=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/task/index.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pages/task/index.vue b/pages/task/index.vue
index ac94de0..9e040bf 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -35,7 +35,11 @@
连续签到7天即可获得7元奖励
-
+
+ {{signInBtn}}
+
+
+
{{signInBtn}}