From 5b0462afcef652d3a70aef4d869e90bb90374d33 Mon Sep 17 00:00:00 2001 From: zpc Date: Mon, 12 May 2025 10:54:02 +0800 Subject: [PATCH] 222 --- App.vue | 2 + common/config.js | 2 +- common/env.js | 10 +- manifest.json | 2 +- pages/shouye/index.vue | 2 +- pages/shouye/slots.vue | 2 +- pages/user/bangding.vue | 7 +- pages/user/index.vue | 233 +---------- pages/user/login.vue | 895 +++++++++++++++++++--------------------- 9 files changed, 469 insertions(+), 686 deletions(-) diff --git a/App.vue b/App.vue index 9012496..b285b21 100644 --- a/App.vue +++ b/App.vue @@ -79,6 +79,8 @@ export default { uni.removeStorageSync("_click_id"); // 调用平台启动方法 this.$platform.AppLaunch(options); + + }, onShow: function () { diff --git a/common/config.js b/common/config.js index dc48a0c..17288e5 100644 --- a/common/config.js +++ b/common/config.js @@ -8,7 +8,7 @@ import RequestManager from '@/common/request.js' let configData = null; let isLoading = false; let loadPromise = null; -const wx_version = "108"; +const wx_version = "110"; // 白名单页面（不需要登录即可访问） export const whiteList = [ diff --git a/common/env.js b/common/env.js index 5c0c3fa..f66a756 100644 --- a/common/env.js +++ b/common/env.js @@ -23,7 +23,13 @@ const production = { loginPage: 'https://api.zfunbox.cn/login.html', wxAppId: 'wx0e33d80d35e4a3b1' }; - +const production_wz = { + // baseUrl: 'https://youda.zfunbox.cn', + baseUrl: 'https://youda.zfunbox.cn', + imageUrl: 'https://image.zfunbox.cn', + loginPage: 'https://youda.zfunbox.cn/login.html', + wxAppId: 'wx0e33d80d35e4a3b1' +}; // 测试环境配置 const testing = { baseUrl: 'https://testapi.zfunbox.cn', @@ -35,7 +41,7 @@ const testing = { // 根据环境变量选择对应配置 -let currentEnv = testing; +let currentEnv = testing;//production_wz; // 判断当前环境 // #ifdef H5 diff --git a/manifest.json b/manifest.json index 2e8a90d..91dc506 100644 --- a/manifest.json +++ b/manifest.json @@ -126,7 +126,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx683d8a8a499d7ec6", + "appid" : "wx9ade414ae5755f0d", "setting" : { "urlCheck" : false, "es6" : false, diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue index 89374d7..f4682b4 100644 --- a/pages/shouye/index.vue +++ b/pages/shouye/index.vue @@ -7,7 +7,7 @@ - + diff --git a/pages/shouye/slots.vue b/pages/shouye/slots.vue index 5f9558e..f626b67 100644 --- a/pages/shouye/slots.vue +++ b/pages/shouye/slots.vue @@ -1,5 +1,5 @@ @@ -334,35 +206,13 @@ export default { title: '用户协议', icon: 'my/s7.png', path: '/pages/guize/guize?type=4' + },{ + id: 8, + show: true, + title: '退出登录', + icon: 'my/exit.png', + path: '' }, - // { - // id: 2, - // show: true, - // title: '换购记录', - // icon: 'my/s2.png', - // path: '/pages/user/hsjl' - // }, - // { - // id: 8, - // show: true, - // title: '道具卡', - // icon: 'my/s8.png', - // path: '/package/mine/skill-card' - // }, - // { - // id: 9, - // show:true, - // title: '挂售记录', - // icon: '/static/img/2_gsjl.png', - // path: '' - // }, - // { - // id: 10, - // show:true, - // title: '晋升排行榜', - // icon: '/static/img/2_jsphb.png', - // path: '/pages/shouye/bangdan' - // }, ], // 星钻充值金额 money_1: '', @@ -391,7 +241,6 @@ export default { } ], show: 1, - tixian_show: false, taskList: [] } }, @@ -402,6 +251,8 @@ export default { if (e.pid) { uni.setStorageSync('pid', e.pid) } + console.log(this.$platform.code); + }, onHide() { uni.setStorageSync('page', this.$mp.page.route) @@ -437,6 +288,14 @@ export default { url: '/pages/user/change' }) }, + isShowKefu(index){ + if(index==0){ + if(this.$platform.code=='MP-WEIXIN'){ + return true; + } + } + return false; + }, receiveCoupon() { const coupon_id = uni.getStorageSync('_ou_coupon_id') @@ -602,40 +461,6 @@ export default { }) }, - chongzhi_click() { - let that = this - that.req({ - url: 'recharge', - data: { - money: that.money_1 - }, - success(res) { - if (res.status == 1) { - uni.requestPayment({ - provider: 'wxpay', - timeStamp: res.data.timeStamp, - nonceStr: res.data.nonceStr, - package: res.data.package, - signType: 'MD5', - paySign: res.data.paySign, - complete(res) { - if (res.errMsg == 'requestPayment:fail cancel') { - uni.showToast({ - title: '取消支付', - icon: 'loading', - duration: 1000 - }) - } - if (res.errMsg == 'requestPayment:ok') { - that.$refs.chongzhi_show.close() - that.getdata() - } - } - }) - } - } - }) - }, getdata() { let that = this @@ -694,25 +519,7 @@ export default { } }) }, - tixian_click() { - let that = this - console.log(that.money_2) - that.req({ - url: 'withdraw', - data: { - type: that.tixian_index, - money: that.money_2, - name: that.name, - number: that.number - }, - success(res) { - that.money_2 = '' - if (res.status == 0) { - that.tixian_show = false - } - } - }) - }, + //跳转页面 toPage(id) { if (id == 1) { diff --git a/pages/user/login.vue b/pages/user/login.vue index b3802ab..a3ce0be 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -34,7 +34,8 @@ 拒绝 - @@ -42,26 +43,27 @@ - + - + - + version:v1.0.3 @@ -97,506 +99,471 @@ \ No newline at end of file