lyuis 7 months ago
parent
commit
d139a36eec

+ 17 - 17
common/queue.js

@@ -577,27 +577,27 @@ module.exports = {
 	            }
 	            
 	            const iosPermissions = permisionIosID.split(',');
-	            let allGranted = true;
+	            let allGranted = 0;
 	            
 	            for (let i = 0; i < iosPermissions.length; i++) {
 	                const currentPermission = iosPermissions[i];
-	                const result = permision.judgeIosPermission(currentPermission);
-	                console.log(`iOS权限 ${currentPermission}:`, result);
-	                
-	                if (!result) {
-	                    allGranted = false;
-	                    console.log(`未获得 ${currentPermission} 授权`);
-	                    
-	                    // 特殊处理相机和相册权限
-	                    /* if (currentPermission == 'camera' || currentPermission == 'photoLibrary') {
-	                        that.$refs.camera?.open();
-	                    } */
-	                } else {
-	                    console.log(`已获得 ${currentPermission} 授权`);
-	                }
+	                allGranted = permision.judgeIosPermission(currentPermission);
+	                console.log('权限状态码:',allGranted)
 	            }
-	            
-	            resolve(allGranted);
+				if(allGranted==0){
+					console.log('第一次授权')
+					resolve(true);
+				}else if(allGranted==3){
+					console.log('已授权')
+					resolve(true);
+				}else{
+					this.appConfirm("权限被拒绝," + tip, function(res) {
+						if (res) {
+							uni.openAppAuthorizeSetting();
+						}
+						resolve(false);
+					});
+				}
 	        }
 	    });
 	}

+ 5 - 4
components/attachment.vue

@@ -8,9 +8,9 @@
 				<scroll-view scroll-with-animation scroll-y>
 				<!-- 我的公司 -->
 					<view @click="select(item)" class="usermain-item item-padding" v-for="item in content">
-						<view class="usermain-item-title c-flex-center"><image src="../static/images/pdf.svg" class="header-icon" /></view>
+						<view class="usermain-item-title c-flex-center"><image :src="item.attachmentName.split('.').pop().toLowerCase() == 'pdf' ? '../../static/images/pdf.svg' : '../../static/images/docx.svg'" class="header-icon" /></view>
 						<view  class="fileContent c-flex-center">
-							<view class="fileName">{{item.attachmentName}}</view>
+							<view class="fileName m-ellipsis">{{item.attachmentName}}</view>
 							<view class="filedesc">{{item.attachmentSize}}kb 更新于{{item.createTime}}</view>
 						</view>
 						<view @click.stop="seekDoc(item)" class="c-flex-center">
@@ -102,10 +102,10 @@
 		padding: 30rpx 0;
 		// border-bottom: 1rpx solid rgba(229, 229, 229, 0.3);
 		background: #fff;
-		gap: 16rpx;
+		flex: 1;
 		.fileContent{
 			width: 80%;
-			margin:0 20rpx;
+			margin:0 15rpx;
 		}
 		.fileName{
 			color: #222;
@@ -118,6 +118,7 @@
 		.c-flex-center{
 			align-self: center;
 			color: #aaa;
+			flex-shrink: 0;
 			.seekview{
 				white-space: nowrap;
 				color: #888;

+ 16 - 46
js_sdk/wa-permission/permission.js

@@ -9,7 +9,7 @@ isIos = (plus.os.name == "iOS")
 
 // 判断推送权限是否开启
 function judgeIosPermissionPush() {
-	var result = false;
+	var result = 0;
 	var UIApplication = plus.ios.import("UIApplication");
 	var app = UIApplication.sharedApplication();
 	var enabledTypes = 0;
@@ -20,7 +20,7 @@ function judgeIosPermissionPush() {
 		if (enabledTypes == 0) {
 			console.log("推送权限没有开启");
 		} else {
-			result = true;
+			result = 3;
 			console.log("已经开启推送功能!")
 		}
 		plus.ios.deleteObject(settings);
@@ -29,7 +29,7 @@ function judgeIosPermissionPush() {
 		if (enabledTypes == 0) {
 			console.log("推送权限没有开启!");
 		} else {
-			result = true;
+			result = 3;
 			console.log("已经开启推送功能!")
 		}
 		console.log("enabledTypes2:" + enabledTypes);
@@ -44,7 +44,7 @@ function judgeIosPermissionLocation() {
 	var result = false;
 	var cllocationManger = plus.ios.import("CLLocationManager");
 	var status = cllocationManger.authorizationStatus();
-	result = (status != 2)
+	result = status
 	console.log("定位权限开启:" + result);
 	// 以下代码判断了手机设备的定位是否关闭,推荐另行使用方法 checkSystemEnableLocation
 	/* var enable = cllocationManger.locationServicesEnabled();
@@ -68,10 +68,13 @@ function judgeIosPermissionRecord() {
 	var avaudio = avaudiosession.sharedInstance();
 	var permissionStatus = avaudio.recordPermission();
 	console.log("permissionStatus:" + permissionStatus);
-	if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
+	if (permissionStatus == 1970168948) {
+		result=0
 		console.log("麦克风权限没有开启");
+	}else if(permissionStatus == 1684369017){
+		result=2
 	} else {
-		result = true;
+		result = 3;
 		console.log("麦克风权限已经开启");
 	}
 	plus.ios.deleteObject(avaudiosession);
@@ -80,79 +83,46 @@ function judgeIosPermissionRecord() {
 
 // 判断相机权限是否开启
 function judgeIosPermissionCamera() {
-	var result = false;
 	var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
 	var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
 	console.log("authStatus:" + authStatus);
-	if (authStatus == 3) {
-		result = true;
-		console.log("相机权限已经开启");
-	} else {
-		console.log("相机权限没有开启");
-	}
 	plus.ios.deleteObject(AVCaptureDevice);
-	return result;
+	return authStatus;
 }
 
 // 判断相册权限是否开启
 function judgeIosPermissionPhotoLibrary() {
-	var result = false;
 	var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
 	var authStatus = PHPhotoLibrary.authorizationStatus();
 	console.log("authStatus:" + authStatus);
-	if (authStatus == 3) {
-		result = true;
-		console.log("相册权限已经开启");
-	} else {
-		console.log("相册权限没有开启");
-	}
+	
 	plus.ios.deleteObject(PHPhotoLibrary);
-	return result;
+	return authStatus;
 }
 
 // 判断通讯录权限是否开启
 function judgeIosPermissionContact() {
-	var result = false;
 	var CNContactStore = plus.ios.import("CNContactStore");
 	var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
-	if (cnAuthStatus == 3) {
-		result = true;
-		console.log("通讯录权限已经开启");
-	} else {
-		console.log("通讯录权限没有开启");
-	}
+
 	plus.ios.deleteObject(CNContactStore);
-	return result;
+	return cnAuthStatus;
 }
 
 // 判断日历权限是否开启
 function judgeIosPermissionCalendar() {
-	var result = false;
 	var EKEventStore = plus.ios.import("EKEventStore");
 	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
-	if (ekAuthStatus == 3) {
-		result = true;
-		console.log("日历权限已经开启");
-	} else {
-		console.log("日历权限没有开启");
-	}
 	plus.ios.deleteObject(EKEventStore);
-	return result;
+	return ekAuthStatus;
 }
 
 // 判断备忘录权限是否开启
 function judgeIosPermissionMemo() {
-	var result = false;
 	var EKEventStore = plus.ios.import("EKEventStore");
 	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
-	if (ekAuthStatus == 3) {
-		result = true;
-		console.log("备忘录权限已经开启");
-	} else {
-		console.log("备忘录权限没有开启");
-	}
 	plus.ios.deleteObject(EKEventStore);
-	return result;
+	return ekAuthStatus;
 }
 
 // Android权限查询

+ 2 - 1
manifest.json

@@ -25,7 +25,8 @@
             "Maps" : {},
             "Push" : {},
             "Geolocation" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Record" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

+ 1 - 0
package/jobIntention/addExpectation.vue

@@ -351,6 +351,7 @@ export default {
 		        uni.showToast({ title: "保存成功", icon: "none" });
 		        // 实际开发中可以在这里添加跳转逻辑
 				uni.$emit('updateResume')
+				uni.$emit('updateIndexType')
 		      setTimeout(() => {
 		        uni.navigateBack()
 		      }, 1000);

+ 1 - 0
package/jobIntention/tagManage.vue

@@ -206,6 +206,7 @@ export default {
 										  return item[modules=='workExps'?'workExpId':(modules=='intentions'?'intentionId':'eduId')] != id;
 										});
 										that.detail[modules]=info
+										uni.$emit('updateIndexType')
 				  } else {
 				    uni.showToast({
 				      title: res.msg,

+ 6 - 6
pages/msg/im.vue

@@ -33,7 +33,7 @@
 				</view>
 				
 				<!-- 右侧更多按钮 -->
-				<view class="navbar-right" @click="showMoreOptions">
+				<view v-if="false" class="navbar-right" @click="showMoreOptions">
 					<u-icon name="more-dot-fill" size="38" color="#333"></u-icon>
 				</view>
 			</view>
@@ -577,22 +577,22 @@
 					</view>
 					<!-- #ifdef H5 || APP -->
 					<!-- 语音 -->
-					<view style="margin-bottom: 20rpx;">
+					<view v-if="isVip" style="margin-bottom: 20rpx;">
 						<view class="box" @tap="sendCallVideo(1)">
 							<image src="../../static/im/yuyin.svg" mode=""
 								style="width: 48rpx;height: 48rpx;">
 							</image>
 						</view>
-						<view style="width: 100%;text-align: center;color: #999;font-size: 20rpx;">语音</view>
+						<view style="width: 100%;text-align: center;color: #999;font-size: 20rpx;">语音通话</view>
 					</view>
 					<!-- 视频 -->
-					<view style="margin-bottom: 20rpx;">
+					<view v-if="false" style="margin-bottom: 20rpx;">
 						<view class="box" @tap="sendCallVideo(2)">
 							<image src="../../static/im/shipin.svg" mode=""
 								style="width: 48rpx;height: 48rpx;">
 							</image>
 						</view>
-						<view style="width: 100%;text-align: center;color: #999;font-size: 20rpx;">语音通话</view>
+						<view style="width: 100%;text-align: center;color: #999;font-size: 20rpx;">视频通话</view>
 					</view>
 					<!-- #endif -->
 					<!-- 常用语 -->
@@ -2696,7 +2696,7 @@
 				
 				uni.chooseImage({
 					count: 1,
-					sourceType: ['album'],
+					sourceType: ['album','camera'],
 					success: res => {
 						for (let i = 0; i < res.tempFilePaths.length; i++) {
 							this.$queue.showLoading("上传中...");

+ 4 - 4
pages/my/index.vue

@@ -135,14 +135,14 @@
 						</view>
 					</view>
 					<!-- 推广横幅 -->
-					<view class="promo-banner">
+					<view class="promo-banner" @click="goBusinessLicense(0)">
 						<view class="banner-content">
 							<view class="banner-text">
 								<text class="banner-title">牛人找资金</text>
 								<text class="banner-subtitle">带上你的超级项目,这里有无限的可能</text>
 							</view>
 							<view class="banner-button">
-								<text class="button-text" @click="goBusinessLicense(0)">立即参与</text>
+								<text class="button-text">立即参与</text>
 							</view>
 						</view>
 					</view>
@@ -510,14 +510,14 @@
 					</view>
 
 					<!-- 推广横幅 -->
-					<view class="promo-banner">
+					<view class="promo-banner" @click="goBusinessLicense(1)">
 						<view class="banner-content">
 							<view class="banner-text">
 								<text class="banner-title">资金找项目</text>
 								<text class="banner-subtitle">亿职赞,为您提供前程似锦的优质项目</text>
 							</view>
 							<view class="banner-button">
-								<text class="button-text" @click="goBusinessLicense(1)">立即参与</text>
+								<text class="button-text">立即参与</text>
 							</view>
 						</view>
 					</view>

+ 1 - 1
pages/public/login.vue

@@ -45,7 +45,7 @@
         手机号登录
       </button> -->
 			<!-- #ifdef APP -->
-			<view v-if="isAndroid" class="login-btn wechat" :class="{ disabled: !checked }" :disabled="checked" @click="wxAppLogin">
+			<view v-if="isAndroid||true" class="login-btn wechat" :class="{ disabled: !checked }" :disabled="checked" @click="wxAppLogin">
 				<image src="@/static/images/jobApplicant/wx.svg" mode="scaleToFill" />微信登录
 			</view>
 			<!-- #endif -->