cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化h5微信授权逻辑;修改CountDown组件报错的问题

Browse Source
This commit is contained in:
Gaoxs
2020-09-22 17:32:13 +08:00
parent 0605a2b4c9
commit 59055982ab
4 changed files with 176 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/wechat.js
View File

@ -88,7 +88,7 @@ let wechatObj;
let appId
let wechatLoading = false
export async function wechat() {
export function wechat() {
console.log('初始化微信配置')
wechatLoading = false
return new Promise((resolve, reject) => {
@ -148,7 +148,7 @@ export async function oAuth() {
})
}
export function auth(code) {
export async function auth(code) {
console.log('获取微信授权')
return new Promise((resolve, reject) => {
let loginType = cookie.get(LOGINTYPE);
@ -170,7 +170,7 @@ export function auth(code) {
})
}
export function toAuth() {
export async function toAuth() {
if (wechatLoading) {
return
}
@ -187,7 +187,6 @@ function getAuthUrl(appId) {
// #ifdef H5
// #endif
debugger
cookie.set('redirect', window.location.href)
const redirect_uri = encodeURIComponent(`${location.origin}/pages/Loading/index`);
// const redirect_uri = encodeURIComponent(`${location.origin}/pages/Loading/index?path=${encodeURIComponent(window.location.href)}`);