From 26ae58f8e99ddb828e6b97c4b080adb557d2f216 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Thu, 13 May 2021 16:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=95=E5=AF=BC=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E7=9B=B8=E5=86=8C=E6=9D=83=E9=99=90=EF=BC=8C=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BAios=E5=B7=B2=E7=BB=8F=E9=9B=86=E6=88=90=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=A6=E5=A4=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/appInit.js                             | 72 ++++++++++++-------
 pages/list/list.nvue                          | 10 +--
 .../ucenter/login-page/common/login-page.css  |  1 -
 pages/ucenter/userinfo/userinfo.vue           |  1 -
 4 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/common/appInit.js b/common/appInit.js
index a98c14d6..8dc20e2a 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -59,32 +59,30 @@ export default function() {
 	uni.addInterceptor('chooseImage', {
 		fail(e) { // 失败回调拦截 
 			console.log(e);
-			if (
-				e.errCode === 11 && uni.getSystemInfoSync().platform == "android" ||
-				e.errCode === 2 && uni.getSystemInfoSync().platform == "ios"
-			){
-				uni.showModal({
-					title:"无法访问摄像头",
-					content: "当前无摄像头访问权限，建议前往设置",
-					confirmText: "前往设置",
-					success(e) {
-						if (e.confirm) {
-							openAppPermissionSetting()
+			if(uni.getSystemInfoSync().platform == "android" && e.errMsg == 'chooseImage:fail No Permission'){
+				if(e.code === 11){
+					uni.showModal({
+						title:"无法访问摄像头",
+						content: "当前无摄像头访问权限，建议前往设置",
+						confirmText: "前往设置",
+						success(e) {
+							if (e.confirm) {
+								openAppPermissionSetting()
+							}
 						}
-					}
-				});
-			}
-			if(e.errCode === 12 && uni.getSystemInfoSync().platform == "android"){
-				uni.showModal({
-					title:"无法访问相册",
-					content: "当前无系统相册访问权限，建议前往设置",
-					confirmText: "前往设置",
-					success(e) {
-						if (e.confirm) {
-							openAppPermissionSetting()
+					});
+				}else{
+					uni.showModal({
+						title:"无法访问相册",
+						content: "当前无系统相册访问权限，建议前往设置",
+						confirmText: "前往设置",
+						success(e) {
+							if (e.confirm) {
+								openAppPermissionSetting()
+							}
 						}
-					}
-				});
+					});
+				}
 			}
 		}
 	})
@@ -141,4 +139,30 @@ function initAppVersion() {
 	// 检查更新
 	checkUpdate();
 	// #endif
+}
+
+function openAppPermissionSetting(){
+	// 跳转到**应用**的权限页面
+	if (uni.getSystemInfoSync().platform == "ios") {
+		var UIApplication = plus.ios.import("UIApplication");
+		var application2 = UIApplication.sharedApplication();
+		var NSURL2 = plus.ios.import("NSURL");
+		// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");		
+		var setting2 = NSURL2.URLWithString("app-settings:");
+		application2.openURL(setting2);
+		plus.ios.deleteObject(setting2);
+		plus.ios.deleteObject(NSURL2);
+		plus.ios.deleteObject(application2);
+	} else {
+		// console.log(plus.device.vendor);
+		var Intent = plus.android.importClass("android.content.Intent");
+		var Settings = plus.android.importClass("android.provider.Settings");
+		var Uri = plus.android.importClass("android.net.Uri");
+		var mainActivity = plus.android.runtimeMainActivity();
+		var intent = new Intent();
+		intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+		intent.setData(uri);
+		mainActivity.startActivity(intent);
+	}
 }
\ No newline at end of file
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
index 1c685245..370ff428 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<!-- #ifndef H5 -->
-		<uni-nav-bar :border="false"></uni-nav-bar>
+		<!-- #ifdef APP-PLUS -->
+		<statusBar></statusBar>
 		<!-- #endif -->
 		<!-- 搜索功能 -->
 		<uni-search-bar @click="searchClick" class="uni-search-box" v-model="keyword" ref="searchBar" radius="100" cancelButton="none" disabled/>
@@ -57,8 +57,10 @@
 </template>
 
 <script>
-	var cdbRef, currentWebview;
-	export default {
+	var cdbRef, currentWebview;
+	import statusBar from "@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar";
+	export default {
+		components: { statusBar },
 		data() {
 			return {
 				where: "",
diff --git a/pages/ucenter/login-page/common/login-page.css b/pages/ucenter/login-page/common/login-page.css
index 1ed2115d..579819e0 100644
--- a/pages/ucenter/login-page/common/login-page.css
+++ b/pages/ucenter/login-page/common/login-page.css
@@ -34,7 +34,6 @@
 	border-radius: 6rpx;
 }
 .send-btn{
-	height: 85rpx;
 	width: 100%;
 	margin-top:15px;
 	border-radius: 6rpx;
diff --git a/pages/ucenter/userinfo/userinfo.vue b/pages/ucenter/userinfo/userinfo.vue
index fc0362f8..b4a93eb5 100644
--- a/pages/ucenter/userinfo/userinfo.vue
+++ b/pages/ucenter/userinfo/userinfo.vue
@@ -130,7 +130,6 @@
 				}
 			},
 			setAvatar() {
-				console.log('点击编辑信息');
 				uni.chooseImage({
 					count: 1,
 					success: (res) => {
-- 
GitLab