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

package/jobIntention/preferenceSetting.vue

@@ -25,10 +25,10 @@
 						v-for="(item, index) in preferenceOptions" 
 						:key="index"
 						class="preference-tag"
-						:class="{ active: selectedPreferences.includes(item.preferenceName) }"
-						@click="togglePreference(item.preferenceName)"
+						:class="{ active: selectedPreferences.includes(item.postSkillName) }"
+						@click="togglePreference(item.postSkillName)"
 					>
-						<text>{{ item.preferenceName }}</text>
+						<text>{{ item.postSkillName }}</text>
 					</view>
 				</view>
 			</view>
@@ -77,7 +77,7 @@ export default {
 			let data = {
 				ruleClassifyId:this.jobId
 			}
-			this.$Request.getT('/app/postPreference/getPostPreference',data).then(res => {
+			this.$Request.getT('/app/userFirst/getPostSkill',data).then(res => {
 				if(res.code==0){
 					this.preferenceOptions = res.data
 				}
@@ -193,7 +193,7 @@ export default {
 }
 
 .preference-tag {
-	width: calc((100% - 72rpx) / 7);
+	// width: calc((100% - 72rpx) / 7);
 	padding: 8rpx 12rpx;
 	background: #F7F8FA;
 	border: 1rpx solid #F7F8FA;

pages/msg/im.vue

@@ -400,7 +400,7 @@
 							:src="ossUrl +item.content"
 							style="height: 80rpx;width: 80rpx;margin-left: 20rpx;"></image>
 
-						<view v-if="item.content && item.messageType === 3" class="chat-listitem-text bubble voice"
+						<view v-if="item.content && item.messageType === 3" class="chat-listitem-text bubble voice textColorLeft"
 							:class="playMsgid == index?'play':''"
 							style="margin-left: 20rpx;display: flex;align-items: center;"
 							@tap="playVoice(item.content,index)">
@@ -3176,7 +3176,11 @@
 		border-radius: 16px 16px 0px 16px;
 		background: rgba(1, 107, 246, 1);
 	}
-
+	.textColorLeft{
+		color: #000;
+		border-radius: 16px 16px 0px 16px;
+		background: #fff;
+	}
 	.chat-listitem-text {
 		// color: #FFFFFF;
 

pages/my/index.vue

@@ -854,7 +854,8 @@ export default {
 			token: "",
 			companyInfo: "",
 			companyStatus: "", //企业认证状态（1:审核中 2:已通过 3:已拒绝 空：未认证）
-			isAndroid: false
+			isAndroid: false,
+			iosAudit:1
 		};
 	},
 	onLoad(e) {