diff --git a/config/app.js b/config/app.js index 5d52a61..aed86ed 100644 --- a/config/app.js +++ b/config/app.js @@ -12,8 +12,8 @@ let httpApiSix let wsApi // 在打包之前请检查当前环境是否正确 -const env = 'dev'; // 开发 -// const env = 'prod'; // 生产 +// const env = 'dev'; // 开发 +const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { diff --git a/libs/wechat.js b/libs/wechat.js index b4f1a4a..4768278 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -206,7 +206,7 @@ class AuthWechat { } else { uni.setStorageSync('auth_token', res.data.result.key); return uni.navigateTo({ - url: '/pages/users/login/index' + url: '/pages/users/login/login_copy' }) } }) diff --git a/manifest.json b/manifest.json index 797c17b..aac60c5 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.9.4", - "versionCode" : 194, + "versionName" : "1.9.5", + "versionCode" : 195, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/auth/index.vue b/pages/auth/index.vue index b05c990..df03aba 100644 --- a/pages/auth/index.vue +++ b/pages/auth/index.vue @@ -26,6 +26,7 @@ }, onLoad(option) { + console.log(option); let that = this const { code, @@ -33,12 +34,13 @@ } = option; wechat.auth(code, state) .then(() => { - // console.log(decodeURIComponent(decodeURIComponent(option.back_url)),'back_url') + console.log('----', decodeURIComponent(decodeURIComponent(option.back_url)),'back_url') const href = decodeURIComponent(decodeURIComponent(option.back_url)) location.replace(href) }) .catch((err) => { - location.replace("/"); + console.log('----', {...err}) + location.replace("/pages/users/login/login_copy"); }); } }; diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue index c295adb..8c24bb7 100644 --- a/pages/payment/get_payment.vue +++ b/pages/payment/get_payment.vue @@ -1,56 +1,58 @@