feat:update

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "customPlaygroundType" : "local",
+            "customPlaygroundType" : "device",
             "localRepoPath" : "E:/projects/yizhizan-h5",
             "packageName" : "uni.app.UNI0B0096D",
             "playground" : "custom",

App.vue

@@ -10,40 +10,6 @@ export default {
 	this.$queue.connectSocket()
 	that.$queue.changeTabbar(that.$queue.getData('userType')||1)
 	uni.removeStorageSync('filter')
-    // #ifdef APP-PLUS
-    // 检查是否首次启动 - 引导页逻辑
-    let firstUpload = uni.getStorageSync("firstUpload") || false;
-	let token = this.$queue.getData('token')
-	let userType = this.$queue.getData('userType')
-	let companyStatus = this.$queue.getData('companyStatus')
-    if (!firstUpload) {
-		// 跳转到引导页
-		uni.reLaunch({
-			url: "/pages/my/jobApplicant/startPage",
-			success: () => {
-				// 标记已经显示过引导页
-				uni.setStorageSync("firstUpload", true);
-			}
-		});
-		// 这里需要return，避免执行后面的代码
-		return;
-    } else if (
-		token && 
-		(!userType || (userType == 2 && companyStatus != 2))
-	) {
-		// 有登录token，但是没有userType，跳转选择角色页面，强制用户选择
-		// 有登录token，并且userType为2，但是公司状态没有通过
-		uni.reLaunch({
-			url: '/pages/my/jobApplicant/guidePage',
-		})
-		return
-	} else if (token && userType) {
-		// 已经登录，且有userType
-		uni.reLaunch({
-			url: '/pages/index/index',
-		})
-	}
-    // #endif
 
     // #ifdef APP || H5
     uni.setStorageSync("isDial", false);
@@ -154,11 +120,9 @@ export default {
 
             uni.setStorageSync("messageCount", messageCount);
 			
-			// // #ifdef APP-PLUS
-			// if (JPush && JPush.setBadge) {
-			// 	JPush.setBadge({ badge: messageCount })
-			// }
-			// // #endif
+			// #ifdef APP-PLUS
+			plus.runtime.setBadgeNumber(chatCount + messageCount)
+			// #endif
 
 			uni.$emit('chatUnreadCount', chatCount || 0)
             let num = chatCount + messageCount;
@@ -417,6 +381,41 @@ export default {
     }
 
     //#endif
+	
+	// #ifdef APP-PLUS
+	// 检查是否首次启动 - 引导页逻辑
+	let firstUpload = uni.getStorageSync("firstUpload") || false;
+	let token = this.$queue.getData('token')
+	let userType = this.$queue.getData('userType')
+	let companyStatus = this.$queue.getData('companyStatus')
+	if (!firstUpload) {
+		// 跳转到引导页
+		uni.reLaunch({
+			url: "/pages/my/jobApplicant/startPage",
+			success: () => {
+				// 标记已经显示过引导页
+				uni.setStorageSync("firstUpload", true);
+			}
+		});
+		// 这里需要return，避免执行后面的代码
+		return;
+	} else if (
+		token && 
+		(!userType || (userType == 2 && companyStatus != 2))
+	) {
+		// 有登录token，但是没有userType，跳转选择角色页面，强制用户选择
+		// 有登录token，并且userType为2，但是公司状态没有通过
+		uni.reLaunch({
+			url: '/pages/my/jobApplicant/guidePage',
+		})
+		return
+	} else if (token && userType) {
+		// 已经登录，且有userType
+		uni.reLaunch({
+			url: '/pages/index/index',
+		})
+	}
+	// #endif
   },
   onShow: function () {
     // uni.removeStorageSync('firstLogin');

common/config.js

@@ -1,6 +1,6 @@
 const h5Url='https://h5.bosszan.com'
 const ossUrl='https://yi-zhipin.oss-cn-hangzhou.aliyuncs.com/emoji/'
-let isProduction = false // 判断是否是生产环境
+let isProduction = true // 判断是否是生产环境
 if (isProduction) {
 	//正式环境
 	const ROOTPATH = "https://www.bosszan.com/sqx_fast";

manifest.json

@@ -196,7 +196,7 @@
                 "JPUSH_GOOGLE_STORAGE_BUCKET" : "",
                 "JPUSH_HONOR_APPID" : "104533692",
                 "JPUSH_HUAWEI_APPID" : "116155907",
-                "JPUSH_ISPRODUCTION_IOS" : "",
+                "JPUSH_ISPRODUCTION_IOS" : "true",
                 "JPUSH_MEIZU_APPID" : "",
                 "JPUSH_MEIZU_APPKEY" : "",
                 "JPUSH_OPPO_APPID" : "36598376",

package/screen/screen.vue

@@ -163,7 +163,8 @@
 			 */
 			selectHyList(index, name, info, ind) {
 				// 定义需要单选的类型
-				const singleSelectTypes = ['学历要求', '薪资范围（单选）', '经验要求'];
+				// const singleSelectTypes = ['学历要求', '薪资范围（单选）', '经验要求'];
+				const singleSelectTypes = ['薪资范围（单选）'];
 
 				if (singleSelectTypes.includes(name)) {
 					// 单选逻辑：先取消当前分类下所有选项的选中状态，再选中当前点击的选项
@@ -382,15 +383,29 @@
 							if (condition && uni.getStorageSync(key)) {
 								const storedData = uni.getStorageSync(key);
 								const selectedValues = [];
+								const selectedValuesList = [];
 								storedData.forEach(item => {
+									let obj = {
+										name: item.name,
+										list: []
+									}
 									item.list.forEach(ite => {
 										selectedValues.push(ite.value);
+										obj.list.push(ite.value)
 									});
+									selectedValuesList.push(obj)
 								});
+								console.log(selectedValuesList)
 
 								this.list.forEach(item => {
 									item.list.forEach(ite => {
-										if (selectedValues.includes(ite.value)) {
+										// if (selectedValues.includes(ite.value)) {
+										// 	ite.select = true;
+										// }
+										
+										const selectList = []
+										const obj = selectedValuesList.find(data => data.name == item.name)
+										if (obj && obj.list?.includes(ite.value)) {
 											ite.select = true;
 										}
 									});

pages/index/game/gameList.vue

@@ -296,7 +296,7 @@ export default {
     this.industry = condition.industry //行业
     this.salaryRange = condition.salaryRange //薪资
     this.companyPeople = condition.companyPeople //公司规模
-    this.getTypeList();
+    // this.getTypeList();
   },
   onUnload() {
     uni.$off('filterCity');
@@ -304,6 +304,9 @@ export default {
     uni.$off('updateScreenFilterRecord');
     uni.$off('updatePosition')
   },
+  onShow() {
+	  this.getTypeList();
+  },
   watch: {
     current(newData, oldData) {
       console.log(this.current)

pages/index/index.vue

@@ -977,7 +977,7 @@ export default {
 		if (this.city || true) {
 			if (this.userType == 1) {
 				if (this.current != this.typeList.length - 1) {
-					this.getPostType();
+					this.getPostType(true);
 				} else {
 					this.getComanyList()
 				}
@@ -1784,7 +1784,7 @@ export default {
 		/**
 		 * 工作性质
 		 */
-		getPostType() {
+		getPostType(notChangeCity = false) {
 			var that = this
 			if(that.preferenceChange){
 				return this.getUserList()
@@ -1831,7 +1831,7 @@ export default {
 							})
 						}
 						
-						if (this.current == index) {
+						if (this.current == index && !notChangeCity) {
 							this.city = item.citys
 						}
 					})
@@ -1856,6 +1856,8 @@ export default {
 					// console.log(this.typeList, '1111')
 					this.getUserList()
 				}
+			}).finally(() => {
+				uni.hideLoading()
 			})
 		},
 		/**

pages/jobManagement/jobManagement.vue

@@ -94,7 +94,7 @@
 			<!-- 关联已有企业，等待审核通过 -->
 			<template v-if="tipType == 1">
 				<view>请您等待企业审核通知</view>
-				<view>审核通过后即可立即发布岗位拉！</view>
+				<view>审核通过后即可立即发布岗位！</view>
 			</template>
 			
 			<!-- 新企业待审核 -->

pages/my/jobPostingSecond.vue

@@ -153,8 +153,20 @@ export default {
 				value: "不限"
 			},
 			{
-				label: "专科",
-				value: "专科"
+				label: "初中",
+				value: "初中"
+			},
+			{
+				label: "高中",
+				value: "高中"
+			},
+			{
+				label: "中专",
+				value: "中专"
+			},
+			{
+				label: "大专",
+				value: "大专"
 			},
 			{
 				label: "本科",

pages/public/invite/download.vue

@@ -32,8 +32,9 @@
 					if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { //安卓手机
 						this.showTip = true;
 					} else if (u.indexOf('iPhone') > -1) { //苹果手机
-						window.location.href = 'https://apps.apple.com/cn/app/%E4%BA%BF%E8%81%8C%E8%B5%9E/id6756013968'
+						// window.location.href = 'https://apps.apple.com/cn/app/%E4%BA%BF%E8%81%8C%E8%B5%9E/id6756013968'
 						// this.$queue.showToast('iOS系统请在APPStore搜索“亿职赞”');
+						this.showTip = true;
 					}
 				} else {
 					if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { //安卓手机

pages/talentSearch/index.vue

@@ -38,11 +38,12 @@
 					</view>
 
 
-
-					<view class="qySx-sx-box-filter flex align-center" v-if="education || salaryRange || experience">
-						<text v-if="education" class="qySx-sx-box-filter-text">{{education}}</text>
-						<text v-if="salaryRange" class="qySx-sx-box-filter-text">{{salaryRange}}</text>
-						<text v-if="experience" class="qySx-sx-box-filter-text">{{experience}}</text>
+					<view class="scroll-wrapper">
+						<view class="qySx-sx-box-filter flex align-center" v-if="education || salaryRange || experience">
+							<text v-if="education" class="qySx-sx-box-filter-text">{{education}}</text>
+							<text v-if="salaryRange" class="qySx-sx-box-filter-text">{{salaryRange}}</text>
+							<text v-if="experience" class="qySx-sx-box-filter-text">{{experience}}</text>
+						</view>						
 					</view>
 
 
@@ -211,7 +212,7 @@
 			// 获取状态栏高度
 			let systemInfo = uni.getSystemInfoSync();
 			this.statusBarHeight = systemInfo.statusBarHeight || 0;
-			this.getCompanyClassify()
+			// this.getCompanyClassify()
 			//this.getPeopList()
 			this.jobStatusList = this.$queue.resumesStatus()
 		},
@@ -236,39 +237,45 @@
 							arr.push(ite.value)
 						}
 					})
+					const arrStr = arr.join(',')
+					const NOT_LIMIT = '不限'
 					console.log(item)
 
 					switch (item.name) {
 						case '学历要求':
-
 							//this.education = arr.join(',')
-							this.education = item.list[0].value == '不限' ? '' : item.list[0].value
+							// this.education = item.list[0].value == '不限' ? '' : item.list[0].value
+							this.education = arrStr == NOT_LIMIT ? '' : arrStr
 							break;
 						case '薪资范围（单选）':
 							//this.salaryRange = arr.join(',')
 
-							this.salaryRange = item.list[0].value == '不限' ? '' : item.list[0].value
+							// this.salaryRange = item.list[0].value == '不限' ? '' : item.list[0].value
+							this.salaryRange = arrStr == NOT_LIMIT ? '' : arrStr
 							break;
 						case '经验要求':
 							//this.experience = arr.join(',')
 
-							this.experience = item.list[0].value == '不限' ? '' : item.list[0].value
+							// this.experience = item.list[0].value == '不限' ? '' : item.list[0].value
+							this.experience = arrStr == NOT_LIMIT ? '' : arrStr
 							break;
 						case '公司规模':
 							//this.companyPeople = arr.join(',')
 
-							this.companyPeople = item.list[0].value == '不限' ? '' : item.list[0].value
+							// this.companyPeople = item.list[0].value == '不限' ? '' : item.list[0].value
+							this.companyPeople = arrStr == NOT_LIMIT ? '' : arrStr
 							break;
 						case '行业':
 							//this.industry = arr.join(',')
 
-							this.industry = item.list[0].value == '不限' ? '' : item.list[0].value
+							// this.industry = item.list[0].value == '不限' ? '' : item.list[0].value
+							this.industry = arrStr == NOT_LIMIT ? '' : arrStr
 							break;
 					}
 
 				})
 				console.log(this.experience)
-				this.getPeopList()
+				// this.getPeopList()
 
 
 			} else {
@@ -278,9 +285,9 @@
 				this.salaryRange = '' //薪资
 				this.companyPeople = '' //公司规模
 				// this.getCompanyClassify()
-				this.getPeopList()
+				// this.getPeopList()
 			}
-
+			this.getCompanyClassify()
 
 
 		},
@@ -354,10 +361,25 @@
 						]
 						if (res.data.length == 0) {
 							if(uni.getStorageSync('companyId')&&uni.getStorageSync('companyId')!='null')
-							uni.navigateTo({
-								url: '/pages/my/jobPosting?companyId=' + uni.getStorageSync('companyId') + '&status=' + this
-									.companyStatus + '&companyName=' + this.companyName
-							})
+							// uni.redirectTo({
+							// 	url: '/pages/my/jobPosting?companyId=' + uni.getStorageSync('companyId') + '&status='
+							// })
+								uni.showModal({
+									title: '提示',
+									content: '暂无招聘岗位，是否立即发布岗位？',
+									success: modalData => {
+										console.log(modalData)
+										if (modalData.confirm) {
+											uni.navigateTo({
+												url: '/pages/my/jobPosting?companyId=' + uni.getStorageSync('companyId') + '&status='
+											})
+										} else {
+											uni.switchTab({
+												url: '/pages/my/index'
+											})
+										}
+									}
+								})
 							else
 							this.$queue.showToast('请先进行企业认证')
 						}
@@ -706,6 +728,11 @@
 		
 		border-radius: 8px;
 		padding: 24rpx;
+		
+		.scroll-wrapper {
+			width: 420rpx;
+			overflow-x: scroll;
+		}
 
 		.qySx-sx-box-l-i {
 			color: rgba(153, 153, 153, 1);