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

common/queue.js

@@ -531,6 +531,4 @@ module.exports = {
 	    });
 	  });
 	}
-
-
 };

manifest.json

@@ -149,6 +149,10 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true,
+                "androidStyle" : "common"
             }
         },
         "nvueCompiler" : "uni-app",

pages/index/index.vue

@@ -629,7 +629,7 @@
 			this.statusBarHeight = systemInfo.statusBarHeight || 0;
 			this.companyId = uni.getStorageSync('companyId');
 			// #ifdef APP
-			this.getAudioPermision()
+			/* this.getAudioPermision() */
 			// #endif
 			// 获取邀请码保存到本地
 			if (e.invitation) {
@@ -798,7 +798,6 @@
 			}
 			if (this.token) {
 				this.getUserInfo();
-
 				if (this.userType == 1) {
 					this.getJobType();
 				} else {
@@ -1223,7 +1222,7 @@
 					page: this.page,
 					limit: this.limit,
 					postType: '', //工作性质
-					expectedPosition: this.jobSxTypeList[this.currentJobSx].projectName, //岗位名称
+					expectedPosition: this.jobSxTypeList.length>0?this.jobSxTypeList[this.currentJobSx].projectName:'', //岗位名称
 					screen: +this.currentJobSxs + 1, //1推荐 2最新
 					expectedCity: this.city == '全国' ? '' : this.city, //城市
 					salaryRange: this.salaryRange, //薪资范围
@@ -1389,7 +1388,7 @@
 					page: this.page,
 					limit: this.limit,
 					//postType: this.typeList.length > 0 ? this.typeList[this.current].id : '',
-					ruleClassifyName: this.typeList[this.current].name, //岗位名称
+					ruleClassifyName: this.typeList.length>0?this.typeList[this.current].name:'', //岗位名称
 					screen: +this.currentSx + 1, //1推荐 2最新
 					county: this.county, //区
 					city: this.city == '全国' ? '' : this.city, //城市

pages/msg/im.vue

@@ -875,6 +875,7 @@
 	import configdata from '../../common/config.js';
 	import emoji from '../../common/emoji.json';
 	import attachment from '../../components/attachment.vue'
+	import permision from '@/js_sdk/wa-permission/permission.js'
 	export default {
 		components: {
 			attachment
@@ -1109,6 +1110,9 @@
 				}
 				uni.hideLoading();
 			});
+			// #ifdef APP
+				this.getAudioPermision()
+			// #endif
 		},
 		onShow() {
 			if (this.chatConversationId) {
@@ -1155,6 +1159,19 @@
 			goBack() {
 				uni.navigateBack();
 			},
+			//获取麦克风/摄像头权限
+			async getAudioPermision() {
+				let status = permision.isIOS ? await permision.judgeIosPermission("record") : await permision
+					.requestAndroidPermission("android.permission.RECORD_AUDIO")
+				let status2 = permision.isIOS ? await permision.judgeIosPermission("camera") : await permision
+					.requestAndroidPermission("android.permission.CAMERA")
+				if (status === null || status === 1 || status == true) { //已经同意授权
+					console.log('获取到权限了')
+			
+				} else { //未授权的
+					this.popupshowsq = true
+				}
+			},
 			// 显示更多选项
 			showMoreOptions() {
 				return this.$queue.showToast('waiting...')