mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
synced 2025-12-17 16:05:53 +08:00
Merge branch 'master' into ma
This commit is contained in:
@@ -17,7 +17,8 @@
|
|||||||
import { webConnect, openIdLogin } from "@/api/connect.js";
|
import { webConnect, openIdLogin } from "@/api/connect.js";
|
||||||
import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
|
import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
|
||||||
import { getUserInfo } from "@/api/members";
|
import { getUserInfo } from "@/api/members";
|
||||||
import storage from "@/utils/storage.js";
|
import storage from "@/utils/storage.js";
|
||||||
|
import api from "@/config/api.js";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
@@ -147,13 +148,9 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
let code = connectLogin.code;
|
let code = connectLogin.code;
|
||||||
webConnect(code).then((res) => {
|
let buyer = api.buyer;
|
||||||
let data = res.data;
|
window.open(buyer+`/connect/login/web/`+code, "_self");
|
||||||
if (data.success) {
|
|
||||||
window.location = data.result;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
// #endif
|
// #endif
|
||||||
// #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
this.nonH5OpenId(connectLogin);
|
this.nonH5OpenId(connectLogin);
|
||||||
|
|||||||
Reference in New Issue
Block a user