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

package/jobIntention/underReview.vue

@@ -1,18 +1,39 @@
 <template>
   <view class="company">
     <view class="company-content">
-      <view class="company-title">
+      <view class="company-title" v-if="companyinfo.status==1">
         <u-icon
           name="clock-fill"
           color="#016BF6"
           size="40"
           style="margin-right: 16rpx"
         ></u-icon>
-        {{companyinfo.message}}
+		认证审核中
+       
       </view>
+	  <view class="company-title" v-else-if="companyinfo.status==2">
+	    <u-icon
+	      name="clock-fill"
+	      color="#016BF6"
+	      size="40"
+	      style="margin-right: 16rpx"
+	    ></u-icon>
+	  		认证审核已通过
+	  </view>
+	  <view class="company-title" v-else >
+	    <u-icon
+	      name="clock-fill"
+	      color="#016BF6"
+	      size="40"
+	      style="margin-right: 16rpx"
+	    ></u-icon>
+	  		认证审核被拒绝
+	  </view>
+	  
+	  
       <view class="review-desc" v-if="companyinfo.status!=2">
         您的企业【{{companyinfo.companyAllName}}】于[{{companyinfo.companyCreateTime}}]提交了企业认证申请，
-        {{companyinfo.status==3 ? '审核未通过，理由如下：'+companyinfo.auditContent : '请耐心等待认证结果'}}
+        {{companyinfo.status==3 ? '审核未通过，理由如下：'+companyinfo.message : '请耐心等待认证结果'}}
       </view>
 	  <view class="review-desc" v-else>
 	    您的企业【{{companyinfo.companyAllName}}】于[{{companyinfo.companyCreateTime}}]提交了企业认证申请，
@@ -47,7 +68,7 @@ export default {
   methods: {
     goCompleteMsg() {
 		if(this.companyinfo.status!=2){
-			 uni.navigateTo({ url: "my/renzheng/editCompany" });
+			 uni.navigateTo({ url: "/my/renzheng/editCompany" });
 		}else{
 			 uni.navigateTo({ url: "/package/jobIntention/completeMsg" });
 		}

pages/index/game/gameList.vue

@@ -66,7 +66,7 @@
 
             <view class="topbg-sx-box-r flex align-center">
               <!-- 城市 -->
-              <view class="topbg-sx-box-r-i flex align-center" style="" @click="goNav('/package/screen/city?city='+city+'&county='+county)">
+              <view class="topbg-sx-box-r-i flex align-center" style="" @click="goNav('/package/screen/city?city='+city+'&county='+county+'&type='+'search')">
                 <text style="margin-right: 10rpx">{{county?county:city?city:'选择城市'}}</text>
                 <u-icon
                   name="arrow-down"

pages/index/index.vue

@@ -139,7 +139,7 @@
 
 								<view class="topbg-sx-box-r flex align-center">
 									<!-- 城市 -->
-									<view class="topbg-sx-box-r-i flex align-center" style="" @click="goNav('/package/screen/city?city='+city+'&county='+county)">
+									<view class="topbg-sx-box-r-i flex align-center" style="" @click="goNav('/package/screen/city?city='+city+'&county='+county+'&type='+'search')">
 										<text style="margin-right: 10rpx;">{{county?county:city?city:'选择城市'}}</text>
 										<u-icon name="arrow-down" color="#016bf6" size="16"></u-icon>
 									</view>
@@ -1173,6 +1173,32 @@
 						this.companyStatus = res.data.status
 						this.companyName = res.data.companyAllName
 						uni.setStorageSync('companyStatus', this.companyStatus)
+						if(this.companyStatus==1){
+							uni.showModal({
+								title: '提示',
+								content: '企业正在认证审核中。',
+								complete(ret) {
+									if (ret.confirm) {
+									uni.navigateTo({ url: "/my/renzheng/editCompany" });
+									}
+								}
+							})
+						}
+						if(this.companyStatus==3){
+							uni.showModal({
+								title: '提示',
+								content: '企业认证被拒绝。请修改',
+								complete(ret) {
+									if (ret.confirm) {
+									uni.navigateTo({ url: "/package/jobIntention/underReview" });
+									}
+								}
+							})
+							
+						}
+						
+						
+						
 					} else {
 						this.companyStatus = ''
 					}
@@ -1301,6 +1327,7 @@
 				let data = {
 					companyId: uni.getStorageSync('companyId')
 				}
+				
 				this.$Request.getT('/app/postPush/getCompanyClassify', data).then(res => {
 					if (res.code == 0) {
 						let arr = [
@@ -1309,11 +1336,16 @@
 														name: '全部',
 													}, */
 						]
+						console.log("布的岗位列表",res.data.length)
 						if (res.data.length == 0) {
+							// uni.navigateTo({
+							// 	url: '/pages/my/jobPosting?companyId=' + data.companyId + '&status=' + this
+							// 		.companyStatus + '&companyName=' + this.companyName
+							// })
 							uni.navigateTo({
-								url: '/pages/my/jobPosting?companyId=' + companyId + '&status=' + this
-									.companyStatus + '&companyName=' + this.companyName
+								url: '/pages/jobManagement/jobManagement'
 							})
+							
 						}
 						res.data.map(item => {
 							let obj = {