12

common/httpRequest.js

@@ -226,7 +226,7 @@ module.exports = {
 								title: '用户信息失效，请重新登录！',
 								icon: 'none'
 							})
-						}else if (result.data.code !=0) 
+						}else if (result.data.code !=0&&result.data.msg!='未进入公司') 
 							uni.showToast({
 								title: result.data.msg||'查询失败',
 								icon: 'none'
@@ -248,7 +248,7 @@ module.exports = {
 						"content-type": header
 					},
 					success: function(result) {
-						if (result.data.code !=0)
+						if (result.data.code !=0&&result.data.msg!='未进入公司')
 							uni.showToast({
 								title: result.data.msg||'查询失败',
 								icon: 'none'
@@ -291,7 +291,7 @@ module.exports = {
 							title: '用户信息失效，请重新登录！',
 							icon: 'none'
 						})
-					}else if (result.data.code !=0) 
+					}else if (result.data.code !=0&&result.data.msg!='未进入公司') 
 							uni.showToast({
 								title: result.data.msg||'查询失败',
 								icon: 'none'

components/btnPopous/btnPopous.vue

@@ -75,7 +75,7 @@
 									<view class="company-info-text" v-if="item.company">
 										{{item.user&&item.user.userName?item.user.userName:'未知'}}·{{item.hr&&item.hr.hrPosition||'人事总监'}}
 									</view>
-									<view class="reply-time">10分钟前回复</view>
+									<view v-if="item.respondTime" class="reply-time">{{item.respondTime}}</view>
 								</view>
 								<view class="location-text">
 								  {{item.distance}} {{item.county}}

pages/msg/addmsg.vue

@@ -81,7 +81,7 @@
 					<empty v-if="list.length == 0" content='暂无相关内容'></empty>
 					
 					<!-- 自定义标签下的添加按钮 -->
-					<view class="custom-add-button" @click="goAdd(0,0)">
+					<view class="custom-add-button" @click="goAdd(0,0,0)">
 						<!-- 
 							<u-icon name="plus" color="#fff" size="30" style="margin-right: 10upx;"></u-icon>
 						-->

pages/msg/im.vue

@@ -2039,7 +2039,7 @@
 				this.$Request.getT('/app/message/selectMessageByUserId?page=1&limit=100&state=20')
 					.then(res => {
 						if (res.code == 0) {
-							this.changYongList = [];
+							this.changYongList = [{label:'你好，很高兴认识您',value:0}];
 							res.data.list.forEach(d => {
 								let data = {
 									label: d.content,

pages/my/index.vue

@@ -355,9 +355,11 @@
 						<view class="info-box">
 							<view v-if="XCXIsSelect != '否'" class="info-box-btn flex justify-end align-center">
 								<image src="@/static/images/jobApplicant/qiehuan.svg" mode="scaleToFill"
-									style="margin-top: 40rpx" @click="goNav('switchRoles')" />
+									style="margin-top: 40rpx;margin-right:30rpx" @click="goNav('switchRoles')" />
+								<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">
+							<view class="info-box-header flex align-center" @click="goNav('/my/renzheng/editCompany')">
 								<view class="info-box-header-l">
 									<image :src="avatar ? avatar : '../../static/logo.png'"
 										@click="goNav('/pages/my/userinfo')" mode=""></image>
@@ -370,11 +372,9 @@
 											src="../../static/images/my/isVip.png" mode=""></image>
 									</view>
 								
-									<view v-if="XCXIsSelect != '否'" class="info-box-header-r-bj flex align-center"
-										@click="goNav('/my/renzheng/editCompany')">
+									<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"
-											@click.stop="goNav('/my/renzheng/editCompany')" />
+										<image src="@/static/images/jobApplicant/edit-user.svg" mode="scaleToFill"/>
 									</view>
 								</view>
 							</view>
@@ -479,7 +479,7 @@
 							<view class="jobServer-box-c">
 								<view class="jobServer-box-title"> 招聘服务 </view>
 								<view class="jobServer-box-btn flex justify-between">
-									<view class="jobServer-box-btn-item flex justify-center flex-wrap"
+									<view v-if="$queue.getData('companyId')" class="jobServer-box-btn-item flex justify-center flex-wrap"
 										@click="goNav('/pages/recruitmentData/index')">
 										<image src="../../static/images/index/shuju.svg" mode=""></image>
 										<view class=""> 招聘数据 </view>
@@ -494,7 +494,7 @@
 										<image src="../../static/images/index/cpbk.svg" mode=""></image>
 										<view class=""> 招聘刷新 </view>
 									</view>
-									<view class="jobServer-box-btn-item flex justify-center flex-wrap"
+									<view v-if="$queue.getData('companyId')" class="jobServer-box-btn-item flex justify-center flex-wrap"
 										@click="goNav('/my/enterpriseInfo/enterpriseInfo?companyId=' + $queue.getData('companyId'))">
 										<image src="../../static/images/index/fwzx.svg" mode=""></image>
 										<view class=""> 公司主页 </view>
@@ -621,7 +621,7 @@
 											我的权益
 										</view>
 									</view>
-									<view class="util-item" @click="showToast('功能开发中')">
+									<!-- <view class="util-item" @click="showToast('功能开发中')">
 										<image src="../../static/images/my/icon/utils/wallet.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
@@ -634,14 +634,14 @@
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											发票
 										</view>
-									</view>
-									<view class="util-item" @click="showToast('功能开发中')">
+									</view> -->
+									<!-- <view class="util-item" @click="showToast('功能开发中')">
 										<image src="../../static/images/my/icon/utils/user.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											个人主页
 										</view>
-									</view>
+									</view> -->
 									<view class="util-item" @click="goNav('/pages/my/myCompany')">
 										<image src="../../static/images/my/icon/utils/company.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
@@ -656,13 +656,13 @@
 											我的客服
 										</view>
 									</view>
-									<view class="util-item" @click="goNav('/my/setting/mimi')">
+									<!-- <view class="util-item" @click="goNav('/my/setting/mimi')">
 										<image src="../../static/images/my/icon/utils/privacy.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											隐私规则
 										</view>
-									</view>
+									</view> -->
 									<!-- <view v-if="XCXIsSelect != '否'" class="util-item"
 										@click="goNav('/package/myLove/myLove')">
 										<image src="../../static/images/my/icon/utils/myLovere.png"
@@ -737,13 +737,13 @@
 											帮助中心
 										</view>
 									</view>--> 
-									<view v-if="token" class="util-item" @click="goOut()">
+									<!-- <view v-if="token" class="util-item" @click="goOut()">
 										<image src="../../static/images/my/icon/utils/utils8.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											退出登录
 										</view>
-									</view> 
+									</view> -->
 								</view>
 							</view>
 						</view>