diff --git a/components/page/pageComponents/goodsStyle.vue b/components/page/pageComponents/goodsStyle.vue
index 9bae654..8e15930 100644
--- a/components/page/pageComponents/goodsStyle.vue
+++ b/components/page/pageComponents/goodsStyle.vue
@@ -17,8 +17,8 @@
 				:style="{ padding: issearch === '1' ? '10rpx 30rpx' : !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }"
 			>
 				<view class="goodsBox-left m-right20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
-					<block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #82d0f7;">抢购</view></block>
-					<block v-else>
+					<!-- <block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #82d0f7;">抢购</view></block> -->
+					<block>
 						<block v-if="isdiyPageParams.marker_set === '1'">
 							<view class="marker_set col-f f-24" :style="{ backgroundColor: isdiyPageStyle.marker_bg, color: isdiyPageStyle.marker_color }">抢购</view>
 						</block>
diff --git a/components/template/filtertab.vue b/components/template/filtertab.vue
index f8222e2..d9fba68 100644
--- a/components/template/filtertab.vue
+++ b/components/template/filtertab.vue
@@ -10,9 +10,11 @@
 		<view class="pop-mask" v-if="is_openTabbar" @click="close"></view>
 		<view :class="isPageScroll==='1'&& is_openTabbar?'isPageScroll':'p-r'">
 			<view class="tabBar-list dis-flex b-f" :class="{'border-line':is_openTabbar,'border-bottom':is_openTabbar}">
-				<block v-for="(tabItem,index) in SelectInfo.top" :key="index" v-if="index < 3">
-					<view class="tabBar-item dis-flex flex-x-center flex-y-center f-28 flex-box" :style="currentType===tabItem.subscript?'color:#FF4444;':'color:#333333'"
-					 @click="openTabbar(tabItem.subscript)" v-if="tabItem.status===1 && (requestType ==1 && index!=0)">
+				<block v-for="(tabItem,index) in SelectInfo.top" :key="index" v-if="index<3">
+					<view class="tabBar-item dis-flex flex-x-center flex-y-center f-28 flex-box"
+					 :style="currentType===tabItem.subscript?'color:#FF4444;':'color:#333333'"
+					 @click="openTabbar(tabItem.subscript)" v-if="tabItem.status===1">
+					 <!-- 改了v-if="tabItem.status===1 && (requestType ==1 && index!=0)"，改成以上 -->
 						<view class="m-right10 onelist-hidden tabBar-itemTitle">{{(title && index ==1 && requestType!= '文章头条' )?title:(title && index ==0 && requestType== '文章头条' )?title:tabItem.title}}</view>
 						<view class="iconfont" :class="currentType===tabItem.subscript?'icon-fold':'icon-unfold'"></view>
 					</view>
@@ -191,7 +193,9 @@
 		data() {
 			return {
 				is_openTabbar: false,
-				SelectInfo: {},
+				SelectInfo: {
+					top: []
+				},
 				currentType: null,
 				cityData: {},
 				city_id: null,
@@ -228,7 +232,9 @@
 			this.getSelectInfo();
 			this.agencyData = uni.getStorageSync('agencyData');
 			
-			
+			setTimeout(()=>{
+				console.log(this.SelectInfo.top, '--------');
+			}, 10000)
 		},
 		components:{
 			wPicker
@@ -354,7 +360,7 @@
 				this.$emit('getcityWork',item.id);
 				this.SelectInfo.top.map(items=>{
 										if(items.subscript == 'nwe_area' || items.subscript == 'area_id'){
-											items.title = item.name;
+											items.title = item.name;//临时注释测试
 										}
 									})
 				this.close();
@@ -370,7 +376,7 @@
 					_this.areaList = [];
 					this.SelectInfo.top.map(items=>{
 											if(items.subscript == 'nwe_area' || items.subscript == 'area_id'){
-												items.title = item.name;
+												items.title = item.name;//临时注释测试
 											}
 										})
 					return
@@ -392,7 +398,7 @@
 					_this.$emit('getcityWork',item.id);
 					this.SelectInfo.top.map(items=>{
 						if(items.subscript == 'nwe_area' || items.subscript == 'area_id'){
-							items.title = item.name;
+							items.title = item.name;//临时注释测试
 						}
 					})
 					return
@@ -505,6 +511,7 @@
 					this.getindustryFour(0,this.industryThree[0]);
 				})
 			},
+			/*获取二级行业信息*/
 			getindustryTwo(index,items){
 				this.industryTwo = [];
 				this.industryThree = [];
@@ -569,6 +576,7 @@
 				this.is_openTabbar = false;
 				this.currentType = null;
 			},
+			/* 获取行业信息*/
 			getindustry(url){
 				// 
 				this.industryOne = [];
@@ -604,7 +612,7 @@
 				App._post_form(url, {
 					
 				}, res => {
-					let SelectInfo = res.data;
+					// let SelectInfo = res.data;
 					let title;
 					if(res.data.class){
 						
@@ -625,12 +633,13 @@
 						})
 					}
 					if(res.data.orders){
+						// 如果有排序的选项列表
 						setTimeout(()=>{
 							_this.getOrderId(res.data.orders[0]);
 							
 							_this.getCitys();
 						})
-						_this.$emit('getOrderId', SelectInfo.orders[0].val,title);
+						_this.$emit('getOrderId', res.data.orders[0].val,title);
 					}
 					// 相亲新增
 					if(res.data.sort) {
@@ -639,31 +648,38 @@
 							_this.getCitys();
 							_this.getGnederId(res.data.gneder[0]);
 						})
-						_this.$emit('getSortId', SelectInfo.sort[0].val,title);
+						_this.$emit('getSortId', res.data.sort[0].val,title);
 					}
 					
-					if (!!SelectInfo.area) {
-						_this.getCityarea(SelectInfo.area,true);
-						SelectInfo.top.map(item=>{
+					if (!!res.data.area) {
+						_this.getCityarea(res.data.area,true);
+						res.data.top.map(item=>{
 							if(item.subscript == 'area'){
 								item.title = agencyData.areaname;
 							}
 						})
 					}
-					if(!!SelectInfo.industry){
-						_this.getindustry(SelectInfo.industry);
+					if(!!res.data.industry){
+						// 获取行业信息
+						_this.getindustry(res.data.industry);
 					}
-					if(SelectInfo.top.length > 3){
-						_this.$emit('getmore',SelectInfo);
-					}
-					if(_this.SelectInfo.orders) {
-						_this.setData({
-							orderId: SelectInfo.orders[0].val
-						})
+					if(res.data.top.length > 3){
+						_this.$emit('getmore',res.data);
 					}
+					// if(_this.SelectInfo.orders) {
+					// 	_this.setData({
+					// 		orderId: SelectInfo.orders[0].val
+					// 	})
+					// }// 这一步在this.getOrderId里重复了，注释先
+					
+					// _this.setData({
+					// 	SelectInfo
+					// });
+					// _this.SelectInfo.top = res.data.top;
 					_this.setData({
-						SelectInfo
-					});
+						SelectInfo: res.data
+					})
+					// _this.SelectInfo = res.data;
 					// _this.SelectInfo.top.splice(0)
 				})
 			},
@@ -792,6 +808,8 @@
 					tabIndex = tabbarList.findIndex(item => item.subscript === 'class');
 				tabbarList[tabIndex].title = classTwoItem.name;
 			},
+			/*获取当前排序选项的ID
+			*/
 			getOrderId(orderItem) {
 				let _this = this;
 				
diff --git a/components/template/goodsHeaderTitle.vue b/components/template/goodsHeaderTitle.vue
index 0816dcc..694c87c 100644
--- a/components/template/goodsHeaderTitle.vue
+++ b/components/template/goodsHeaderTitle.vue
@@ -45,7 +45,8 @@
 		top: 14upx;
 		width: 14upx;
 		height: 14upx;
-		background: rgba(255, 68, 68, 1);
+		/* background: rgba(255, 68, 68, 1); */
+		background: #82d0f7;
 		border-radius: 50%;
 	}
 
@@ -55,7 +56,8 @@
 		top: 18upx;
 		width: 14upx;
 		height: 14upx;
-		background: rgba(255, 68, 68, 1);
+		/* background: rgba(255, 68, 68, 1); */
+		background: #82d0f7;
 		opacity: 0.2;
 		border-radius: 50%;
 	}
diff --git a/components/template/pic_text/pic_text.vue b/components/template/pic_text/pic_text.vue
index 2bb5c2d..5289bd9 100644
--- a/components/template/pic_text/pic_text.vue
+++ b/components/template/pic_text/pic_text.vue
@@ -2,13 +2,20 @@
 	<view style="display: flex;">
 		<view class="left_area">
 			<image :src="itemInfos.avatar" mode="" class="avatar" @click.stop="goHome"></image>
+			<view class="label">
+				<image v-if="itemInfos.identity_id=='7'" src="../../../static/id_blogger.png" mode=""></image>
+				<image v-if="itemInfos.identity_id=='2'" src="../../../static/id_student.png" mode=""></image>
+				<image v-if="itemInfos.identity_id=='6'" src="../../../static/id_teacher.png" mode=""></image>
+				<image v-if="itemInfos.identity_id=='5'" src="../../../static/id_enterprise.png" mode=""></image>
+			</view>
+			
 		</view>
 		<view class="right_area">
 			<view class="text-wrapper">
 				<view class="dis-flex" style="justify-content: space-between;">
 					<!-- <image :src="itemInfos.avatar" mode="" class="avatar" @click.stop="goHome"></image> -->
 					<view style="flex: 1;line-height: 18px;">
-						<view class="name"><text>{{itemInfos.nickname}}</text><text class="label" v-if="itemInfos.idType">{{itemInfos.idType}}</text></view>
+						<view class="name"><text>{{itemInfos.nickname}}</text></view>
 						<view style="color: #999999;font-size: 12px;">{{itemInfos.createtime+' '}}<text v-if="itemInfos.addr">{{itemInfos.addr}}</text></view>
 					</view>
 					<view class="btn" v-if="itemInfos.mid!=='0' && !itemInfos.is_interest && !itemInfos.is_it_mine" @click.stop="interest">+关注</view>
@@ -412,6 +419,7 @@ export default {
 }
 .left_area{
 	width: 15vw;
+	position: relative;
 	.avatar{
 		width: 40px;
 		height: 40px;
@@ -419,6 +427,15 @@ export default {
 		border-radius: 50%;
 		margin: 8px calc(7.5vw - 20px);
 	}
+	.label{
+		position: absolute;
+		top: 31px;
+		left: 32px;
+		image{
+			width:18px;
+			height:18px;
+		}
+	}
 }
 .right_area{
 	
@@ -438,24 +455,14 @@ export default {
 		font-size: 14px;
 		font-weight: bold;
 	}
-	.label{
-		display: inline-block;
-		padding: 2px 8px;
-		background-color: #ffeaf1;
-		border-radius: 5px;
-		font-size: 13px;
-		color: #ff0f43;
-		font-weight: normal;
-		line-height: 16px;
-		margin-left: 7px;
-	}
+	
 	.btn{
 		width: 56px;
 		line-height: 26px;
 		border-radius: 18px;
-		color: #ff0f43;
-		background-color: #ffeaf1;
-		border: 1px solid #ff0f43;
+		color: #fff;
+		background-color: #ec6979;
+		border: 1px solid #ec6979;
 		text-align: center;
 		font-size: 12px;
 	}
@@ -463,9 +470,9 @@ export default {
 		width: 72px;
 		line-height: 26px;
 		border-radius: 18px;
-		color: #ff0f43;
+		color: #ec6979;
 		background-color: #ffffff;
-		border: 1px solid #ff0f43;
+		border: 1px solid #ec6979;
 		text-align: center;
 		font-size: 12px;
 	}
diff --git a/pages.json b/pages.json
index 51d8f10..22df49f 100644
--- a/pages.json
+++ b/pages.json
@@ -1692,7 +1692,7 @@
 				{
 					"path": "companiesList/companiesList",
 					"style": {
-						"navigationBarTitleText": "企业列表"
+						"navigationBarTitleText": "企业专区"//企业列表
 					}
 				},
 				{
diff --git a/pages/mainPages/index/index.vue b/pages/mainPages/index/index.vue
index 708af6f..5f80e74 100644
--- a/pages/mainPages/index/index.vue
+++ b/pages/mainPages/index/index.vue
@@ -1241,12 +1241,14 @@ export default {
 		/*z-index超过999就会使menu_box(无论cover-view还是view)写多大都无法盖到遮罩层上面(开发者工具)
 		对真机不影响
 		*/
+	 // z-index: 999;/*工具测试*/
 	}
 	.menu_box{
 		padding-top: 90px;
 		width: 50vw;height: 100vh;
 		position: fixed;top: 0px;
 		left: 50%;z-index: 9999;
+		// z-index: 999;/*工具测试*/
 		background-color: #fff;
 	}
 	.menu_close{
diff --git a/pages/mainPages/poster/poster.vue b/pages/mainPages/poster/poster.vue
index db2578e..1f79521 100644
--- a/pages/mainPages/poster/poster.vue
+++ b/pages/mainPages/poster/poster.vue
@@ -177,7 +177,8 @@
 		margin: 30upx auto 0 auto;
 		width: 400upx;
 		height: 80upx;
-		background: rgba(255, 68, 68, 1);
+		// background: rgba(255, 68, 68, 1);
+		background-color: #82d0f7;
 		border-radius: 40upx;
 		text-align: center;
 
diff --git a/pages/mainPages/sendInformation/sendInformation.vue b/pages/mainPages/sendInformation/sendInformation.vue
index 6dc95a1..6700b76 100644
--- a/pages/mainPages/sendInformation/sendInformation.vue
+++ b/pages/mainPages/sendInformation/sendInformation.vue
@@ -274,6 +274,15 @@ export default {
 		},
 		// 跳转发布
 		goPostRelease(items) {
+			let baseUserInfo = uni.getStorageSync('userinfo');
+			if(baseUserInfo.identity=='游客'){
+				uni.showToast({
+					title: '您没有发布帖子权限',
+					icon: 'none'
+				})
+				return;
+			}
+			
 			console.log(items);
 			if(items.noflag == 1){
 				this.showVip = true;
diff --git a/pages/mainPages/userCenter/userCenter.vue b/pages/mainPages/userCenter/userCenter.vue
index 426aa57..608203e 100644
--- a/pages/mainPages/userCenter/userCenter.vue
+++ b/pages/mainPages/userCenter/userCenter.vue
@@ -183,19 +183,18 @@
 						<navigator class="content_box1" :url="'/pagesA/rule_center/rule_center'"
 						 v-if="memberInfo.identity==='企业' || memberInfo.identity==='商家'">
 							<view style="font-size: 14px!important;">规则中心</view>
-							<image :src="imageRootNew+'rule-blue.png'" mode=""></image>
+							<image :src="imageRootNew+'rule-blue.png?111'" mode=""></image>
 						</navigator>
 						<!-- 普通用户 -->
 						<navigator class="content_box1" :url="'/pages/subPages2/hirePlatform/addResume/addResume'"
 						 v-else>
 							<view style="font-size: 14px!important;">我的简历</view>
-							<image :src="imageRootNew+'jianli.png'" mode=""></image>
+							<image :src="imageRootNew+'jianli.png?111'" mode=""></image>
 						</navigator>
 						<!-- 主页入口 -->
 						<navigator class="content_box1" :url="'/pages/subPages/homepage/homepage/homepage?mid='+memberInfo.mid+'&checkType=1'">
 							<view style="font-size: 14px!important;">我的主页</view>
-							<image :src="imageRootNew+'home_123.png'" mode="" ></image>
-							<!-- <image :src="imageRootNew+'stLine-home-l@2x.png'" mode=""></image> -->
+							<image :src="imageRootNew+'home_123.png?111'" mode="" ></image>
 						</navigator>
 					</view>
 					
@@ -826,13 +825,13 @@
 		}
 		.label{
 			display: inline-block;
-			padding: 2px 8px;
-			background-color: #ffeaf1;
-			border-radius: 5px;
-			font-size: 13px;
-			color: #ff0f43;
+			padding: 2px 10px;
+			background-color: #ec6979;
+			border-radius: 20px;
+			font-size: 12px;
+			color: #fff;
 			font-weight: normal;
-			line-height: 16px;
+			line-height: 15px;
 			margin-left: 2px;
 			flex-shrink: 0;
 		}
diff --git a/pages/mainPages/userset/userset.vue b/pages/mainPages/userset/userset.vue
index 81f4a2c..50a35e2 100644
--- a/pages/mainPages/userset/userset.vue
+++ b/pages/mainPages/userset/userset.vue
@@ -37,7 +37,7 @@
 			<view class="content-box b-f padding-box-all bor-radius-10upx f-28 t-c" @click="clearToken">{{languageStatus!=1?'退出登录':'로그아웃'}}</view>
 		</view>
 		<view style="color: gray;width: 300rpx;text-align: center;position: fixed;
-			bottom: 30rpx;left: 50%;margin-left: -150rpx;font-size: 23rpx;">当前版本号:1.0.20</view>
+			bottom: 30rpx;left: 50%;margin-left: -150rpx;font-size: 23rpx;">当前版本号:1.0.23</view>
 		<!-- <bindPhone :phoneShow="phoneShow" @clickmask="closePop" @mobileBulr="mobileBulr"></bindPhone> -->
 			<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
 		<PopManager :show="show2" @clickmask="closeshow">
diff --git a/pages/subPages/Equity/Topping/Topping.vue b/pages/subPages/Equity/Topping/Topping.vue
index 62c55b4..5f140fb 100644
--- a/pages/subPages/Equity/Topping/Topping.vue
+++ b/pages/subPages/Equity/Topping/Topping.vue
@@ -136,7 +136,7 @@
 						this.diyPrice = res.data.price;
 						
 						this.jobList = res.data.filter_data.recruit;
-						this.selectType = this.jobList[0].recruit_id;
+						this.selectType = this.jobList[0] ? this.jobList[0].recruit_id : '';
 						
 						this.selectOptLs = res.data.num_data;
 						for(let key in this.selectOptLs){
diff --git a/pages/subPages/goods/index.css b/pages/subPages/goods/index.css
index cef7f13..c65590e 100644
--- a/pages/subPages/goods/index.css
+++ b/pages/subPages/goods/index.css
@@ -2,6 +2,10 @@
 	background-color: #F7F7F7;
 }
 
+.color-blue{
+	color: #82d0f7;
+}
+
 .wfView {}
 
 .getTip {
@@ -345,7 +349,7 @@
 }
 
 .goods-already-box .goods-already .goods-invite {
-	color: #333333;
+	color: #fff;
 	width: 230upx;
 	height: 60upx;
 	line-height: 60upx;
@@ -400,7 +404,8 @@
 	top: 14upx;
 	width: 14upx;
 	height: 14upx;
-	background: rgba(255, 68, 68, 1);
+		/* background: rgba(255, 68, 68, 1); */
+		background: #82d0f7;
 	border-radius: 50%;
 }
 
@@ -410,7 +415,8 @@
 	top: 18upx;
 	width: 14upx;
 	height: 14upx;
-	background: rgba(255, 68, 68, 1);
+		/* background: rgba(255, 68, 68, 1); */
+		background: #82d0f7;
 	opacity: 0.2;
 	border-radius: 50%;
 }
@@ -470,8 +476,8 @@
 	width: 34upx;
 	height: 34upx;
 	line-height: 34upx;
-	background: rgba(255, 68, 68, 1);
-	box-shadow: 0 2upx 6upx 0 rgba(205, 2, 2, 0.35);
+	background: #82d0f7;
+	box-shadow: 0 2upx 6upx 0 rgba(130, 208, 247, 0.35);
 	border-radius: 50%;
 	margin: 0 auto 30upx;
 }
@@ -858,6 +864,10 @@
 	background: #F02E24;
 	color: #FFFFFF;
 }
+.countdownTime-style-color3 text {
+	background: #82d0f7;
+	color: #FFFFFF;
+}
 
 .countdownTime-style-color2 text {
 	background: rgba(255, 255, 255, 1);
diff --git a/pages/subPages/goods/index.vue b/pages/subPages/goods/index.vue
index fe76f05..aabdcb1 100644
--- a/pages/subPages/goods/index.vue
+++ b/pages/subPages/goods/index.vue
@@ -132,7 +132,7 @@
 					</block>
 					<!-- 抢购倒计时背景 -->
 					<block v-if="goodsType === '1'">
-						<view class="group-countdown dis-flex flex-y-center" :style="{ 'background-image': ' url(' + imageRoot + 'rush_bg.png)' }">
+						<view class="group-countdown dis-flex flex-y-center" :style="{ 'background-image': ' url(' + imageRoot + 'rush_bg.png?111)' }">
 							<view class="bargain-countdown-content dis-flex flex-x-between flex-box">
 								<view class="bargain-countdown-content-left">
 									<view class="dis-flex flex-y-center dis-flex flex-y-center">
@@ -170,21 +170,21 @@
 								</view>
 								<block v-if="!!countDown['timeobj']">
 									<view class="bargain-countdown-content-right">
-										<view class="color-f02 f-24 t-c">距离{{ dataInfo['stateTime'] === 1 ? '结束' : '开始' }}还剩:</view>
+										<view class="color-blue f-24 t-c">距离{{ dataInfo['stateTime'] === 1 ? '结束' : '开始' }}还剩:</view>
 										<view class="countdownTime-box dis-flex flex-x-center flex-y-center">
-											<view class="countdownTime-style countdownTime-style-color1 countdownTime-hh color-f02" v-if="countDown.timeobj.tt !== '00'">
+											<view class="countdownTime-style countdownTime-style-color3 countdownTime-hh color-blue" v-if="countDown.timeobj.tt !== '00'">
 												<text class="f-24">{{ countDown['timeobj']['tt'] }}</text>
 												<span style="font-size: 24upx;">天</span>
 											</view>
-											<view class="countdownTime-style countdownTime-style-color1 countdownTime-hh color-f02">
+											<view class="countdownTime-style countdownTime-style-color3 countdownTime-hh color-blue">
 												<text class="f-24">{{ countDown['timeobj']['hh'] }}</text>
 												:
 											</view>
-											<view class="countdownTime-style countdownTime-style-color1 countdownTime-ss color-f02">
+											<view class="countdownTime-style countdownTime-style-color3 countdownTime-ss color-blue">
 												<text class="f-24">{{ countDown['timeobj']['mm'] }}</text>
 												:
 											</view>
-											<view class="countdownTime-style countdownTime-style-color1 countdownTime-mm color-f02">
+											<view class="countdownTime-style countdownTime-style-color3 countdownTime-mm color-blue">
 												<text class="f-24">{{ countDown['timeobj']['ss'] }}</text>
 											</view>
 										</view>
@@ -1121,7 +1121,7 @@
 					<view  style="padding: 30upx 0;height: 650upx;overflow: auto;">
 						<view  style="padding-bottom: 20upx;" v-for="(tag,index) in dataInfo.tagslist" :key="index">
 							<view  style="flex: 0.2;">
-								<view class="t-c f-26 dis-il-block" style="padding: 5upx 20upx;color: #FF4444;border: 1upx solid pink;border-radius: 8upx;">
+								<view class="t-c f-26 dis-il-block" style="padding: 5upx 20upx;color: #82d0f7;border: 1upx solid #82d0f7;border-radius: 8upx;">
 									{{tag.title}}
 								</view>
 							</view>
diff --git a/pages/subPages/homepage/homepage/homepage.vue b/pages/subPages/homepage/homepage/homepage.vue
index c199691..a4bae5a 100644
--- a/pages/subPages/homepage/homepage/homepage.vue
+++ b/pages/subPages/homepage/homepage/homepage.vue
@@ -1143,13 +1143,14 @@
 		margin-right: 10px;
 	}
 	.btn-interest{
-		color: #d60000;
 		padding: 0 10px;
 		height: 26px;
 		line-height: 24px;
 		font-size: 12px;
 		border-radius: 15px;
 		box-sizing: border-box;
-		border: 1px solid #d60000;
+		color: #fff;
+		background-color: #ec6979;
+		border: 1px solid #ec6979;
 	}
 </style>
diff --git a/pages/subPages/homepage/private/private.vue b/pages/subPages/homepage/private/private.vue
index cbb76b0..7bdfaa9 100644
--- a/pages/subPages/homepage/private/private.vue
+++ b/pages/subPages/homepage/private/private.vue
@@ -31,7 +31,7 @@
 				<loadmore :isMore="isMore" v-if="total != 0"></loadmore>
 			</view>
 		</view>
-		<TabBars :tabBarAct="0" :pageType="''" />
+		<!-- <TabBars :tabBarAct="0" :pageType="''" /> -->
 	</view>
 </template>
 
diff --git a/pages/subPages/mineCollection/mineCollection.vue b/pages/subPages/mineCollection/mineCollection.vue
index 3497bbb..2365529 100644
--- a/pages/subPages/mineCollection/mineCollection.vue
+++ b/pages/subPages/mineCollection/mineCollection.vue
@@ -75,7 +75,7 @@
 		</scroll-view>
 		<!-- 列表区域 -->
 		
-		<TabBars :tabBarAct="0" :pageType="''" />
+		<!-- <TabBars :tabBarAct="0" :pageType="''" /> -->
 		
 		<!-- 列表	 -->
 		<view  v-if="type == 3" :style="{ height: scollHeight }">
diff --git a/pages/subPages/postRelease/postRelease.vue b/pages/subPages/postRelease/postRelease.vue
index 7294a8d..9c53e14 100644
--- a/pages/subPages/postRelease/postRelease.vue
+++ b/pages/subPages/postRelease/postRelease.vue
@@ -333,7 +333,6 @@
 			// _this.preparation();
 		},
 		onLoad(e) {
-			console.log(e, '2222')
 			let _this = this;
 			_this.dwText = _this.languageStatus !=1?'不显示位置':'위치 미공개';
 			uni.getSystemInfo({
@@ -615,25 +614,27 @@
 					if (ress.data.status == 0) {
 						if(_this.setInfo.set.wxapptip == '1'){
 							//#ifndef H5
-							if(_this.setInfo.set.tempId){
+							let tempID = _this.setInfo.set.tempId;
+							// tempID = "1EfVKrfUciw3cnt8L3Mz1kNgGHOFcpoiZOX5o9g3QnQ";
+							if(tempID){
 								uni.requestSubscribeMessage({ //订阅消息
-									tmplIds: [_this.setInfo.set.tempId],
+									tmplIds: [tempID],
 									success(res) {
 										console.log(res)
-										if(res[_this.setInfo.set.tempId]=='reject'){
+										if(res[tempID]=='reject'){
 											// 用户取消
 											// return;
 										}
-										if(res[_this.setInfo.set.tempId] == 'accept'){
-											let data = {
-												info:{
-													form_id:_this.setInfo.set.tempId,
+										if(res[tempID] == 'accept'){
+											let dataDINGYUE = {
+												info:JSON.stringify({
+													form_id:tempID,
 													temp_type:'service'
-												}
+												})
 											};
 											App._post_form(
 												`&do=saveFromId`,
-												data,
+												dataDINGYUE,
 												res => {
 													uni.showToast({
 														title:`订阅成功`
diff --git a/pages/subPages2/hirePlatform/companiesList/companiesList.vue b/pages/subPages2/hirePlatform/companiesList/companiesList.vue
index d0f75cb..f3b4f14 100644
--- a/pages/subPages2/hirePlatform/companiesList/companiesList.vue
+++ b/pages/subPages2/hirePlatform/companiesList/companiesList.vue
@@ -3,16 +3,24 @@
 		<loadlogo v-if="!loadlogo" />
 		<far-bottom></far-bottom>
 		<view v-if="loadlogo">
-			<view class="dis-flex companiesList">
+			<view class="dis-flex companiesList" v-if="0">
 				<view  style="flex: 0.8;">
-					<filtertab :pageName="'企业'" :requestType="'8'" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid" @getmore="getmore" @getResumeList="getResumeList"
-					 @selectClassTwoid="selectClassTwoid" @getcityWork="getcityWork" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
+					<filtertab :pageName="'企业'" :requestType="'8'" :isPageScroll="'1'" @selectAreaid="selectAreaid"
+					 @selectClassid="selectClassid" @getmore="getmore" @getResumeList="getResumeList"
+					 @selectClassTwoid="selectClassTwoid" @getcityWork="getcityWork" @selectOrders="selectOrders"
+						:cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
 				</view>
 				<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="openclass">
 					<text>更多</text>
 					<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
 				</view>
 			</view>
+			<view class="dis-flex companiesList">
+				<view class="search-box">
+					<input class="search-inp" type="text" v-model="keyword">
+					<button class="search-btn" @click="search">搜索</button>
+				</view>
+			</view>
 			<view class="enterpriseList" v-if="inviteList.length > 0">
 				<view class="enterprise-item " v-for="(item,index) in inviteList" :key="index" @click="toCompanyDetails(item)">
 					<view class="enterprise-border dis-flex">
@@ -21,13 +29,14 @@
 							<view class="content-title">
 								{{item.storename}}
 								<view class="dis-il-block title-tag" v-if="item.is_authentication == 1">已认证</view>
-								<view class="f-24 col-9" style="float: right;font-weight: 500;">
+								<view class="f-24 col-9" style="float: right;font-weight: 500;" v-if="0">
 									{{item.distances_text}}
 								</view>
 							</view>
 							<view class="content-label">{{item.nature}} · {{item.scale}} · {{item.industry}}</view>
 							<view class="content-num">
-								{{item.area}} · 在招
+								<!-- {{item.area}} · -->
+								在招
 								<text style="color: #3388FF;">{{ item.release_recruit }}</text>
 								个
 							</view>
@@ -41,7 +50,7 @@
 		 <screening :check="check" :num="num" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
 		
 		<!-- 城市 -->
-		<TabBars :tabBarAct="0" pageType="15"></TabBars>
+		<!-- <TabBars :tabBarAct="0" pageType="15"></TabBars> -->
 	</view>
 </template>
 
@@ -67,14 +76,17 @@ export default {
 			page:1,
 			page_index:10,
 			loadlogo:true,
-			num:0,
+			// num:0,//打开筛选功能
+			num:1,//隐藏筛选功能
 			Areaid:'',
 			ordersId:'',
 			datas:{},
 			isMore:true,
 			total:1,
 			enterpriseList:[],
-			AreaidAt:''
+			AreaidAt:'',
+			keyword:'',
+			detailBack: false,//是否从详情页返回来
 		};
 	},
 	components: {
@@ -92,11 +104,21 @@ export default {
 		console.log(this.locationArray,'定位定位')
 		// debugger
 		// this.getCompaniesList()
+		
+		if(this.num != 0){
+			// debugger
+			this.confirm();
+			
+		}
 	},
 	onShow() {
 		if(this.num != 0){
 			// debugger
-			this.confirm();
+			if(!this.detailBack){
+				// console.log('刷成第一页');
+				// this.confirm();
+			}
+			
 		}
 	},
 	onReachBottom() {
@@ -118,9 +140,21 @@ export default {
 			
 		},
 		toCompanyDetails(item){
-			App.navigationTo({
-				url: "pages/subPages2/hirePlatform/companyDetails/companyDetails?id=" + item.id
-			});
+			// App.navigationTo({
+			// 	url: "pages/subPages2/hirePlatform/companyDetails/companyDetails?id=" + item.id
+			// });
+			uni.navigateTo({
+				url: "/pages/subPages2/hirePlatform/companyDetails/companyDetails?id=" + item.id,
+				events: {
+					// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
+					acceptDataFromOpenedPageA: function(data) {
+						console.log(data, '111');
+						if(data.data=='to detail'){
+							this.detailBack = true;
+						}
+					},
+				}
+			})
 		},
 		confirm(datas,flag){
 			// debugger
@@ -130,6 +164,8 @@ export default {
 			if(datas){
 				this.datas = datas;
 			}
+			console.log(this.datas, 'this.datas-----');
+			
 			let indata = {
 				recruit_industry_id:this.resumeID[0],
 				sort:this.ordersId,
@@ -138,7 +174,8 @@ export default {
 				area_id:this.AreaidAt,
 				is_total:1,
 				page:this.page,
-				page_index:this.page_index
+				page_index:this.page_index,
+				sort: 5
 			}
 			let data = Object.assign(indata ,this.datas);
 			App._post_form(
@@ -254,12 +291,41 @@ export default {
 		},
 		selectClassTwoid(data){
 			console.log(data)
+		},
+		search(){
+			this.confirm({title: this.keyword})
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+	
+	.search-box{
+		width: 690rpx;
+		height: 34px;
+		border: 1px solid #82d0f7;
+		border-radius: 30px;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		margin: 10rpx auto;
+		.search-inp{
+			flex-grow: 1;
+			padding: 0px 10px 0px 20px;
+			font-size: 14px;
+		}
+		.search-btn{
+			width: 120upx;
+			height: 30px;
+			background-color: #82d0f7;
+			border-radius: 15px;
+			color: #fff;
+			font-size: 12px;
+			padding: 0px;
+			margin-right: 2px;
+		}
+	}
 .companiesList {
 	padding: 10upx 0upx;
 	.tab-item {
@@ -324,5 +390,8 @@ export default {
 			border-top: 1upx solid #EEEEEE;
 		}
 	}
+	.enterprise-item:nth-of-type(1) .enterprise-border{
+			border-top: none;
+	}
 }
 </style>
diff --git a/pages/subPages2/hirePlatform/companyDetails/companyDetails.vue b/pages/subPages2/hirePlatform/companyDetails/companyDetails.vue
index 427038a..06bd1df 100644
--- a/pages/subPages2/hirePlatform/companyDetails/companyDetails.vue
+++ b/pages/subPages2/hirePlatform/companyDetails/companyDetails.vue
@@ -150,6 +150,10 @@
 		},
 		onLoad(e) {
 			this.pageId = e.id;
+			
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.emit('acceptDataFromOpenedPageA', {data: 'to detail'});
+			
 		},
 		onShow(){
 			this.page = 1;
diff --git a/pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue b/pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue
index 974b31a..5f37bb6 100644
--- a/pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue
+++ b/pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue
@@ -345,14 +345,14 @@
 				</view>
 			
 				<!-- 兼职封面图 -->
-				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type==2">
+				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type==2&&0">
 					<view class="t-r" style="flex: 0.2;">
 						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
 						兼职封面
 					</view>
 					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;"></view>
 				</view>
-				<view class="upLoadFile" v-if="userInfo.job_type==2">
+				<view class="upLoadFile" v-if="userInfo.job_type==2&&0">
 					<!-- 兼职封面阅览 -->
 					<view class="zsView" style="fontSize:24upx" v-if="userInfo.recruit_img !== '' && !!userInfo.recruit_img">
 						<image :src="userInfo.recruit_img" mode="aspectFill" />
@@ -794,7 +794,7 @@
 				},{
 					title:'实习',
 					id:'3',
-					cc_id: '8'
+					cc_id: '7'
 				}],
 				childTypeList: [],
 				childTypeIndex: 0,
@@ -1199,13 +1199,13 @@
 					})
 					return;
 				}
-				if(this.userInfo.job_type==2 && !this.userInfo.recruit_img){
-					uni.showToast({
-						title: '请选择兼职封面',
-						icon: 'none'
-					})
-					return;
-				}
+				// if(this.userInfo.job_type==2 && !this.userInfo.recruit_img){
+				// 	uni.showToast({
+				// 		title: '请选择兼职封面',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
 				let _this = this;
 				let data = JSON.parse(JSON.stringify(_this.userInfo));
 				// this.work_experienceList.map()
diff --git a/pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue b/pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue
index 524023b..55e0d39 100644
--- a/pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue
+++ b/pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="recruitmentList">
 		<loadlogo v-if="!loadlogo" />
-		<view style="padding: 20upx 0;" class="dis-flex" v-if="0">
+		<view style="padding: 20upx 0;" class="dis-flex">
 			<view  style="flex: 0.8;">
 				<filtertab 
 				:requestType="'7'" 
@@ -117,11 +117,14 @@
 				case '1':
 				title = '就业招聘';
 				break;
-				case '2':
-				title = '学生兼职';
-				break;
-				case '3':
-				title = '实习实践';
+				// case '2':
+				// title = '学生兼职';
+				// break;
+				// case '3':
+				// title = '实习实践';
+				// break;
+				case '2,3':
+				title = '实习兼职';
 				break;
 			}
 			setTimeout(()=>{
@@ -138,8 +141,9 @@
 			// this.confirm();
 		},
 		onReachBottom() {
-			
 			if(this.total == this.page) return
+			if(this.total===0) return;
+			// console.log(this.total, this.page);
 			this.isMore = false;
 			this.page++;
 			this.confirm(false,true)
@@ -148,6 +152,7 @@
 			confirm(datas,flag){
 				if(datas != false){
 					this.page = 1;
+					this.total = 1;//加
 				}
 				if(this.pagenum < 4){
 					this.pagenum++;
diff --git a/pages/subPages2/subscription/subscription.vue b/pages/subPages2/subscription/subscription.vue
index 5ab6900..3293732 100644
--- a/pages/subPages2/subscription/subscription.vue
+++ b/pages/subPages2/subscription/subscription.vue
@@ -72,11 +72,11 @@
 							</view>
 							<!-- #endif -->
 							<!-- #ifndef H5 -->
-							<view style="flex: 0.2;">
-								<!-- <view class="subscription-item-btn t-c" @click="subscriptionClik(item)">
+							<view style="flex: 0.3;">
+								<view class="subscription-item-btn t-c" @click="subscriptionClik(item)">
 									订阅 <text v-if="item.num != 0">+{{item.num}}</text>
-								</view> -->
-								<switch :checked="item.button" @change="switch1Change($event,item)" color="#82d0f7" />
+								</view>
+								<!-- <switch :checked="item.button" @change="switch1Change($event,item)" color="#82d0f7" /> -->
 							</view>
 							<!-- #endif -->
 						</view>
@@ -84,7 +84,7 @@
 					
 			</view>
 		</view>
-		<TabBars :tabBarAct="0" :pageType="''"/>
+		<!-- <TabBars :tabBarAct="0" :pageType="''"/> -->
 	</view>
 </template>
 
@@ -117,7 +117,7 @@
 				const { openid, action } = options;
 						
 			},
-			switch1Change: function (e, item) {
+			switch1Change (e, item) {
 				let _this = this;
 				// console.log('switch1 发生 change 事件，携带值为', e.detail.value);
 				// console.log(item);
@@ -149,25 +149,35 @@
 					return;
 				}
 				// 开启接口：do=saveFromId
-			// },
-			// subscriptionClik(item){
-				
+			},
+			subscriptionClik(item){
+				let _this = this;
 						// #ifndef H5
 						uni.requestSubscribeMessage({
 							tmplIds: [item.id],
 							success(res) {
 								console.log(res);
-								if(res[item.id]=='reject'){
-									// 用户取消
-									// console.log(item.button, '用户取消');
-									_this.sbuscriptionList.list = [];//重置switch需要
-									_this.getSbuscriptionList();
-									return;
-								}
+								// if(res[item.id]=='reject'){
+								// 	// 用户取消
+								// 	// console.log(item.button, '用户取消');
+								// 	_this.sbuscriptionList.list = [];//重置switch需要
+								// 	_this.getSbuscriptionList();
+								// 	return;
+								// }
 								for(let key in res){
 									if(key != 'errMsg'){
 										if(res[key] == 'accept'){
 											
+											let data = {
+												info:{
+													form_id:item.id,
+													temp_type:item.temp_type,
+													scene:Number(item.scene)>9999?1:Number(item.scene) + 1
+													
+												}
+											};
+											data.info = JSON.stringify(data.info);
+											
 											
 											App._post_form(
 												`&do=saveFromId`,
diff --git a/pagesA/communityClassification/communityClassification.vue b/pagesA/communityClassification/communityClassification.vue
index bc5d7a8..047b64b 100644
--- a/pagesA/communityClassification/communityClassification.vue
+++ b/pagesA/communityClassification/communityClassification.vue
@@ -502,4 +502,8 @@ export default {
 	background-color: #fff !important;
 	padding-top: 20rpx;
 }
+
+/deep/ .more-status{
+	display: none !important;
+}
 </style>
diff --git a/static/id_blogger.png b/static/id_blogger.png
new file mode 100644
index 0000000..c79bfb5
Binary files /dev/null and b/static/id_blogger.png differ
diff --git a/static/id_enterprise.png b/static/id_enterprise.png
new file mode 100644
index 0000000..9be2420
Binary files /dev/null and b/static/id_enterprise.png differ
diff --git a/static/id_student.png b/static/id_student.png
new file mode 100644
index 0000000..a7835a3
Binary files /dev/null and b/static/id_student.png differ
diff --git a/static/id_teacher.png b/static/id_teacher.png
new file mode 100644
index 0000000..7329da7
Binary files /dev/null and b/static/id_teacher.png differ