提交 d24ab9be 编写于 作者: 雪洛's avatar 雪洛

fix: syntax error, circular data error

上级 3e7c7600
......@@ -80,9 +80,9 @@
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#FFF",
"backgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
/* #ifdef H5 */
"navigationStyle": "custom"
,"navigationStyle": "custom"
/* #endif */
}
,"condition" : { //模式配置,仅开发期间生效
......
......@@ -15,12 +15,12 @@
<script>
import config from '@/uni_modules/uni-id-pages/config.js'
//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
import loginSuccess from '../../common/loginSuccess.js';
import loginSuccess from '../../common/loginSuccess.js';
const db = uniCloud.database();
const usersTable = db.collection('uni-id-users')
let allServicesList = []
let allServicesList = []
export default {
computed: {
agreements() {
......@@ -42,27 +42,19 @@
]
},
agree: {
get() {
return this.uniParentComponent.agree
get() {
return this.getParentComponent().agree
},
set(agree) {
console.log('setAgree', agree);
return this.uniParentComponent.agree = agree
set(agree) {
console.log('setAgree', agree);
return this.getParentComponent().agree = agree
}
}
},
data() {
// #ifndef H5
const uniParentComponent = this.$parent;
// #endif
// #ifdef H5
const uniParentComponent = this.$parent.$parent;
// #endif
data() {
return {
//父组件对象
uniParentComponent,
return {
servicesList: [{
"id": "username",
"text": "账号登录",
......@@ -198,10 +190,19 @@
})
//console.log('servicesList', servicesList, this.servicesList);
},
async mounted() {
},
async mounted() {
},
methods: {
getParentComponent(){
// #ifndef H5
return this.$parent;
// #endif
// #ifdef H5
return this.$parent.$parent;
// #endif
},
setUserInfo(e) {
console.log('setUserInfo', e);
},
......@@ -236,7 +237,7 @@
}
},
async login_before(type, navigateBack = true) {
console.log(type);
console.log(type);
//提示空实现
if (["qq",
"xiaomi",
......@@ -292,46 +293,46 @@
}
//判断是否需要弹出隐私协议授权框
console.log(type, this.agree);
let needAgreements = (config?.agreements?.scope || []).includes('register')
console.log(type, this.agree);
let needAgreements = (config?.agreements?.scope || []).includes('register')
console.log({
needAgreements
});
if (type != 'univerify' && needAgreements && !this.agree) {
let agreementsRef = this.uniParentComponent.$refs.agreements
return agreementsRef.popup(() => {
if (type != 'univerify' && needAgreements && !this.agree) {
let agreementsRef = this.uniParentComponent.$refs.agreements
return agreementsRef.popup(() => {
console.log(type, navigateBack);
this.login_before(type, navigateBack)
})
}
// #ifdef H5
if(type == 'weixin'){
// console.log('开始微信网页登录');
let redirectUrl = location.protocol +'//'+
document.domain +
(window.location.href.includes('#')?'/#':'') +
'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
console.log('redirectUrl----',redirectUrl);
let ua = window.navigator.userAgent.toLowerCase();
if (ua.match(/MicroMessenger/i) == 'micromessenger'){
// console.log('在微信公众号内');
return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
appid=${config.appid.weixin.h5}
&redirect_uri=${encodeURIComponent(redirectUrl)}
&response_type=code
&scope=snsapi_userinfo
&state=STATE&connect_redirect=1#wechat_redirect`);
}else{
// console.log('非微信公众号内');
return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
&redirect_uri=${encodeURIComponent(redirectUrl)}
&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
}
}
// #endif
}
// #ifdef H5
if(type == 'weixin'){
// console.log('开始微信网页登录');
let redirectUrl = location.protocol +'//'+
document.domain +
(window.location.href.includes('#')?'/#':'') +
'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
console.log('redirectUrl----',redirectUrl);
let ua = window.navigator.userAgent.toLowerCase();
if (ua.match(/MicroMessenger/i) == 'micromessenger'){
// console.log('在微信公众号内');
return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
appid=${config.appid.weixin.h5}
&redirect_uri=${encodeURIComponent(redirectUrl)}
&response_type=code
&scope=snsapi_userinfo
&state=STATE&connect_redirect=1#wechat_redirect`);
}else{
// console.log('非微信公众号内');
return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
&redirect_uri=${encodeURIComponent(redirectUrl)}
&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
}
}
// #endif
uni.showLoading({
mask: true
......@@ -423,7 +424,7 @@
}
})
},
login(params, type) { //联网验证登录
login(params, type) { //联网验证登录
console.log('执行登录开始----');
console.log({
params,
......@@ -450,9 +451,9 @@
})
return this.$refs.userProfile.open(result.uid)
}
// #endif
// #ifdef H5
result.loginType = type
// #endif
// #ifdef H5
result.loginType = type
// #endif
loginSuccess(result)
})
......@@ -516,7 +517,7 @@
width: 750rpx;
justify-content: space-around;
position: fixed;
bottom: 10rpx;
bottom: 10rpx;
left: 0;
}
......@@ -536,7 +537,7 @@
align-items: center;
height: 200rpx;
cursor: pointer;
}
}
.logo {
width: 60rpx;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册