Skip to content

Commit 31d0a19

Browse files
committed
Merge branch 'master' into dev
2 parents f53f605 + 49c4e39 commit 31d0a19

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

components/uni-popup/uni-popup.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,13 @@
174174
opacity: 0.8;
175175
}
176176
177+
.uni-popup-top,
178+
.uni-popup-bottom {
179+
display: flex;
180+
align-items: center;
181+
justify-content: center;
182+
}
183+
177184
.uni-popup-top {
178185
top: 0;
179186
left: 0;

pages/API/login/login.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@
8383
...mapMutations(['login']),
8484
tologin(provider) {
8585
uni.login({
86-
provider: provider.id,
86+
provider: provider.id,
87+
// #ifdef MP-ALIPAY
88+
scopes: 'auth_user', //支付宝小程序需设置授权类型
89+
// #endif
8790
success: (res) => {
8891
console.log('login success:', res);
8992
// 更新保存在 store 中的登录状态

0 commit comments

Comments
 (0)