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

Merge branch 'master' into dev

...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#FFF", "navigationBarBackgroundColor": "#FFF",
"backgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8"
/* #ifdef H5 */ /* #ifdef H5 */
"navigationStyle": "custom" ,"navigationStyle": "custom"
/* #endif */ /* #endif */
} }
,"condition" : { //模式配置,仅开发期间生效 ,"condition" : { //模式配置,仅开发期间生效
......
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
<script> <script>
import config from '@/uni_modules/uni-id-pages/config.js' 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 db = uniCloud.database();
const usersTable = db.collection('uni-id-users') const usersTable = db.collection('uni-id-users')
let allServicesList = [] let allServicesList = []
export default { export default {
computed: { computed: {
agreements() { agreements() {
...@@ -42,27 +42,19 @@ ...@@ -42,27 +42,19 @@
] ]
}, },
agree: { agree: {
get() { get() {
return this.uniParentComponent.agree return this.getParentComponent().agree
}, },
set(agree) { set(agree) {
console.log('setAgree', agree); console.log('setAgree', agree);
return this.uniParentComponent.agree = agree return this.getParentComponent().agree = agree
} }
} }
}, },
data() { data() {
// #ifndef H5
const uniParentComponent = this.$parent;
// #endif
// #ifdef H5
const uniParentComponent = this.$parent.$parent;
// #endif
return {
//父组件对象 return {
uniParentComponent,
servicesList: [{ servicesList: [{
"id": "username", "id": "username",
"text": "账号登录", "text": "账号登录",
...@@ -198,10 +190,19 @@ ...@@ -198,10 +190,19 @@
}) })
//console.log('servicesList', servicesList, this.servicesList); //console.log('servicesList', servicesList, this.servicesList);
}, },
async mounted() { async mounted() {
}, },
methods: { methods: {
getParentComponent(){
// #ifndef H5
return this.$parent;
// #endif
// #ifdef H5
return this.$parent.$parent;
// #endif
},
setUserInfo(e) { setUserInfo(e) {
console.log('setUserInfo', e); console.log('setUserInfo', e);
}, },
...@@ -236,7 +237,7 @@ ...@@ -236,7 +237,7 @@
} }
}, },
async login_before(type, navigateBack = true) { async login_before(type, navigateBack = true) {
console.log(type); console.log(type);
//提示空实现 //提示空实现
if (["qq", if (["qq",
"xiaomi", "xiaomi",
...@@ -292,46 +293,46 @@ ...@@ -292,46 +293,46 @@
} }
//判断是否需要弹出隐私协议授权框 //判断是否需要弹出隐私协议授权框
console.log(type, this.agree); console.log(type, this.agree);
let needAgreements = (config?.agreements?.scope || []).includes('register') let needAgreements = (config?.agreements?.scope || []).includes('register')
console.log({ console.log({
needAgreements needAgreements
}); });
if (type != 'univerify' && needAgreements && !this.agree) { if (type != 'univerify' && needAgreements && !this.agree) {
let agreementsRef = this.uniParentComponent.$refs.agreements let agreementsRef = this.uniParentComponent.$refs.agreements
return agreementsRef.popup(() => { return agreementsRef.popup(() => {
console.log(type, navigateBack); console.log(type, navigateBack);
this.login_before(type, navigateBack) this.login_before(type, navigateBack)
}) })
} }
// #ifdef H5 // #ifdef H5
if(type == 'weixin'){ if(type == 'weixin'){
// console.log('开始微信网页登录'); // console.log('开始微信网页登录');
let redirectUrl = location.protocol +'//'+ let redirectUrl = location.protocol +'//'+
document.domain + document.domain +
(window.location.href.includes('#')?'/#':'') + (window.location.href.includes('#')?'/#':'') +
'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin' '/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
console.log('redirectUrl----',redirectUrl); console.log('redirectUrl----',redirectUrl);
let ua = window.navigator.userAgent.toLowerCase(); let ua = window.navigator.userAgent.toLowerCase();
if (ua.match(/MicroMessenger/i) == 'micromessenger'){ if (ua.match(/MicroMessenger/i) == 'micromessenger'){
// console.log('在微信公众号内'); // console.log('在微信公众号内');
return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize? return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
appid=${config.appid.weixin.h5} appid=${config.appid.weixin.h5}
&redirect_uri=${encodeURIComponent(redirectUrl)} &redirect_uri=${encodeURIComponent(redirectUrl)}
&response_type=code &response_type=code
&scope=snsapi_userinfo &scope=snsapi_userinfo
&state=STATE&connect_redirect=1#wechat_redirect`); &state=STATE&connect_redirect=1#wechat_redirect`);
}else{ }else{
// console.log('非微信公众号内'); // console.log('非微信公众号内');
return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web} return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
&redirect_uri=${encodeURIComponent(redirectUrl)} &redirect_uri=${encodeURIComponent(redirectUrl)}
&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect` &response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
} }
} }
// #endif // #endif
uni.showLoading({ uni.showLoading({
mask: true mask: true
...@@ -423,7 +424,7 @@ ...@@ -423,7 +424,7 @@
} }
}) })
}, },
login(params, type) { //联网验证登录 login(params, type) { //联网验证登录
console.log('执行登录开始----'); console.log('执行登录开始----');
console.log({ console.log({
params, params,
...@@ -450,9 +451,9 @@ ...@@ -450,9 +451,9 @@
}) })
return this.$refs.userProfile.open(result.uid) return this.$refs.userProfile.open(result.uid)
} }
// #endif // #endif
// #ifdef H5 // #ifdef H5
result.loginType = type result.loginType = type
// #endif // #endif
loginSuccess(result) loginSuccess(result)
}) })
...@@ -516,7 +517,7 @@ ...@@ -516,7 +517,7 @@
width: 750rpx; width: 750rpx;
justify-content: space-around; justify-content: space-around;
position: fixed; position: fixed;
bottom: 10rpx; bottom: 10rpx;
left: 0; left: 0;
} }
...@@ -536,7 +537,7 @@ ...@@ -536,7 +537,7 @@
align-items: center; align-items: center;
height: 200rpx; height: 200rpx;
cursor: pointer; cursor: pointer;
} }
.logo { .logo {
width: 60rpx; width: 60rpx;
......
...@@ -12,7 +12,6 @@ const { ...@@ -12,7 +12,6 @@ const {
isUniIdError isUniIdError
} = require('./common/error') } = require('./common/error')
const middleware = require('./middleware/index') const middleware = require('./middleware/index')
const uniOpenBridge = require('uni-open-bridge-common')
const { const {
registerAdmin, registerAdmin,
...@@ -72,7 +71,7 @@ const { ...@@ -72,7 +71,7 @@ const {
} = require('./module/dev/index') } = require('./module/dev/index')
module.exports = { module.exports = {
async _before () { async _before() {
const clientInfo = this.getClientInfo() const clientInfo = this.getClientInfo()
/** /**
* 检查clientInfo,无appId和uniPlatform时本云对象无法正常运行 * 检查clientInfo,无appId和uniPlatform时本云对象无法正常运行
...@@ -154,7 +153,11 @@ module.exports = { ...@@ -154,7 +153,11 @@ module.exports = {
// 挂载uni-captcha到this上,方便后续调用 // 挂载uni-captcha到this上,方便后续调用
this.uniCaptcha = uniCaptcha this.uniCaptcha = uniCaptcha
this.uniOpenBridge = uniOpenBridge Object.defineProperty(this, 'uniOpenBridge', {
get() {
return require('uni-open-bridge-common')
}
})
// 挂载中间件 // 挂载中间件
this.middleware = {} this.middleware = {}
...@@ -175,7 +178,7 @@ module.exports = { ...@@ -175,7 +178,7 @@ module.exports = {
// 通用权限校验模块 // 通用权限校验模块
await this.middleware.accessControl() await this.middleware.accessControl()
}, },
_after (error, result) { _after(error, result) {
if (error) { if (error) {
// 处理中间件内抛出的标准响应对象 // 处理中间件内抛出的标准响应对象
if (error.errCode && getType(error) === 'object') { if (error.errCode && getType(error) === 'object') {
...@@ -496,4 +499,4 @@ module.exports = { ...@@ -496,4 +499,4 @@ module.exports = {
* @returns * @returns
*/ */
getH5WeixinConfig getH5WeixinConfig
} }
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha", "uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
"uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center", "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
"uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common", "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common"
"uni-open-bridge-common": "file:../../../../uni-open-bridge/uniCloud/cloudfunctions/common/uni-open-bridge-common"
}, },
"extensions": {} "extensions": {}
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册