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

components/hg-level4-address/hgLevel4Address.vue

@@ -47,6 +47,10 @@
 			county: {
 				type: [String, Number],
 				default: ''
+			},
+			street: {
+				type: [String, Number],
+				default: ''
 			}
 		},
 		data() {
@@ -104,19 +108,18 @@
 
 				for (const province of this.addressData) {
 					for (const city of province.children || []) {
-						if (city.code == this.city || city.name.indexOf(this.city) !== -1) {
+						if (this.city!=''&&(city.code == this.city || city.name.indexOf(this.city) !== -1)) {
 							this.selectedProvince = province
 							this.selectedCity = city
-							
 							for (const area of city.children || []) {
-								if (area.code == this.county || area.name.indexOf(this.county) !== -1) {
+								if (this.county!=''&&(area.code == this.county || area.name.indexOf(this.county) !== -1)) {
 									this.selectedArea=area
 								}
-							}
-	
-							this.selectedStreet = {
-								code: 'all',
-								name: '全部'
+								for (const street of area.children || []) {
+									if (this.street!=''&&(street.code == this.street || street.name.indexOf(this.street) !== -1)) {
+										this.selectedStreet=street
+									}
+								}
 							}
 							return
 						}
@@ -160,7 +163,7 @@
 
 			/** 街道选择 */
 			selectStreet(street) {
-				return this.$queue.showToast('街道选择暂未开放，')
+				return this.$queue.showToast('街道选择暂未开放')
 				this.selectedStreet = street
 			},
 

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" });
 		}

package/screen/city.vue

@@ -12,7 +12,7 @@
 			</view>
 		</view>
 		 <view class="content">
-			<hg-level4-address :city="city" :county="county"
+			<hg-level4-address :city="city" :county="county" :street="street"
 			  placeholder="请选择地址"
 			  @confirm="onAddressConfirm"
 			  >         
@@ -32,14 +32,16 @@
 				statusBarHeight: 0, // 状态栏高度
 				city: '', //市
 				county: '', //区
+				street:''//街道
 			};
 		},
 		onLoad(options) {
 			// 获取状态栏高度
 			let systemInfo = uni.getSystemInfoSync();
 			this.statusBarHeight = systemInfo.statusBarHeight || 0;
-			this.city = options&&options.city
-			this.county = options&&options.county
+			this.city = options&&options.city||''
+			this.county = options&&options.county||''
+			this.street = options&&options.street||''
 		},
 		onShow() {
 

pages/index/index.vue

@@ -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 = {