diff --git a/manifest.json b/manifest.json index 70102ff..24025ec 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "斯耀短剧", "appid" : "__UNI__E0B05B1", "description" : "", - "versionName" : "1.0.8", - "versionCode" : 108, + "versionName" : "1.0.9", + "versionCode" : 109, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/me/choujiang/choujiang.vue b/me/choujiang/choujiang.vue index a4691ef..2d5e9cb 100644 --- a/me/choujiang/choujiang.vue +++ b/me/choujiang/choujiang.vue @@ -477,12 +477,16 @@ if (name.type ==1) { tipContent = '很遗憾，没有中奖，请再接再厉！' + uni.showToast({ + title: tipContent, + icon: "none" + }) } else { tipContent = `恭喜您，获得 ${name}${this.result.type==2?(this.result.number+'元'):''} ！` + this.showLingPop({...this.result}) } const _this=this; console.log(this.result); - this.showLingPop({...this.result}) this.result='' this.prizeing = false return diff --git a/me/gift/duihuan.vue b/me/gift/duihuan.vue index 0e3b625..35a466e 100644 --- a/me/gift/duihuan.vue +++ b/me/gift/duihuan.vue @@ -34,7 +34,8 @@ data() { return { query: { - discSpinningRecordId: null, + foreignId: null, + foreignType: 'spinning', phone: "", address: "", remark: "", @@ -44,9 +45,11 @@ onLoad(options) { console.log(options) if ( options.id ) { - this.query.discSpinningRecordId = options.id + this.query.foreignId = options.id + } + if ( options.foreignType ) { + this.query.foreignType = options.foreignType } - }, methods: { diff --git a/me/invite/cashDetail.vue b/me/invite/cashDetail.vue index 4f04ce3..333c92c 100644 --- a/me/invite/cashDetail.vue +++ b/me/invite/cashDetail.vue @@ -184,7 +184,6 @@ export default { getMoneyDetail() { let that = this; let token = uni.getStorageSync('token') - console.log(1); if (token) { //可以提现金额查询预估收入查询 let data = { diff --git a/me/invite/moneyList.vue b/me/invite/moneyList.vue index 1a51722..a4968b5 100644 --- a/me/invite/moneyList.vue +++ b/me/invite/moneyList.vue @@ -41,11 +41,10 @@ } }, onLoad: function(e) { - console.log(e) if (e.moneyType) { this.moneyType = e.moneyType uni.setNavigationBarTitle({ - title: e.moneyType === 1 ? '红包明细' : '金币明细' + title: e.moneyType == 1 ? '红包明细' : '金币明细' }); } if (e.viewType) { diff --git a/pages.json b/pages.json index 5586565..c67f232 100644 --- a/pages.json +++ b/pages.json @@ -22,13 +22,21 @@ } }, { - "path": "pages/task/prizeList", + "path": "pages/task/stayTuned", "style": { "navigationBarTitleText": "任务", "navigationStyle": "custom" } }, + { + "path": "pages/task/prizeList", + "style": { + "navigationBarTitleText": "任务", + "navigationStyle": "custom" + + } + }, { "path": "pages/task/receiveMember", "style": { diff --git a/pages/me/index.vue b/pages/me/index.vue index 001b268..017bdd1 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -583,8 +583,8 @@ // #endif } }, - goNav(e, type) { - console.log(e) + + goNav(e,type) { let token = uni.getStorageSync('token') if (token) { if (type === 'tabbar') { diff --git a/pages/task/index.vue b/pages/task/index.vue index ec907c8..97c41a8 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -17,14 +17,22 @@ 新人好礼送不停 - - + + 已连续签到 {{signDays}} 天 + + + + 签到中断后需重新签到 + + + + @@ -39,6 +47,7 @@ src="../../static/images/signIn_icon1.png" mode="" /> {{item.showText}} + {{item.signDay.slice(6,10)}} @@ -50,11 +59,10 @@ --> - + - + v-if="item.show"> + @click="goNav({id: item.id,buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title, disabled: item.disabled, discNumber: item.discNumber})"> {{ item.buttonUnderContent}} @@ -101,37 +109,22 @@ list: [], checked: false, signDays: 0, - signInList: [{ - name: '第一天' - }, - { - name: '第二天' - }, - { - name: '第三天' - }, - { - name: '第四天' - }, - { - name: '第五天' - }, - { - name: '第六天' - }, - { - name: '第七天' - }, + enable: 0, + signInList: [], + recordList: [ ], signInBtn: '点击签到', isShowMoneyPay: true, isIos: false, - isAndroid: true, + isAndroid: false, adRewardedVideo: true, urlCallback: null, + isTooltipVisible: false, + tooltipTimeout: null, } }, onShow() { + this.signInList = [] this.adRewardedVideo = true; this.getTaskdata() this.getsignIn() @@ -141,9 +134,7 @@ let isIos = sysInfo.platform == 'ios' this.isIos = /iOS/.test(sysInfo.platform); // 判断是否是安卓设备 - // #ifdef APP - this.isAndroid = sysInfo.platform === 'android' - // #endif + this.isShowMoneyPay = !(res.data.value == '1' && isIos) } @@ -153,9 +144,28 @@ }, methods: { + /** + * 签到提示出发 + */ + showTooltip() { + clearTimeout(this.tooltipTimeout); + this.isTooltipVisible = !this.isTooltipVisible; + this.tooltipTimeout = setTimeout(() => { + this.isTooltipVisible = false; + }, 1000); // 1000毫秒后隐藏tooltip + }, + + /** + * 广告数据加载成功回调 + * @param {Object} e + */ onadload(e) { console.log('广告数据加载成功'); }, + /** + * 广告播放成功回调 + * @param {Object} e + */ async onadclose(e) { const detail = e.detail if (detail && detail.isEnded) { @@ -177,6 +187,10 @@ // 播放中途退出 } }, + /** + * 广告加载失败回调 + * @param {Object} e + */ onaderror(e) { // 广告加载失败 this.adRewardedVideo = false; console.log("广告加载失败") @@ -189,6 +203,7 @@ if (res.code == 0) { this.signInList = res.data.recordList this.signDays = res.data.signDays + this.enable = res.data.enable this.signInList.map((item, index) => { if (item.showText == '待签到' && index > 0) { this.signInBtn = this.signInList[index - 1].status == 0 ? '重新签到' : '点击签到' @@ -247,14 +262,17 @@ } 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 } - if (item.title && item.title.indexOf('每月') != -1) { + if (item.title && item.title.indexOf('每月打卡奖励1') != -1) { source = 3 buttonUrl = item.buttonUrl + '?source=' + source } + if (item.title && item.title.indexOf('每月打卡奖励2') != -1) { + buttonUrl = `${item.buttonUrl}?standard=${item.discNumber==null?true:false}&taskId=${item.id}` + } console.log(buttonUrl) uni.navigateTo({ url: buttonUrl @@ -298,10 +316,21 @@ * 获取任务列表 */ getTaskdata() { - + this.list= []; this.$Request.getT('app/taskCenter/selectTaskCenter', {}).then(res => { if (res.code == 0) { this.list = res.data + this.list.map(item=>{ + item.show = true + }) + // #ifdef H5 + this.list.map(item=>{ + if(item.title.indexOf("观看视频") != -1) { + item.show = false + } + }) + // #endif + } uni.stopPullDownRefresh(); }) @@ -320,10 +349,59 @@ \ No newline at end of file diff --git a/static/images/signIn_icon2.png b/static/images/signIn_icon2.png index 39a255a..1275689 100644 Binary files a/static/images/signIn_icon2.png and b/static/images/signIn_icon2.png differ diff --git a/static/images/task/receive1.png b/static/images/task/receive1.png new file mode 100644 index 0000000..888d1f4 Binary files /dev/null and b/static/images/task/receive1.png differ diff --git a/static/images/task/receive2.png b/static/images/task/receive2.png new file mode 100644 index 0000000..e152e87 Binary files /dev/null and b/static/images/task/receive2.png differ