diff --git a/common/httpRequest.js b/common/httpRequest.js
index 83d8842..06baa2f 100644
--- a/common/httpRequest.js
+++ b/common/httpRequest.js
@@ -26,6 +26,17 @@ module.exports = {
},
logout: function() {
let that = this;
+ // 获取当前页面实例
+ const pages = getCurrentPages();
+ // 获取当前页面的实例
+ const currentPage = pages[pages.length - 1];
+ // 获取页面路径
+ const pagePath = currentPage.route
+ const systemInfo = uni.getSystemInfoSync();
+ const isIOS = /iOS/.test(systemInfo.platform);
+ if ( pagePath == "pages/task/index") {
+ return;
+ }
uni.removeStorageSync("token")
uni.removeStorageSync("userId")
uni.removeStorageSync("phone")
diff --git a/me/choujiang/choujiang.vue b/me/choujiang/choujiang.vue
index 892ef20..4abb330 100644
--- a/me/choujiang/choujiang.vue
+++ b/me/choujiang/choujiang.vue
@@ -177,8 +177,9 @@
},
toGift() {
console.log('1');
+
uni.navigateTo({
- url: '/me/gift/gift'
+ url: '/me/gift/gift?source='+this.source
})
},
// 重新生成
diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index 58a3cdf..2f79759 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -520,7 +520,6 @@
this.wHeight = sysInfo.screenHeight
this.boxStyle.height = this.wHeight + 5;
// 记录跳转过来的视频总id跟单集id
- console.log(e)
if (e.id) {
this.courseId = e.id;
if (e.courseDetailsId && e.courseDetailsId != 'null') {
@@ -595,6 +594,7 @@
},
appear(e, index) {
+ this.courseDetailsId = e;
// 清除已经设置的定时器
clearTimeout(this.appearTimeout);
@@ -1056,6 +1056,12 @@
// this.payOrder(res.data.orders.ordersId, res.data.orders.payMoney)
} else {
+ if ( res.status && res.status == 1) {
+ this.showPay = false //关闭购买选择弹窗
+ this.getDataList(this.courseId, this.videoList[this.current].courseDetailsId,
+ true);
+ return;
+ }
uni.showToast({
title: res.msg,
icon: 'none'
diff --git a/me/detail/detail.vue b/me/detail/detail.vue
index a671191..d90f1aa 100644
--- a/me/detail/detail.vue
+++ b/me/detail/detail.vue
@@ -1322,6 +1322,12 @@
}
} else {
+ if ( res.status && res.status == 1) {
+ this.showPay = false //关闭购买选择弹窗
+ this.getDataList(this.courseId, this.videoList[this.current].courseDetailsId,
+ true);
+ return;
+ }
uni.showToast({
title: res.msg,
icon: 'none'
diff --git a/me/gift/duihuan.vue b/me/gift/duihuan.vue
index 90a7bb3..42b2bc7 100644
--- a/me/gift/duihuan.vue
+++ b/me/gift/duihuan.vue
@@ -2,11 +2,20 @@
- 兑换账号
+ 中奖用户手机号
+
+
+
+ 收货地址
+
+
+
+ 备注
-
+
+
兑换事项
@@ -15,7 +24,7 @@
- 确认兑换
+ 确认兑换
@@ -24,11 +33,44 @@
export default {
data() {
return {
-
+ query: {
+ discSpinningRecordId: null,
+ source: 1,
+ phone: "",
+ address: "",
+ remark: "",
+ },
}
},
+ onLoad(options) {
+ console.log(options)
+ if ( options.id ) {
+ this.query.discSpinningRecordId = options.id
+ }
+ if ( options.source ) {
+ this.query.source = options.source
+ }
+
+ },
methods: {
-
+ exchange(){
+ let url = ""
+ if ( !this.query.phone ) {
+ uni.showToast({ title: '请输入中奖用户手机号', icon: 'none' });
+ return;
+ }
+ if ( !this.query.address ) {
+ uni.showToast({ title: '请输入中奖用户地址', icon: 'none' });
+ return;
+ }
+ this.$Request.postJson("app/userPrizeExchange/exchange", this.query).then(res => {
+ if (res.code == 0 ) {
+ uni.navigateBack()
+ } else {
+ uni.showToast({ title: res.msg, icon: 'none' });
+ }
+ })
+ },
}
}
diff --git a/me/gift/gift.vue b/me/gift/gift.vue
index bec9f94..74797b9 100644
--- a/me/gift/gift.vue
+++ b/me/gift/gift.vue
@@ -4,6 +4,13 @@
+
+ {{item.label}}
+
中奖时间 2024-09-11 10:20:11
@@ -15,13 +22,13 @@
- 立即兑换
+ 立即兑换
-
+
@@ -270,6 +270,7 @@
data() {
return {
title: '',
+ isBack: false,
background: {
backgroundImage: 'linear-gradient(to right, #FFE5EA 0%, #E4F5FB 49%, #FFF0EE 100%)'
},
@@ -306,6 +307,11 @@
},
onShow() {
+ const systemInfo = uni.getSystemInfoSync();
+ const isIOS = /iOS/.test(systemInfo.platform);
+ if ( !isIOS ) {
+ this.isBack = true
+ }
this.isWxIosPay = uni.getStorageSync('isWxIosPay')
this.kmPaySel = this.$queue.getData('kmPaySel');
this.numCount = uni.getStorageSync('numCount')
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 88fdd11..c920a9d 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -24,7 +24,7 @@
打卡提醒
-->
-
+
连续签到7天即可获得7元奖励
-
-
+
+
+
@@ -73,7 +73,7 @@
{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
-
+ {{ item.buttonUnderContent}}
@@ -192,10 +192,10 @@
}
})
} else {
- uni.showToast({
- title: res.msg,
- icon: 'none'
- })
+ // uni.showToast({
+ // title: res.msg,
+ // icon: 'none'
+ // })
}
})
},
@@ -215,18 +215,29 @@
// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
// buttonUrl
-
- if (item.jumpType == 0) {
- if (item.buttonTitle == '去领取') {
+ console.log(item)
+ 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) {
+ } else if ( item.jumpType == 1) {
+ let source,buttonUrl;
+ buttonUrl = item.buttonUrl
+ if ( item.title && item.title.indexOf('每周') != -1 ) {
+ source = 2
+ buttonUrl = item.buttonUrl+'?source='+source
+ }
+ if ( item.title && item.title.indexOf('每月') != -1 ) {
+ source = 3
+ buttonUrl = item.buttonUrl+'?source='+source
+ }
+ console.log(buttonUrl)
uni.navigateTo({
- url: item.buttonUrl
+ url: buttonUrl
})
} else if (item.jumpType == 3) {
uni.switchTab({
@@ -291,10 +302,17 @@