Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

common/queue.js

@@ -495,7 +495,7 @@ module.exports = {
 	        // #endif
 	
 	        // 特殊处理：相机权限在非iOS平台显示自定义弹窗
-	        if (permisionID == 'android.permission.CAMERA,android.permission.READ_EXTERNAL_STORAGE' && uni.getSystemInfoSync().platform != 'ios') {
+	        if (uni.getSystemInfoSync().platform != 'ios') {
 	            that.$refs.permission.open();
 	        }
 	
@@ -516,8 +516,8 @@ module.exports = {
 	                    resolve(true);
 	                } else if (result == 0) {
 	                    console.log("未获得授权");
-	                    that.$refs.permission?.open();
-	                    resolve(true);
+	                    that.$refs.permission?.close();
+	                    resolve(false);
 	                } else {
 	                    console.log("被永久拒绝");
 	                    if (uni.getSystemInfoSync().platform != 'ios') {

js_sdk/wa-permission/permission.js

@@ -157,9 +157,10 @@ function judgeIosPermissionMemo() {
 
 // Android权限查询
 function requestAndroidPermission(permissionID) {
+	var permissionID=permissionID.split(',')
 	return new Promise((resolve, reject) => {
 		plus.android.requestPermissions(
-			[permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
+			permissionID, // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
 			function(resultObj) {
 				var result = 0;
 				for (var i = 0; i < resultObj.granted.length; i++) {