diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 74c3eab..11c0bb3 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -18,7 +18,7 @@ "type" : "uniCloud" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" }, { diff --git a/common/config.js b/common/config.js index 191473b..455b8c5 100644 --- a/common/config.js +++ b/common/config.js @@ -1,6 +1,6 @@ -const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg"; // -const ROOTPATH = "https://dj-api.hnsiyao.cn/czg"; //后台服务域名 -const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg"; // +// const ROOTPATH = "https://dj-api.hnsiyao.cn/czg"; //后台服务域名 +// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 // const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // // const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 @@ -10,12 +10,12 @@ const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 // const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名 // const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名 -// const ROOTPATH1 = "http://192.168.1.41:8100/czg"; // -// const ROOTPATH = "http://192.168.1.41:8100/czg"; //后台服务域名 +const ROOTPATH1 = "http://192.168.1.41:8100/czg"; // +const ROOTPATH = "http://192.168.1.41:8100/czg"; //后台服务域名 // 测试 // const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg"; // // const ROOTPATH = "https://web-api.hnsiyao.cn/czg"; //后台服务域名 -// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 +const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 module.exports = { diff --git a/me/yaoqing/ymg-yaoqing-tixian.vue b/me/yaoqing/ymg-yaoqing-tixian.vue index 186898a..fa16b6b 100644 --- a/me/yaoqing/ymg-yaoqing-tixian.vue +++ b/me/yaoqing/ymg-yaoqing-tixian.vue @@ -1,30 +1,24 @@ @@ -115,21 +123,21 @@ export default { tixianList: [{ money: '10' }, - { - money: '20' - }, - { - money: '50' - }, - { - money: '100' - }, - { - money: '200' - }, - { - money: '500' - } + { + money: '20' + }, + { + money: '50' + }, + { + money: '100' + }, + { + money: '200' + }, + { + money: '500' + } ], value: 0, min: '', @@ -141,6 +149,27 @@ export default { page: 1, limit: 10, totalCount: 0, + isWithdraw: false, + urlCallback: null, + adRewardedVideo: true, + ruleShow: true, + ruleInfo: ` + 用户在平台中对奖励提现的，适用以下规则： +
+
+ 1，用户的收益达到最低提现金额要求后，可以申请提现。每日发起前10笔提现为自动到账，超出则需第二个工作日后到账。 +
+ 2，用户需要通过支付宝提现，需按照要求绑定支付宝账号并填写提现金额或其他提现所需信息，请确保提供的信息准确无误，以免提现失败。 +
+ 3，如果用户发现显示「提现失败」，需确认当前填写或绑定的支付宝账号或银行卡账号是否正确，以及支付宝账号是否可用。如果用户发现显示「提现成功」但没到账 +
+ (1)如果用户有多个支付宝账号，请检查用户是否提现到了其他支付宝账号。 +
+ (2)高峰期提现人数多会导致网络拥堵，显示提现成功之后72小时内属于正常现象，请耐心等候。 +
+ 4，每日23:00至次日11:00为系统维护时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。 +
+ `, }; }, onLoad() { @@ -153,6 +182,7 @@ export default { this.aliZhiFuBao = uni.getStorageSync('zhiFuBao') this.aliZhiFuBaoName = uni.getStorageSync('zhiFuBaoName') this.ymfgetcashMoney() + this.getCanCash() }, onReachBottom: function () { @@ -170,6 +200,61 @@ export default { // this.list(); }, methods: { + onNavigationBarButtonTap() { + this.showRule() + }, + showRule() { + this.ruleShow = true + }, + /** + * 广告播放成功回调 + * @param {Object} e + */ + async onadclose(e) { + const detail = e.detail + if (detail && detail.isEnded) { + // 正常播放结束 + let res = await this.$Request.getT('app/ad/state', { + extraKey: this.urlCallback.extra + }) + this.getCanCash() + } else { + // 播放中途退出 + } + }, + /** + * 广告加载失败回调 + * @param {Object} e + */ + onaderror(e) { + if (this.adRewardedVideoloadNum >= 3) { + this.adRewardedVideo = false; + return + } + this.adRewardedVideoloadNum++ + setTimeout(() => { + this.$refs.adRewardedVideo.load(); + }, 1000); // 10 + console.log("广告加载失败") + }, + /** + * 广告数据加载成功回调 + * @param {Object} e + */ + onadload(e) { + this.adRewardedVideo = true; + console.log('广告数据加载成功'); + }, + + getCanCash() { + this.$Request.getT('/app/cash/canCash').then(res => { + if (res.code == 0) { + this.isWithdraw = res.data; + } else { + this.isWithdraw = false; + } + }) + }, ymfmoneyInput(e) { let num = e.detail.value.match(/^\d*(\.?\d{0,2})/g)[0] || null; this.$nextTick(() => { @@ -287,6 +372,16 @@ export default { setTimeout(function () { that.ymfgetcashMoney() }, 1500) + } else if (res.code == 9991) { + uni.showToast({ + title: res.msg, + icon: 'none' + }) + setTimeout(function () { + uni.navigateTo({ + url: '/me/yaoqing/zhifubao-tixain' + }); + }, 1500) } else { uni.showToast({ @@ -301,7 +396,22 @@ export default { ymfcheckMobile(money) { return RegExp(/^1[34578]\d{9}$/).test(money); }, + withdraw() { + if (!this.isWithdraw) { + this.urlCallback = { + userId: this.userId, + extra: 'cash:' + this.userId + "" + new Date().getTime(), + } + + this.$refs.adRewardedVideo.show(); + } else { + this.ymfgetOut() + } + + }, ymfgetOut() { + + let that = this; let token = that.token let userId = that.userId @@ -326,7 +436,7 @@ export default { uni.showModal({ title: "提现申请提示", content: '请仔细确认收款人信息\n\n收款人姓名:' + that.aliZhiFuBaoName + '\n\n提现金额:' + that - .money + '元\n\n收款人账号：' + that.aliZhiFuBao + '', + .money + '元\n\n收款人账号：' + that.aliZhiFuBao + '', // content: '请仔细确认收款人信息\n\n收款人姓名:' + that.aliZhiFuBaoName + '\n\n提现金额:' + that // .money + '元\n\n提现手续费：' + shouxufei + // '\n\n收款人账号：' + that.aliZhiFuBao + '', @@ -342,8 +452,8 @@ export default { uni.showModal({ title: "提现申请提示", content: '请仔细确认收款人信息\n\n收款人姓名:' + that.aliZhiFuBaoName + '\n\n提现金额:' + that - .money + '元\n\n收款人账号：' + that.aliZhiFuBao + - '', + .money + '元\n\n收款人账号：' + that.aliZhiFuBao + + '', success: (e) => { if (e.confirm) { // that.money = money @@ -367,8 +477,8 @@ export default { }); } } else { - console.log(that.aliZhiFuBao,that.aliZhiFuBaoName,'tixian'); - this.ymfgoaliZhiFuBao() + console.log(that.aliZhiFuBao, that.aliZhiFuBaoName, 'tixian'); + this.ymfgoaliZhiFuBao() } } else { uni.navigateTo({ @@ -389,7 +499,7 @@ export default { uni.showModal({ title: '提现申请提示', content: '请仔细确认收款人信息\n\n收款人姓名:' + that.aliZhiFuBaoName + '\n\n提现金额:' + money + - '元\n\n收款人账号：' + that.aliZhiFuBao + '', + '元\n\n收款人账号：' + that.aliZhiFuBao + '', // content: '请仔细确认收款人信息\n\n收款人姓名:' + that.aliZhiFuBaoName + '\n\n提现金额:' + money + // '元\n\n提现手续费：' + shouxufei + // '\n\n收款人账号：' + that.aliZhiFuBao + '', @@ -409,8 +519,8 @@ export default { uni.showModal({ title: '提现申请提示', content: '请仔细确认收款人信息\n\n收款人姓名:' + that.aliZhiFuBaoName + '\n\n提现金额:' + money + - '元\n\n收款人账号：' + that.aliZhiFuBao + - '', + '元\n\n收款人账号：' + that.aliZhiFuBao + + '', success: e => { if (e.confirm) { this.money = money @@ -452,21 +562,41 @@ export default { \ No newline at end of file diff --git a/pages.json b/pages.json index 964f8c3..5dc05eb 100644 --- a/pages.json +++ b/pages.json @@ -10,7 +10,6 @@ "navigationBarTitleText": "任务", "enablePullDownRefresh": true, "navigationStyle": "custom" - } }, { @@ -26,7 +25,6 @@ "style": { "navigationBarTitleText": "任务" // "navigationStyle": "custom" - } }, { @@ -34,7 +32,6 @@ "style": { "navigationBarTitleText": "任务", "navigationStyle": "custom" - } }, { @@ -65,7 +62,8 @@ "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#FFFFFF" } - }, { + }, + { "path": "pages/index/course/orderDet", "style": { "navigationBarTitleText": "确认订单", @@ -79,8 +77,6 @@ "navigationBarBackgroundColor": "#FFFFFF" } }, - - { "path": "pages/learn/index", "style": { @@ -111,8 +107,6 @@ } } }, - - { "path": "pages/me/vip/index", "style": { @@ -124,8 +118,6 @@ } } }, - - { "path": "pages/login/login", "style": { @@ -163,7 +155,8 @@ } } } - }, { + }, + { "path": "pages/login/bind", "style": { "navigationBarTitleText": "绑定手机号", @@ -176,7 +169,6 @@ }, { "path": "pages/login/register", - "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#f1a48a", @@ -201,7 +193,8 @@ } } } - }, { + }, + { "path": "pages/yodwbsHlmJ/yodwbsHlmJ", "style": { "navigationBarTitleText": "追剧", @@ -211,8 +204,8 @@ "navigationStyle": "custom" // #endif } - - }, { + }, + { "path": "pages/yodwbsHlmJ/aaacasadwqvb", "style": { "navigationBarTitleText": "追剧as", @@ -222,8 +215,8 @@ "navigationStyle": "custom" // #endif } - - }, { + }, + { "path": "pages/video/video", "style": { "navigationBarTitleText": "推荐", @@ -239,9 +232,7 @@ "video-player": "ext://industry/video-player" } // #endif - } - }, { "path": "pages/login/appEq", @@ -253,7 +244,8 @@ "navigationStyle": "custom" // #endif } - }, { + }, + { "path": "pages/login/iosmobile", "style": { "navigationBarTitleText": "手机号绑定" @@ -308,38 +300,48 @@ "navigationBarTitleText": "意见反馈", "navigationBarBackgroundColor": "#FFFFFF" } - }, { + }, + { "path": "HEWZtgyqRH/HEWZtgyqRH", "style": { "navigationBarTitleText": "我的余额" } - }, { + }, + { "path": "HEWZtgyqRH/YGivHgyqkI" - }, { + }, + { "path": "HEWZtgyqRH/EsBgyqacOi" - }, { + }, + { "path": "feedbackIndexczgw/issuer" - }, { + }, + { "path": "feedbackIndexczgw/Invoicedgoods" - }, { + }, + { "path": "feedback/toexamine" - }, { + }, + { "path": "feedback/orderinquiry" - }, { + }, + { "path": "feedbackIndexczgw/feedbackIndexczgw", "style": { "navigationBarTitleText": "帮助中心", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#FFFFFF" } - }, { + }, + { "path": "helpDetail/helpDetail", "style": { "navigationBarTitleText": "帮助详情", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#FFFFFF" } - }, { + }, + { "path": "message/duanju-message-home", "style": { "navigationBarTitleText": "消息中心" @@ -396,9 +398,13 @@ "path": "yaoqing/ymg-yaoqing-tixian", "style": { "navigationBarTitleText": "申请提现", - "h5": { + // "navigationStyle": "custom", + "app-plus": { "titleNView": { - "backgroundColor": "#FFFFFF" + "buttons": [{ + "text": "规则", + "fontSize": "30rpx" + }] } } } @@ -475,7 +481,8 @@ } } } - }, { + }, + { "path": "setting/kefu", "style": { "navigationBarTitleText": "客服", @@ -525,8 +532,8 @@ } } } - }, { - + }, + { "path": "detail/detail", "style": { "navigationBarTitleText": "", @@ -565,12 +572,9 @@ "video-player": "ext://industry/video-player" } // #endif - - } - - }, { - + }, + { "path": "detail/detailIOS", "style": { "navigationBarTitleText": "", @@ -609,45 +613,42 @@ "video-player": "ext://industry/video-player" } // #endif - - } - - }, { + }, + { "path": "FrdwbsihPr/FrdwbsihPr", "style": { "navigationBarTitleText": "金币充值", "enablePullDownRefresh": false } - - }, { + }, + { "path": "FrdwbsihPr/RSKjJIdwbH", "style": { "navigationBarTitleText": "金币明细", "enablePullDownRefresh": true } - - }, { + }, + { "path": "jilu/duanju-zuijin-guankan", "style": { "navigationBarTitleText": "最近观看", "enablePullDownRefresh": true } - - }, { + }, + { "path": "jilu/duanju-zhjuiju-jilu", "style": { "navigationBarTitleText": "追剧记录", "enablePullDownRefresh": true } - - }, { + }, + { "path": "jifen/duanju-jifen", "style": { "navigationBarTitleText": "我的积分", "enablePullDownRefresh": false } - }, { "path": "jifen/duanju-jifen-duihuan", @@ -655,14 +656,13 @@ "navigationBarTitleText": "积分兑换", "enablePullDownRefresh": false } - - }, { + }, + { "path": "jilu/duanju-love", "style": { "navigationBarTitleText": "我的喜欢", "enablePullDownRefresh": true } - }, { "path": "jilu/new/fensehn-first", @@ -670,7 +670,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": true } - }, { "path": "jilu/new/free-create-fenshen", @@ -678,7 +677,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": true } - }, { "path": "jifen/new/create-zhuanye-fenshen", @@ -686,7 +684,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - }, { "path": "jifen/new/fenshen-detail", @@ -694,7 +691,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - }, { "path": "payOrder/duanju-xiadan", @@ -702,7 +698,6 @@ "navigationBarTitleText": "下单", "enablePullDownRefresh": false } - }, { "path": "payOrder/new/index", @@ -710,7 +705,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - }, { "path": "payOrder/new/newindex", @@ -718,7 +712,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - }, { "path": "setting/logOff", @@ -726,15 +719,15 @@ "navigationBarTitleText": "注销账号", "enablePullDownRefresh": false } - - }, { + }, + { "path": "setting/offXieyi", "style": { "navigationBarTitleText": "用户注销协议", "enablePullDownRefresh": false } - - }, { + }, + { "path": "juqing/duanju-juqing-home", "style": { "navigationBarTitleText": "剧情介绍", @@ -747,7 +740,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": true } - }, { "path": "juqing/new/waiting-result", @@ -755,14 +747,13 @@ "navigationBarTitleText": "", "enablePullDownRefresh": true } - - }, { + }, + { "path": "mFYpdwbMdk/mFYpdwbMdk", "style": { "navigationBarTitleText": "壁纸", "enablePullDownRefresh": true } - }, { "path": "rHTgyqGoIV/rHTgyqGoIV", @@ -841,13 +832,11 @@ { "root": "pay", "pages": [{ - "path": "success", - "style": { - "navigationBarTitleText": "支付成功" - } + "path": "success", + "style": { + "navigationBarTitleText": "支付成功" } - - ] + }] }, { "root": "other", @@ -887,7 +876,6 @@ "style": { "navigationBarTitleText": "抽奖", "navigationStyle": "custom" - } }, { @@ -924,24 +912,20 @@ "navigationStyle": "custom" } } - ] } ], - "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "短剧", "navigationBarBackgroundColor": "#FFFFFF", "backgroundColor": "#F8F8F8" - }, "tabBar": { "color": "#333333", "selectedColor": "#FF7581", "backgroundColor": "#FFFFFF", "borderStyle": "black", - "list": [{ "pagePath": "pages/index/index2", "iconPath": "static/tabbar/index@2x.png", @@ -961,14 +945,12 @@ // "text": "刷剧" // } // , - // { // "pagePath": "pages/video/video", // "iconPath": "static/tabbar/learn@2x.png", // "selectedIconPath": "static/tabbar/learn_@2x.png", // "text": "推荐" // }, - // { // "pagePath": "pages/chasingDrama/chasingDrama", // "iconPath": "static/tabbar/zhuiju.png", diff --git a/pages/index/index2.vue b/pages/index/index2.vue index 15a0f50..fe9783f 100644 --- a/pages/index/index2.vue +++ b/pages/index/index2.vue @@ -14,179 +14,209 @@ - \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 5d7ae19..bcd3e2c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -286,6 +286,7 @@ export default { }) this.$u.post('/app/Login/registerCode?password=' + code + '&phone=' + mobile).then(res => { if (res.code === 0) { + console.log(res,'userid1') uni.setStorageSync('token', res.token) uni.setStorageSync('userId', res.user.userId) uni.setStorageSync('userName', res.user.userName)