From 6921f5b11a9a384b2b71e3eafcd550a4322ce419 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Wed, 20 Oct 2021 14:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A82.0=E7=89=88=E3=80=82?=
 =?UTF-8?q?=E5=BD=93=E6=98=BE=E7=A4=BA=E5=88=86=E4=BA=AB=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=9B=91=E5=90=AC=E8=BF=94=E5=9B=9E=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C(=E5=A6=82=EF=BC=9A=E7=89=A9=E7=90=86=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E5=85=A8=E9=9D=A2=E5=B1=8F=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E4=BE=A7=E6=BB=91)=E5=85=B3=E9=97=AD=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-quick-login/uni-quick-login.vue       | 40 +++++++++++++++++--
 manifest.json                                 |  2 +
 uni-starter.config.js                         |  2 +-
 uni_modules/uni-id-cf/changelog.md            |  2 +
 uni_modules/uni-id-cf/package.json            |  2 +-
 uni_modules_tools/copy/manifest.json          |  3 +-
 6 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue
index db78fe4..2ea2970 100644
--- a/components/uni-quick-login/uni-quick-login.vue
+++ b/components/uni-quick-login/uni-quick-login.vue
@@ -13,10 +13,7 @@
 	</view>
 </template>
 <script>
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex';
+	import {mapGetters,mapMutations} from 'vuex';
 	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
 	import loginSuccess from '@/pages/ucenter/login-page/common/loginSuccess.js';
 	const db = uniCloud.database();
@@ -177,6 +174,41 @@
 				uni.showLoading({
 					mask: true
 				})
+				
+				//univerifyManager
+				if(type == 'univerify' && uni.getUniverifyManager){
+					// 调用一键登录弹框
+					const univerifyManager = uni.getUniverifyManager()
+					univerifyManager.login({
+					  "univerifyStyle": this.univerifyStyle,
+					  success (res) {
+					    console.log('login success', res)
+					  }
+					})
+					
+					const callback = (res) => {
+					  // 获取一键登录弹框协议勾选状态
+					  univerifyManager.getCheckBoxState({
+					    success(res) {
+					      console.log("getCheckBoxState res: ", res);
+					      if (res.state) {
+					        // 关闭一键登录弹框
+					        univerifyManager.close()
+					      }
+					    }
+					  })
+					}
+					// 订阅自定义按钮点击事件
+					univerifyManager.onButtonsClick(callback)
+					// 取消订阅自定义按钮点击事件
+					univerifyManager.offButtonsClick(callback)
+				}else{
+					console.log(type);
+					console.log('uni.getUniverifyManager：'+uni.getUniverifyManager);
+				}
+				
+				
+				
 				uni.login({
 					"provider": type,
 					"onlyAuthorize":true, //请勿直接使用前端获取的unionid或openid直接用于登录，前端的数据都是不可靠的
diff --git a/manifest.json b/manifest.json
index ca18294..0c95e9f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -65,6 +65,8 @@
       "Geolocation": {
       },
       "Push": {
+      },
+      "Bluetooth": {
       }
     },
     "distribute": {
diff --git a/uni-starter.config.js b/uni-starter.config.js
index f023abe..7dd50f6 100644
--- a/uni-starter.config.js
+++ b/uni-starter.config.js
@@ -49,7 +49,7 @@ export default {
 			未列举到的，或设备环境不支持的选项，将被隐藏。如果你需要在不同平台有不同的配置，直接用条件编译即可
 			根据数组的第0项，决定登录方式的第一优先级。
 		*/
-		"login": ["username","univerify","weixin", "smsCode", "apple"]
+		"login": ["weixin","univerify","username", "smsCode", "apple"]
 	},
 	//关于应用
 	"about": {
diff --git a/uni_modules/uni-id-cf/changelog.md b/uni_modules/uni-id-cf/changelog.md
index 4e835c0..22d2e6f 100644
--- a/uni_modules/uni-id-cf/changelog.md
+++ b/uni_modules/uni-id-cf/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.7（2021-10-20）
+新增bindMobileByMpWeixin，一键获取微信绑定的手机号
 ## 1.0.6（2021-09-23）
 修复微信登陆成功后没有添加日志的问题
 ## 1.0.5（2021-08-10）
diff --git a/uni_modules/uni-id-cf/package.json b/uni_modules/uni-id-cf/package.json
index 7c286ee..f376744 100644
--- a/uni_modules/uni-id-cf/package.json
+++ b/uni_modules/uni-id-cf/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-id-cf",
   "displayName": "uni-id-cf",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "uni-id-cf",
   "keywords": [
     "uni-id-cf",
diff --git a/uni_modules_tools/copy/manifest.json b/uni_modules_tools/copy/manifest.json
index c4890d4..46aca5a 100644
--- a/uni_modules_tools/copy/manifest.json
+++ b/uni_modules_tools/copy/manifest.json
@@ -59,7 +59,8 @@
             "OAuth" : {},
             "FaceID" : {},
             "Geolocation" : {},
-            "Push" : {}
+            "Push" : {},
+            "Bluetooth" : {}
         },
         "distribute" : {
             "android" : {
-- 
GitLab