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) }"
-						@click="togglePreference(item)"
+						:class="{ active: selectedPreferences.includes(item.preferenceName) }"
+						@click="togglePreference(item.preferenceName)"
 					>
-						<text>{{ item }}</text>
+						<text>{{ item.preferenceName }}</text>
 					</view>
 				</view>
 			</view>
@@ -50,13 +50,9 @@ export default {
 		return {
 			jobTitle: '岗位',
 			jobId:'',
-			selectedPreferences: ['独立站'],
+			selectedPreferences: [],
 			preferenceOptions: [
-				'精品铺货', '独立站', '3C数码', '美妆日用', '服装配饰', '家居用品',
-				'户外运动', '母婴用品', '食品饮料', '宠物用品', '汽车用品', '图书文具',
-				'数码配件', '办公用品', '礼品玩具', '健康保健', '珠宝首饰', '箱包皮具',
-				'手表眼镜', '乐器音响', '摄影摄像', '运动健身', '旅游出行', '教育培训',
-				'金融服务', '生活服务', '其他'
+				
 			]
 		}
 	},
@@ -77,16 +73,9 @@ export default {
 			let data = {
 				ruleClassifyId:this.jobId
 			}
-			var action=this.jobId==''||this.jobId==0?'/app/userFirst/selectSkill':'/app/userFirst/getPostSkill'
-			this.$Request.getT(action,data).then(res => {
+			this.$Request.getT('/app/postPreference/getPostPreference',data).then(res => {
 				if(res.code==0){
-					if(this.jobId==''||this.jobId==0){
-						res.data.forEach(function(item){
-							item.postSkillName=item.skillName
-						})
-						this.operationOptions =[{childrenList:res.data,postSkillName:''}]
-					}else
-					this.operationOptions = res.data
+					this.preferenceOptions = res.data
 				}
 			})
 		},
@@ -115,11 +104,6 @@ export default {
 				preferences: this.selectedPreferences,
 				set
 			})
-			
-			uni.showToast({
-				title: '偏好设置已保存',
-				icon: 'success'
-			})
 		}
 	}
 }
@@ -206,7 +190,7 @@ export default {
 
 .preference-tag {
 	width: calc((100% - 72rpx) / 7);
-	padding: 8rpx 6rpx;
+	padding: 8rpx 12rpx;
 	background: #F7F8FA;
 	border: 1rpx solid #F7F8FA;
 	border-radius: 12rpx;
@@ -214,7 +198,7 @@ export default {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	
+	word-break: break-all;
 	text {
 		font-size: 18rpx;
 		color: rgba(102, 102, 102, 1);

package/records/records.vue

@@ -419,7 +419,7 @@ export default {
       let data = {
         page: this.page,
         limit: this.limit,
-        userId: uni.getStorageSync("userId"),
+        /* userId: uni.getStorageSync("userId"), */
         education: this.filter.education, //学历
         salaryRange: this.filter.salaryRange, //薪资
         experience: this.filter.experience, //经验

package/search/search.vue

@@ -156,18 +156,18 @@
 				<view class="gwList flex justify-center" v-if="dataList.length>0">
 					<view class="gwList-box">
 						<scroll-view scroll-y="true" style="width: 100%;height: 100%;">
-							<view class="box" v-for="(item,index) in dataList" :key="index">
-							<view class="gwList-box-item company" @click="gotoInfo(item.postPushId)">
+							<view class="box" v-for="(item,index) in dataList" :key="'company'+index">
+							<view class="gwList-box-item company" @click="goTo('/my/enterpriseInfo/enterpriseInfo?companyId=' + item.companyId)">
 								<view class="gwList-box-item-box">
 									<view class="gwList-box-item-box-title flex justify-between align-center">
-										<u-avatar src="../../static/images/index/jipinIcom.svg" class="jipin-icon" ></u-avatar>
+										<u-avatar :src="item.companyLogo?item.companyLogo:'../../static/images/index/jipinIcom.svg'" class="jipin-icon" ></u-avatar>
 										<view class="gwList-box-item-box-info-l">
-											<view class="companyTitle">{{item.companyName}}</view>
+											<view class="companyTitle">{{item.companyAllName}}</view>
 											<view class="company-info-text">
 												{{item.companyPeople}} · {{item.companyScope}}
 											</view>
 											<view class="company-info-text">
-												{{item.workTime}} · <text v-for="we in item.welfare">{{we}} · </text> 
+												{{item.workTime}} <text v-if="item.welfare.length>0">·</text> <text v-for="(we,i) in item.welfare" :key="'welfare'+i">{{we}} <text v-if="i<item.welfare.length-1">·</text> </text> 
 											</view>
 										</view>
 										<view class="goRight">
@@ -176,8 +176,8 @@
 									</view>
 								</view>
 							</view>
-							<view class="gwList-box-item companyPost" v-for="(it,ind) in item.postPushList" :key="index">
-								<view class="gwList-box-item-box">
+							<view class="gwList-box-item companyPost" v-for="(it,ind) in item.postPushList" :key="'post'+ind">
+								<view class="gwList-box-item-box" @click="goTo('/pages/index/game/order?postPushId=' + it.postPushId)">
 									<!-- 标题-薪资 -->
 									<view class="gwList-box-item-box-info flex justify-between align-center">
 										<view class="gwList-box-item-box-info-l">
@@ -196,7 +196,7 @@
 								
 								</view>
 							</view>
-							<view v-if="item.postPushList.length>3" class="gwList-box-item companyPost">
+							<view v-if="item.postPushList.length>3" class="gwList-box-item companyPost" @click="goTo('/my/enterpriseInfo/enterpriseInfo?companyId=' + item.companyId)">
 								<view class="gwList-box-item-box">
 									<!-- 标题-薪资 -->
 									<view class="morePost">查看更多职位</view>
@@ -282,12 +282,14 @@
 				],
 				showSortModalFlag: false,
 				selectedSort: 0,
-				sortOptions: ['综合排序', '最新优先', '距离优先']
+				sortOptions: ['综合排序', '最新优先', '距离优先'],
+				filter:'筛选'
 			};
 		},
 		watch: {
 			currentSx(newData, oldData) {
 				this.page = 1
+				this.dataList=[]
 				this.getUserList();
 			},
 		},
@@ -385,6 +387,8 @@
 			
 			//判断岗位名称与职位名称是否相同（不区分大小写）
 			isSameName(className, name) {
+				if(!className||!name)
+					return;
 				let str1 = className.trim();
 				let str2 = name.trim();
 				if (str1.length !== str2.length) {
@@ -406,6 +410,20 @@
 				}
 
 			},
+			goTo(action){
+				if (uni.getStorageSync('token')) {
+					uni.navigateTo({
+						url: action,
+						success(e) {
+							console.log(e)
+						},fail(e) {
+							console.log(e)
+						}
+					})
+				} else {
+					this.noLogin()
+				}
+			},
 			//我的搜索关键词
 			getMyRecordList() {
 				this.$Request.get('/app/record/getMyRecordList', {
@@ -477,6 +495,8 @@
 					lat: this.latitude,
 					userId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : ''
 				}
+				if(this.currentSx==1)
+					data.keyword=this.keyword
 				let action=this.currentSx==1?'/app/company/listCompany':'/app/postPush/userGetPostPushList'
 				
 				this.$Request.get(action, data).then(res => {
@@ -563,16 +583,6 @@
 				// 这里可以添加排序逻辑
 				this.getUserList();
 			},
-			
-			// 判断分类名称和职位名称是否相同
-			isSameName(className, name) {
-				let str1 = className.trim();
-				let str2 = name.trim();
-				if (str1.length !== str2.length) {
-					return true;
-				}
-				return str1.toLowerCase() !== str2.toLowerCase();
-			},
 		},
 	}
 </script>
@@ -1099,6 +1109,11 @@
 				padding: 20rpx;
 				background:#fff;
 				margin-bottom:0rpx;
+				.gwList-box-item-box-info-l{
+					width: 80%;
+					margin-left:20rpx;
+					margin-right: 20rpx;
+				}
 			}
 			.companyPost{
 				padding: 20rpx;

pages/my/onlineResume.vue

@@ -233,7 +233,7 @@
 			uni.$on('skillsUpdated', (data) => {
 				if(data.set!=1)
 					return
-				that.changeSkill(data.skills)
+				that.changeSkill(data.selectedTags)
 			})
 			uni.$on('preferenceUpdated', (data) => {
 				if(data.set!=1)

pages/my/workExperience.vue

@@ -252,7 +252,7 @@ export default {
 		uni.$on('skillsUpdated', (data) => {
 			console.log('技能设置已更新:', data)
 			// 这里可以更新对应的技能显示
-			this.formData.resumes[this.operateKey].skills=data.skills
+			this.formData.resumes[this.operateKey].skills=data.selectedTags
 		})
 	},
 	beforeDestroy() {
@@ -362,7 +362,7 @@ export default {
 			if(this.formData.resumes[index].positionId==''||this.formData.resumes[index].positionId==0)
 			return this.$queue.showToast('请先选择岗位')
 			uni.navigateTo({
-				url:'/package/jobIntention/jobSkills??jobId='+this.this.formData.resumes[index].positionId+'&jobTitle='+this.formData.resumes[index].position+'&skill='+encodeURIComponent(JSON.stringify(this.formData.resumes[index].skills))
+				url:'/package/jobIntention/jobSkills?jobId='+this.formData.resumes[index].positionId+'&jobTitle='+this.formData.resumes[index].position+'&skill='+encodeURIComponent(JSON.stringify(this.formData.resumes[index].skills))
 			})
 		},
 		removeSkill(resumeIndex, skillIndex) {