修复 iOS端，一键登录功能卡在showLoading的问题

changelog.md

+## 1.2.8（2022-09-01）
++ 修复 iOS端，一键登录功能卡在showLoading的问题
 ## 1.2.7（2022-08-10）
 - 修复微信小程序绑定手机号失败的问题
 ## 1.2.6（2022-06-29）

components/uni-quick-login/uni-quick-login.vue

@@ -190,10 +190,8 @@
 						icon: 'none'
 					});
 				}
-				uni.showLoading({mask: true})
-				if (type == 'univerify' && uni.getUniverifyManager) {
+				if (type == 'univerify') {
 					let univerifyManager = uni.getUniverifyManager()
-					console.log('是新版');
 					let onButtonsClickFn =	async res =>{
 						console.log('点击了第三方登录，provider：',res, res.provider,this.univerifyStyle.buttons.list);
 						//同步一键登录弹出层隐私协议框是否打勾
@@ -232,6 +230,7 @@
 					// 订阅自定义按钮点击事件
 					univerifyManager.onButtonsClick(onButtonsClickFn)
 					// 调用一键登录弹框
+					console.log(this.univerifyStyle,univerifyManager.login);
 					return univerifyManager.login({
 						"univerifyStyle": this.univerifyStyle,
 						success:res=> {
@@ -245,16 +244,17 @@
 							});
 						},
 						complete(e){
+							console.log(e);
 							uni.hideLoading()
 							// 取消订阅自定义按钮点击事件
 							univerifyManager.offButtonsClick(onButtonsClickFn)
 						}
 					})
 				}
+				uni.showLoading({mask: true})
 				uni.login({
 					"provider": type,
 					"onlyAuthorize": true, //请勿直接使用前端获取的unionid或openid直接用于登录，前端的数据都是不可靠的
-					"univerifyStyle": this.univerifyStyle,
 					complete: (e) => {
 						console.log(e);
 						uni.hideLoading()
@@ -271,63 +271,6 @@
 					},
 					fail: async (err) => {
 						console.log(err);
-						// 以下代码为兼容旧版（HBuilderX3.2.13之前）HBuilderX3.2.13以上版本可直接删除
-						if (type == 'univerify'&& !uni.getUniverifyManager) {
-							if (err.metadata && err.metadata.error_data) {
-								uni.showToast({
-									title: t('oneClickLogin') + ":" + err.metadata.error_data,
-									icon: 'none'
-								});
-							}
-							if (err.errMsg) {
-								uni.showToast({
-									title: t('oneClickLogin') + ":" + err.errMsg,
-									icon: 'none'
-								});
-							}
-							switch (err.errCode) {
-								case 30002:
-									console.log('在一键登录界面，点击其他登录方式');
-									break;
-								case 30003:
-									console.log('关闭了登录');
-									if (navigateBack) {
-										uni.navigateBack()
-									}
-									break;
-								case 30006:
-									uni.showModal({
-										title: t('loginErr'),
-										content: err.metadata.error_data,
-										showCancel: false,
-										confirmText: t('gotIt'),
-									});
-									break;
-								case "30008":
-									console.log('点击了第三方登录，provider：', err.provider);
-									//同步一键登录弹出层隐私协议框是否打勾
-									let agree = (await uni.getCheckBoxState())[1].state
-									console.log('agree', agree);
-									uni.$emit('setAgreementsAgree', agree)
-									let {
-										path
-									} = this.univerifyStyle.buttons.list[res.index]
-									console.log('path', path);
-									if (path) {
-										this.to(path)
-									} else {
-										setTimeout(() => {
-											console.log('agree', this.agree);
-											this.login_before(err.provider)
-										}, 500)
-									}
-									break;
-								default:
-									console.log(err);
-									break;
-							}
-						}
-						// 以上代码为兼容旧版（HBuilderX3.2.13之前）HBuilderX3.2.13以上版本可直接删除
 					}
 				})
 			},

manifest.json

 {
-	"name": "uni-starter",
-	"appid": "__UNI__EC87F46",
+  "name": "",
+  "appid": "",
   "description": "",
-	"versionName": "1.0.0",
+  "versionName": "",
   "versionCode": "100",
   "transformPx": false,
-	/* 5+App特有相关 */
   "app-plus": {
     "usingComponents": true,
     "nvueStyleCompiler": "uni-app",
@@ -16,11 +15,11 @@
       "autoclose": true,
       "delay": 0
     },
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
+    "modules": {
+      "OAuth": {
+      }
+    },
     "distribute": {
-			/* android打包配置 */
       "android": {
         "permissions": [
           "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
@@ -40,21 +39,29 @@
           "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
         ]
       },
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {}
+      "ios": {
+      },
+      "sdkConfigs": {
+        "oauth": {
+          "univerify": {
+          }
+        }
       }
+    }
+  },
+  "quickapp": {
   },
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
   "mp-weixin": {
     "appid": "",
     "setting": {
       "urlCheck": false
     },
-		"usingComponents": true
+    "usingComponents": true,
+    "permission": {
+      "scope.userLocation": {
+        "desc": "用于提供应用算法支持"
+      }
+    }
   },
   "mp-alipay": {
     "usingComponents": true

package.json

 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.2.7",
+	"version": "1.2.8",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
         "login",

pages/ucenter/login-page/index/index.vue

@@ -126,7 +126,6 @@
 	@import url("../common/login-page.css");
 
 	.quickLogin {
-		width: 650rpx;
 		height: 350px;
 		align-items: center;
 		justify-content: center;

uni_modules.config.json

 {
   "scripts": {
-    "preupload": "node uni_modules_tools/main.js change",
-    "postupload": "node uni_modules_tools/main.js recovery"
+    // "preupload": "node uni_modules_tools/main.js change",
+    // "postupload": "node uni_modules_tools/main.js recovery"
   }
 }
\ No newline at end of file

uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js

@@ -426,7 +426,9 @@ exports.main = async (event, context) => {
 			return loginRes
 			break;
 		case 'loginByUniverify':
+			console.error(params)
 			res = await uniID.loginByUniverify(params)
+			console.log(999999999,res)
 			await uniIdLog(res)
 			break;
 		case 'loginByApple':

uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/package.json

@@ -12,5 +12,8 @@
     "uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
     "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
     "uni-id": "file:../../../../uni-id/uniCloud/cloudfunctions/common/uni-id"
+  },
+  "extensions": {
+    "uni-cloud-verify": {}
   }
 }

uni_modules_tools/change_after.js

 const fs = require('fs');
 module.exports = function(){
 	console.log('开始执行脚本change_after');
-	let changelog = fs.readFileSync(process.cwd() + '/changelog.md', 'utf-8').split("##")[1].split("\n").slice(1).join(' ');
+/*	let changelog = fs.readFileSync(process.cwd() + '/changelog.md', 'utf-8').split("##")[1].split("\n").slice(1).join(' ');
 	console.log(changelog);
 	// 这里是修改完相关敏感配置后执行的脚本，你可以在这里自定义逻辑，
+
+
   // 比如执行git提交命令
 	var shell = require("shelljs");
 	var exec = shell.exec;
@@ -21,4 +23,5 @@ module.exports = function(){
 	  shell.exit(1);
 	}
 	shell.exec(`echo git success ${changelog}`);
+  */
 }
\ No newline at end of file

uni_modules_tools/config.js

 // "文件路径" : {"键名":"改成什么"}
 {
 	"/manifest.json": {
-		"appid": "请点击重新获取" ,//清空appid
-		"mp-weixin" : {
-		    "appid" : ""
-		},
-		"app-plus" : {
-			"distribute" :{
-				"sdkConfigs" : {
-				    "oauth" : {
-				        "weixin" : {
-				            "appid" : "",
-				            "appsecret" : "",
-				            "UniversalLinks" : ""
-				        },
-				        "univerify" : {}
+		"appid": "",
+		"name": "",
+		"versionName": "",
+		"mp-weixin": {
+			"appid": ""
 		},
-				    "share" : {
-				        "weixin" : {
-				            "appid" : "",
-				            "UniversalLinks" : ""
-				        }
+		"vueVersion": "2",
+		"app-plus": {
+			"modules": {
+				"OAuth": {}
 			},
-				    "geolocation" : {
-				        "baidu" : {
-				            "__platform__" : [ "ios", "android" ],
-				            "appkey_ios" : "请填写地图的key",
-				            "appkey_android" : "请填写地图的key"
+			"distribute": {
+				"sdkConfigs": {
+					"oauth": {
+						"univerify": {}
 					}
 				}
 			}
 		}
 	},
-		"_spaceID" : "",
-		"vueVersion" : "2"
-	},
 	"/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json": {
 		"tokenExpiresIn": 7200,
 		"app": {

uni_modules_tools/main.js

@@ -96,6 +96,7 @@ function mergeJSON(minor, main) {
 		if (typeof(main[key]) != 'object' ) {
 			minor[key] = main[key];
 		}else{
+      console.log('[',minor[key], main[key],']');
 			mergeJSON(minor[key], main[key]);
 		}
 	}