Merge remote-tracking branch 'remotes/origin/wanghao'

my/enterpriseInfo/enterpriseInfo.vue

@@ -175,7 +175,7 @@
 						工商信息
 					</view>
 					<view class="gsInfo-box-c-item">
-						公司全称：{{info.companyName?info.companyName:''}}
+						公司全称：{{info.companyAllName?info.companyAllName:''}}
 					</view>
 					<view class="gsInfo-box-c-item">
 						成立时间：{{info.companyCreateTime?info.companyCreateTime:''}}
@@ -191,7 +191,7 @@
 		</view>
 
 		<!-- 全部岗位弹窗 -->
-		<btnPopous ref="jobPopup" v-if="showJobPopup && companyId" :companyId="companyId" :cittArr="cittArr" :classify="classify" :moneyArr="moneyArr"
+		<btnPopous ref="jobPopup" v-if="showJobPopup && companyId&&classify.length>0" :companyId="companyId" :cittArr="cittArr" :classify="classify" :moneyArr="moneyArr"
 			:jyArr="jyArr" @closePopup="closeJobPopup" />
 			
 		<u-popup v-model="shows" z-index="99999" mode="bottom" border-radius="14" height="300rpx">
@@ -524,17 +524,21 @@
 						res.data.photosArr=res.data.photosArr?res.data.photos.split(','):[]
 						that.talentList=res.data.companyPeopleDevelop?res.data.companyPeopleDevelop.split(','):[]
 						that.businessList=res.data.workDescribe?res.data.workDescribe.split(','):[]
-						if(res.data.hr)
-						res.data.hr.forEach(function(item,index){
-							item.name='匿名'
-							item.color=color[index%3]
-							for(const user of res.data.userEntities) {
-							    if(item.userId == user.userId) {
-							        item.name = user.userName;
-							        break; // 直接跳出循环
-							    }
-							}
-						})
+						if(res.data.hr){
+							res.data.hr.forEach(function(item,index){
+								if (item) {
+									item.name='匿名'
+									item.color=color[index%3]
+									for(const user of res.data.userEntities) {
+									    if(item.userId == user.userId) {
+									        item.name = user.userName;
+									        break; // 直接跳出循环
+									    }
+									}
+								}
+
+							})
+						}
 						this.info = res.data
 						if (this.info.companyName) {
 							uni.setNavigationBarTitle({

my/renzheng/editCompany.vue

@@ -21,7 +21,7 @@
             />
           </view>
         </view>
-        <view class="ms-item-content" v-if="baseMsg">
+        <view class="ms-item-content" v-if="baseMsg" @click="goEditCompanyInfo">
           <view class="name-content-item">
             <view class="name-item">品牌logo</view>
             <view class="value-item">
@@ -38,7 +38,7 @@
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
-          <view class="name-content-item">
+          <view class="name-content-item" >
             <view class="name-item">公司全称</view>
             <view class="value-item">
               <text v-if="!companyinfo.companyAllName">未添加</text>
@@ -103,7 +103,7 @@
         </view>
       </view>
       <view class="ms-item">
-        <view class="ms-item-title">
+        <view class="ms-item-title" @click="goCompanyMsg">
           <view class="ms-title-txt">公司介绍</view>
           <view class="ms-title-icon">
             <text v-if="!companyinfo.companyContent">未添加</text>
@@ -128,7 +128,7 @@
         </view> -->
       </view>
       <view class="ms-item">
-        <view class="ms-item-title">
+        <view class="ms-item-title" @click="goCompanyMsg">
           <view class="ms-title-txt">主营业务</view>
           <view class="ms-title-icon">
             <text v-if="!companyinfo.companyScope">未添加</text>
@@ -153,7 +153,7 @@
         </view> -->
       </view>
       <view class="ms-item">
-        <view class="ms-item-title">
+        <view class="ms-item-title" @click="goCompanyMsg">
           <view class="ms-title-txt">公司相册</view>
           <view class="ms-title-icon">
            <text v-if="!companyinfo.photos">未添加</text>
@@ -178,7 +178,7 @@
         </view> -->
       </view>
       <view class="ms-item">
-        <view class="ms-item-title" @click="checkPeopleDev">
+        <view class="ms-item-title" @click="goCompanyMsg">
           <view class="ms-title-txt">人才发展</view>
           <view class="ms-title-icon">
            <text v-if="!companyinfo.companyPeopleDevelop">未添加</text>
@@ -262,6 +262,9 @@ export default {
     },
     goCompanyMsg(){
         uni.navigateTo({ url: '/my/renzheng/companyMsg' })
+    },
+    goEditCompanyInfo(){
+        uni.navigateTo({ url: '/my/renzheng/index' })
     },
 	// 查询用户企业状态
 	getcompanystatus() {
@@ -275,6 +278,7 @@ export default {
 					return;
 				}
 				this.companyinfo = res.data || {};
+        this.$queue.setData('companyId', res.data.companyId);
 				console.log("查询用户企业状态", this.companyinfo)
 			})
 			.catch((err) => {

pages/my/index.vue

@@ -380,17 +380,17 @@
 							<!-- 记录栏 -->
 							<view class="info-box-num flex align-center justify-between" v-if="XCXIsSelect != '否'">
 								<view class="info-box-num-td"
-									@click="goNav('/pages/recruitmentData/communicationRecords')">
+									@click="goNav('/pages/recruitmentData/communicationRecords?tab=0')">
 									<view class="info-box-num-td-num"> 0 </view>
 									<view class="info-box-num-td-name">沟通过</view>
 								</view>
 								<view class="info-box-num-td"
-									@click="goNav('/pages/recruitmentData/communicationRecords')">
+									@click="goNav('/pages/recruitmentData/communicationRecords?tab=1')">
 									<view class="info-box-num-td-num"> 0 </view>
 									<view class="info-box-num-td-name">面试</view>
 								</view>
 								<view class="info-box-num-td"
-									@click="goNav('/pages/recruitmentData/communicationRecords')">
+									@click="goNav('/pages/recruitmentData/communicationRecords?tab=2')">
 									<view class="info-box-num-td-num"> 0 </view>
 									<view class="info-box-num-td-name">收藏</view>
 								</view>
@@ -494,9 +494,9 @@
 										<view class=""> 招聘刷新 </view>
 									</view>
 									<view class="jobServer-box-btn-item flex justify-center flex-wrap"
-										@click="goNav('/my/renzheng/index')">
+										@click="goNav('/my/enterpriseInfo/enterpriseInfo?companyId=' + $queue.getData('companyId'))">
 										<image src="../../static/images/index/fwzx.svg" mode=""></image>
-										<view class=""> 认证中心 </view>
+										<view class=""> 公司主页 </view>
 									</view>
 									<view class="jobServer-box-btn-item flex justify-center flex-wrap"
 										@click="goNav('/package/deliveryRecord/deliveryRecord')">
@@ -620,21 +620,21 @@
 											我的权益
 										</view>
 									</view>
-									<view class="util-item">
+									<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">
 											钱包
 										</view>
 									</view>
-									<view class="util-item">
+									<view class="util-item" @click="showToast('功能开发中')">
 										<image src="../../static/images/my/icon/utils/invoice.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											发票
 										</view>
 									</view>
-									<view class="util-item">
+									<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">
@@ -828,7 +828,7 @@
 			};
 		},
 		onLoad(e) {
-			console.log(this.token);
+			console.log(e);
 			this.XCXIsSelect = this.$queue.getData("XCXIsSelect");
 			var that=this
 			uni.$on('changeRole',function(res){
@@ -960,6 +960,12 @@
 					// #endif
 				}
 			},
+			showToast(title) {
+				uni.showToast({
+					title: title,
+					icon: "none",
+				});
+			},
 			goNavStatus(url) {
 				if (this.companyStatus) {
 					if (this.companyStatus == 1) {

pages/recruitmentData/communicationRecords.vue

@@ -286,78 +286,13 @@ export default {
         { name: '收藏简历' },
         // { name: '收藏职位' }
       ],
-      communicationRecords: [
-        {
-          id: 1,
-          name: '刘先生',
-          avatar: '../../static/images/avator.png',
-          isOnline: true,
-          isHot: true,
-          experience: '8年',
-          education: '本科',
-          salary: '10-15K',
-          jobStatus: '在职&考虑机会',
-          currentJob: '通拓集团·店铺运营',
-          jobExpectation: '亚马逊运营',
-          skills: ['精品', '铺货', 'TikTok', '平台运营', '投放策略', '3C数码'],
-          description: '负责Amazon英国、欧洲站、制定推广与销售计划,达成团队要求的销售业绩;做好数据的统计分析工作,收集、分析...',
-          workPeriod: '1年10个月',
-          date: '07-24'
-        },
-        {
-          id: 2,
-          name: '刘先生',
-          avatar: '../../static/images/avator.png',
-          isOnline: true,
-          isHot: true,
-          experience: '8年',
-          education: '本科',
-          salary: '10-15K',
-          jobStatus: '在职&考虑机会',
-          currentJob: '通拓集团·店铺运营',
-          jobExpectation: '亚马逊运营',
-          skills: ['精品', '铺货', 'TikTok', '平台运营', '投放策略', '3C数码'],
-          description: '负责Amazon英国、欧洲站、制定推广与销售计划,达成团队要求的销售业绩;做好数据的统计分析工作,收集、分析...',
-          workPeriod: '1年10个月',
-           date: '07-25'
-         }
-       ],
+      communicationRecords: [],
        // 面试相关数据
        selectedDate: null, // 当前选中的日期
        // 收藏相关数据
        favoriteRecords: [], // 收藏记录（空数组，显示空状态）
        favoriteJobs: [], // 收藏职位（空数组，显示空状态）
        interviewRecords: [
-         {
-           dateLabel: '今天',
-           time: '20:40',
-           candidateName: '刘先生',
-           experience: '8年',
-           education: '本科',
-           salary: '10-15K',
-           isToday: true,
-           isTomorrow: false
-         },
-         {
-           dateLabel: '明天',
-           time: '20:40',
-           candidateName: '刘先生',
-           experience: '8年',
-           education: '本科',
-           salary: '10-15K',
-           isToday: false,
-           isTomorrow: true
-         },
-         {
-           dateLabel: '8月15日',
-           time: '20:40',
-           candidateName: '刘先生',
-           experience: '8年',
-           education: '本科',
-           salary: '10-15K',
-           isToday: false,
-           isTomorrow: false
-         }
        ]
      }
   },
@@ -414,7 +349,9 @@ export default {
        return weekDates
      }
    },
-  onLoad() {
+  onLoad(options) {
+    console.log(options);
+    this.activeTab = options.tab ? parseInt(options.tab) : 0
     const systemInfo = uni.getSystemInfoSync()
     this.statusBarHeight = systemInfo.statusBarHeight || 0
 	  this.getData()