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

common/queue.js

@@ -36,6 +36,7 @@ module.exports = {
 		this.remove("isInvitation");
 		this.remove("userType");
 		this.remove("member");
+		this.remove('companyId')
 	},
 	loginClear() {
 		this.remove("token");

pages/my/index.vue

@@ -363,10 +363,10 @@
 								<image src="@/static/images/jobApplicant/shezhi.svg" mode="scaleToFill"
 									style="margin-top: 40rpx;" @click="goNav('/pages/my/setup')" />
 							</view>
-							<view class="info-box-header flex align-center" @click="goNav('/my/renzheng/editCompany')">
+							<view class="info-box-header flex align-center" @click="goNav('/pages/my/userinfo')">
 								<view class="info-box-header-l">
 									<image :src="avatar ? avatar : '../../static/logo.png'"
-										@click.stop="goNav('/pages/my/userinfo')" mode=""></image>
+										 mode=""></image>
 								</view>
 								<view class="info-box-header-r">
 									<view class="info-box-header-r-name flex align-center">
@@ -377,9 +377,13 @@
 									</view>
 
 									<view v-if="XCXIsSelect != '否'" class="info-box-header-r-bj flex align-center">
-										{{ companyInfo.companyAllName || "编辑企业信息" }}
-										<image src="@/static/images/jobApplicant/edit-user.svg" mode="scaleToFill" />
+										{{ companyInfo.companyAllName || "" }}
+										<!-- <image src="@/static/images/jobApplicant/edit-user.svg" mode="scaleToFill" /> -->
 									</view>
+										
+								</view>
+								<view class="arrow-icon" style="margin-left: 10%;">
+									<u-icon name="arrow-right" color="#FFF" size="24"></u-icon>
 								</view>
 							</view>
 							<!-- 记录栏 -->
@@ -495,14 +499,14 @@
 										<image src="../../static/images/index/qwzn.svg" mode=""></image>
 										<view class=""> 发布招聘 </view>
 									</view>
-									<view class="jobServer-box-btn-item flex justify-center flex-wrap"
+									<!-- <view class="jobServer-box-btn-item flex justify-center flex-wrap"
 										@click="refreshJob()">
 										<image src="../../static/images/index/cpbk.svg" mode=""></image>
 										<view class=""> 招聘刷新 </view>
-									</view>
-									<view v-if="$queue.getData('companyId')"
+									</view> -->
+									<view
 										class="jobServer-box-btn-item flex justify-center flex-wrap"
-										@click="goNav('/my/enterpriseInfo/enterpriseInfo?companyId=' + $queue.getData('companyId'))">
+										@click="$queue.getData('companyId')?goNav('/my/renzheng/editCompany?companyId=' + $queue.getData('companyId')):goNav('/pages/my/businessLicense')">
 										<image src="../../static/images/index/fwzx.svg" mode=""></image>
 										<view class=""> 公司主页 </view>
 									</view>
@@ -1026,8 +1030,10 @@ export default {
 				uni.showModal({
 					title: "提示",
 					content: "还未完成企业认证，请完成企业认证后操作",
-					complete(ret) {
-						if (ret.confirm) { }
+					success(ret) {
+						if (ret.confirm) {uni.navigateTo({
+									url: "/pages/my/businessLicense",
+								}) }
 					},
 				});
 			}
@@ -2054,6 +2060,7 @@ page {
 			}
 
 			.info-box-header-r {
+				width: 80%;
 				.info-box-header-r-name {
 					color: rgba(255, 255, 255, 1);
 					font-family: DM Sans;