perf: 🐛 优化QQ登录和微信登录Bug
parent
7c2a50eec0
commit
9ab1cec1bb
|
@ -26,7 +26,7 @@ export function webConnect(code) {
|
||||||
export function openIdLogin(params, clientType) {
|
export function openIdLogin(params, clientType) {
|
||||||
return http.request({
|
return http.request({
|
||||||
url: `passport/connect/connect/app/login`,
|
url: `passport/connect/connect/app/login`,
|
||||||
method: Method.GET,
|
method: Method.POST,
|
||||||
needToken: true,
|
needToken: true,
|
||||||
data: params,
|
data: params,
|
||||||
header: {
|
header: {
|
||||||
|
|
|
@ -453,10 +453,11 @@
|
||||||
uuid: uni.getStorageSync("openid"), //联合登陆id
|
uuid: uni.getStorageSync("openid"), //联合登陆id
|
||||||
source: uni.getStorageSync("type"), //联合登陆类型
|
source: uni.getStorageSync("type"), //联合登陆类型
|
||||||
nickname: uni.getStorageSync("nickname"), // 昵称
|
nickname: uni.getStorageSync("nickname"), // 昵称
|
||||||
|
username: uni.getStorageSync("openid"), // 昵称
|
||||||
avatar: uni.getStorageSync("avatar"), // 头像
|
avatar: uni.getStorageSync("avatar"), // 头像
|
||||||
uniAccessToken: uni.getStorageSync("uni_access_token"), //第三方token
|
uniAccessToken: uni.getStorageSync("uni_access_token"), //第三方token
|
||||||
type:this.clientType,
|
type:this.clientType,
|
||||||
token:{unionId:""}
|
token:{unionId:"",openId:uni.getStorageSync("openid")}
|
||||||
};
|
};
|
||||||
uni.getStorageSync("unionId") ? (params.token.unionId = uni.getStorageSync("unionId")) : delete params.token;
|
uni.getStorageSync("unionId") ? (params.token.unionId = uni.getStorageSync("unionId")) : delete params.token;
|
||||||
|
|
||||||
|
|
|
@ -107,6 +107,8 @@
|
||||||
<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
|
<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
|
||||||
{{skuItem.errorMessage}}
|
{{skuItem.errorMessage}}
|
||||||
</div>
|
</div>
|
||||||
|
</p>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</u-swipe-action>
|
</u-swipe-action>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton="btnShow" title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
|
<u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
|
||||||
<view class="u-update-content">
|
<view class="u-update-content">
|
||||||
请您务必审慎阅读,充分理解“服务协议”和“隐私政策”各条款,
|
请您务必审慎阅读,充分理解“服务协议”和“隐私政策”各条款,
|
||||||
包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识,
|
包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识,
|
||||||
|
|
|
@ -98,7 +98,7 @@ export default {
|
||||||
},
|
},
|
||||||
onLoad() { },
|
onLoad() { },
|
||||||
onShow() {
|
onShow() {
|
||||||
this.userInfo = this.$options.filters.isLogin();
|
this.userInfo = this.$options.filters.isLogin() || {};
|
||||||
if (this.$options.filters.isLogin("auth")) {
|
if (this.$options.filters.isLogin("auth")) {
|
||||||
this.getUserOrderNum();
|
this.getUserOrderNum();
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue