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

my/feedback/jubao.vue

@@ -89,7 +89,7 @@
 							title: '上传中...'
 						});
 						uni.uploadFile({
-							url: 'https://zp.xianmaxiong.com/sqx_fast/alioss/upload',
+							url: 'https://h5.bosszan.com/sqx_fast/alioss/upload',
 							// url: config.APIHOST + '/alioss/upload',
 							filePath: res.tempFilePaths[0],
 							name: 'file',

my/renzheng/index.vue

@@ -602,7 +602,7 @@ export default {
             uni.uploadFile({
               // 上传接口
               // url:configdata.APIHOST1+'/alioss/upload',
-              url: "https://zp.xianmaxiong.com/sqx_fast/alioss/upload",
+              url: "https://h5.bosszan.com/sqx_fast/alioss/upload",
               filePath: res.tempFilePaths[i],
               name: "file",
               success: (uploadFileRes) => {

pages.json

@@ -1369,22 +1369,22 @@
 		"list": [
 			{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/tabbar/Home.png",
-				"selectedIconPath": "static/tabbar/Iconly_Bold_Home.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/index/game/gameList",
-				"iconPath": "static/tabbar/jipin.png",
-				"selectedIconPath": "static/tabbar/ACjipin.png",
-				"text": "急聘"
+				"iconPath": "static/tabbar/niu.png",
+				"selectedIconPath": "/static/tabbar/niu2.png",
+				"text": "牛人"
 			},
 			// {
-			// 	"pagePath": "pages/talentSearch/index",
-			// 	"iconPath": "static/tabbar/Hrsearch.png",
-			// 	"selectedIconPath": "static/tabbar/ACsearch.png",
-			// 	"text": "搜索"
+			// 	"pagePath": "pages/index/game/gameList",
+			// 	"iconPath": "static/tabbar/jipin.png",
+			// 	"selectedIconPath": "static/tabbar/ACjipin.png",
+			// 	"text": "急聘"
 			// },
+			{
+				"pagePath": "pages/talentSearch/index",
+				"iconPath": "static/tabbar/Hrsearch.png",
+				"selectedIconPath": "static/tabbar/ACsearch.png",
+				"text": "搜索"
+			},
 			{
 				"pagePath": "pages/msg/index",
 				"iconPath": "static/tabbar/Chat.png",

pages/msg/im.vue

@@ -2353,7 +2353,7 @@
 					// url: 'wss://h5.youxb.icu/wss/sqx_fast/chatSocket/' + userId,
 					// url: this.config("WSHOST1") + userId,
 					url: configdata.WSHOST1 + '' + userId,
-					// url: 'wss://zp.xianmaxiong.com/wss/chatSocket/' + userId,
+					// url: 'wss://h5.bosszan.com/wss/chatSocket/' + userId,
 					// url: 'ws://192.168.0.128:7152/sqx_fast/chatSocket/' + userId,
 					data() {
 						return {

pages/my/index.vue

@@ -574,7 +574,65 @@
 						<view class="utils-box flex justify-center">
 							<view class="utils-box-c">
 								<view class="util-list">
-									<view v-if="XCXIsSelect != '否'" class="util-item"
+									<view class="util-item"
+										@click="goNav('/pages/my/ruleCenter')">
+										<image src="../../static/images/my/icon/utils/rulerCenter.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"
+										@click="goNav('/pages/my/VIP/benefits')">
+										<image src="../../static/images/my/icon/utils/benefits.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">
+										<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">
+										<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">
+										<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 class="util-item" @click="goNav('/pages/my/myCompany')">
+										<image src="../../static/images/my/icon/utils/company.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" @click="goChat">
+										<image src="../../static/images/my/icon/utils/kefu.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" @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 v-if="XCXIsSelect != '否'" class="util-item"
 										@click="goNav('/package/myLove/myLove')">
 										<image src="../../static/images/my/icon/utils/myLovere.png"
 											style="width: 54rpx; height: 54rpx" mode=""></image>
@@ -654,7 +712,7 @@
 										<view class="" style="color: #1a1a1a; font-size: 24rpx; margin-top: 15rpx">
 											退出登录
 										</view>
-									</view>
+									</view> -->
 								</view>
 							</view>
 						</view>

pages/recruitmentData/communicationRecords.vue

@@ -59,10 +59,10 @@
                <view class="talent-content">
                  <!-- 头像和基本信息 -->
                  <view class="talent-header">
-                   <image :src="record.avatar" class="talent-avatar" mode="aspectFill"></image>
+                   <image :src="record.userAvatar" class="talent-avatar" mode="aspectFill"></image>
                    <view class="talent-info">
                      <view class="talent-name-section">
-                       <view class="talent-name">{{ record.name }}</view>
+                       <view class="talent-name">{{ record.userName }}</view>
                        <view class="talent-tags">
                          <view class="status-tag online" v-if="record.isOnline">在线</view>
                          <view class="status-tag hot" v-if="record.isHot">热门搜索</view>
@@ -71,9 +71,9 @@
                      </view>
                      <!-- 经验和薪资 -->
                      <view class="talent-experience">
-                       <text class="experience-text">{{ record.experience }}</text>
-                       <text class="education-salary">{{ record.education }} {{ record.salary }}</text>
-                       <text class="status-text">{{ record.jobStatus }}</text>
+                       <text class="experience-text">{{ record.resumesWorkExperience }}</text>
+                       <text class="education-salary">{{ record.resumesEducation }} {{ record.minSalary }}-{{record.maxSalary}}</text>
+                       <text class="status-text">{{ record.resumesStatus==1?'在职&考虑机会':"离职" }}</text>
                      </view>
                    </view>
                  </view>
@@ -88,7 +88,7 @@
                  <!-- 求职期望 -->
                  <view class="job-expectation">
                    <image src="../../static/images/xiangzi.svg" class="job-icon" mode="aspectFit"></image>
-                   <text class="expectation-text">求职期望: {{ record.jobExpectation }}</text>
+                   <text class="expectation-text">求职期望: {{ record.expectedPosition }}</text>
                  </view>
                  
                  <!-- 技能标签 -->
@@ -104,7 +104,7 @@
                  
                  <!-- 工作描述 -->
                  <view class="job-description">
-                   <text class="description-text">{{ record.description }}</text>
+                   <text class="description-text">{{ record.workContent }}</text>
                  </view>
                </view>
              </view>
@@ -348,6 +348,7 @@ export default {
   onLoad() {
     const systemInfo = uni.getSystemInfoSync()
     this.statusBarHeight = systemInfo.statusBarHeight || 0
+	  this.getData()
   },
   methods: {
     goBack() {
@@ -378,7 +379,13 @@ export default {
       uni.navigateTo({
         url: '/pages/recruitmentData/interviewManage'
       })
-    }
+    },
+	getData(){
+		this.$Request.getT("/app/chat/chatUser").then(res=>{
+			console.log(res);
+			this.communicationRecords = res.records //沟通记录
+		})
+	},
  }
 }
 </script>

pages/recruitmentData/dataCenter.vue

@@ -16,14 +16,26 @@
     <!-- Filter Section -->
     <view class="filter-section">
       <view class="filter-buttons">
-        <view class="filter-btn" @click="selectDateRange">
+        <!-- <view class="filter-btn" @click="selectDateRange">
           <text class="filter-text">2025.07.30-08.06</text>
           <u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
-        </view>
-        <view class="filter-btn" @click="selectPosition">
+        </view> -->
+        <!-- <view class="filter-btn" @click="selectPosition">
           <text class="filter-text">亚马逊运营总监</text>
           <u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
-        </view>
+        </view> -->
+        <picker @change="changeDate" :value="weekIndex" :range="weekList" :range-key="'name'">
+          <view class="filter-btn" >
+            <text class="filter-text">{{weekList.length?weekList[weekIndex].name:'/'}}</text>
+            <u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
+          </view>
+		    </picker>
+        <picker @change="changeZw" :value="zwIndex" :range="zwList" :range-key="'name'">
+			    <view class="filter-btn">
+			    	<text class="filter-text">{{zwList.length?zwList[zwIndex].name:'/'}}</text>
+			    	<u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
+			    </view>
+		    </picker>
       </view>
     </view>
 
@@ -49,14 +61,14 @@
              <view class="data-item">
                <text class="data-label">我看过</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">1120</text>
+                 <text class="data-value">{{dataStatics.iSaw}}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
              <view class="data-item">
                <text class="data-label">看过我</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">2120</text>
+                 <text class="data-value">{{dataStatics.sawMe}}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
@@ -78,14 +90,14 @@
              <view class="data-item">
                <text class="data-label">我沟通</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">1120</text>
+                 <text class="data-value">{{ dataStatics.iCommunicated }}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
              <view class="data-item">
                <text class="data-label">求职者</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">2120</text>
+                 <text class="data-value">{{ dataStatics.candidateCommunicated }}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
@@ -107,31 +119,31 @@
              <view class="data-item">
                <text class="data-label">合计</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">1120</text>
+                 <text class="data-value">{{dataStatics.receivedResumes+dataStatics.exchangedContact}}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
              <view class="data-item">
                <text class="data-label">获取简历</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">2120</text>
+                 <text class="data-value">{{dataStatics.receivedResumes}}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
              <view class="data-item">
-               <text class="data-label">交换电话</text>
+               <text class="data-label">交换电话/微信</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">2120</text>
+                 <text class="data-value">{{dataStatics.exchangedContact}}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
-             <view class="data-item">
+             <!-- <view class="data-item">
                <text class="data-label">交换微信</text>
                <view class="data-value-wrapper">
                  <text class="data-value">2120</text>
                  <text class="data-unit">人</text>
                </view>
-             </view>
+             </view> -->
            </view>
          </view>
        </view>
@@ -150,14 +162,14 @@
              <view class="data-item">
                <text class="data-label">邀约面试</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">1120</text>
+                 <text class="data-value">{{dataStatics.acceptedInterview}}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
              <view class="data-item">
                <text class="data-label">接受面试</text>
                <view class="data-value-wrapper">
-                 <text class="data-value">2120</text>
+                 <text class="data-value">{{dataStatics.acceptedInterview}}</text>
                  <text class="data-unit">人</text>
                </view>
              </view>
@@ -170,21 +182,84 @@
 
 <script>
 import navBar from "@/components/nav-bar/index.vue";
-
+import { getPrevious8Weeks } from './dateFormate'
 export default {
   components: {
     navBar
   },
   data() {
     return {
-      statusBarHeight: 0
+      statusBarHeight: 0,
+      zwList:[],
+      zwIndex:0,
+      weekList:[],
+      weekIndex:0,
+      dataStatics:{}
     }
   },
   onLoad() {
     const systemInfo = uni.getSystemInfoSync()
-    this.statusBarHeight = systemInfo.statusBarHeight || 0
+    this.statusBarHeight = systemInfo.statusBarHeight || 0;
+    this.getZwList()
+    this.weekList=[]
+    getPrevious8Weeks(new Date()).forEach(it=>{
+      // this.weekList.push([
+      //   it[0],it[1],it.join('~')
+      // ]),
+      this.weekList.push({
+        start:it[0],
+        end:it[1],
+        name:it.join('~')
+      })
+    })
   },
   methods: {
+    changeDate(e){
+      this.weekIndex=e.detail.value;
+      this.getDataStatics()
+    },
+    getZwList(){
+	    this.$Request.getT("/app/postPush/getMyPostPush").then(res=>{
+		    res.data.records.forEach(item=>{
+		    	this.zwList.push({
+		    		name:item.ruleClassifyName,
+		    		id:item.postPushId
+		    	})
+		    })
+        this.getDataStatics()
+	    })
+	  },
+    changeZw(e){
+      this.zwIndex=e.detail.value;
+      this.getDataStatics()
+    },
+    getDataStatics(){
+		  let data = {
+		  	postPushId:this.zwList[this.zwIndex].id,
+		  	todayStart:this.formatDateRange(new Date(),new Date())[0],
+		  	todayEnd:this.formatDateRange(new Date(),new Date())[1],
+		  }
+		  this.$Request.getT("/app/user/userYesterdayData",data).then(res=>{
+        this.dataStatics=res.data;
+		  })
+	  },
+    formatDateRange(startDate, endDate) {
+	    // 格式化日期为 YYYY-MM-DD 格式
+	    const formatDate = (date) => {
+	        const year = date.getFullYear();
+	        const month = String(date.getMonth() + 1).padStart(2, '0');
+	        const day = String(date.getDate()).padStart(2, '0');
+	        return `${year}-${month}-${day}`;
+	    };
+	    
+	    // 创建开始日期的 00:00:00
+	    const startDateTime = `${formatDate(startDate)} 00:00:00`;
+	    
+	    // 创建结束日期的 23:59:59
+	    const endDateTime = `${formatDate(endDate)} 23:59:59`;
+	    
+	    return [startDateTime, endDateTime];
+	  },
     goBack() {
       uni.navigateBack()
     },

pages/recruitmentData/dateFormate.js

@@ -0,0 +1,40 @@
+export function  getPrevious8Weeks(currentDate) {
+    // 确保传入的是Date对象
+    const date = new Date(currentDate);
+    
+    // 获取当前日期是星期几（0-6，0代表周日）
+    const currentDay = date.getDay();
+    
+    // 计算当前周的周一（将周日作为一周的最后一天）
+    const mondayOffset = currentDay === 0 ? -6 : 1 - currentDay;
+    const currentMonday = new Date(date);
+    currentMonday.setDate(date.getDate() + mondayOffset);
+    
+    const result = [];
+    
+    // 生成前8个自然周的日期范围（从上一周开始，不包含当前周）
+    for (let i = 1; i <= 8; i++) {
+      const weekStart = new Date(currentMonday);
+      weekStart.setDate(currentMonday.getDate() - i * 7);
+      
+      const weekEnd = new Date(weekStart);
+      weekEnd.setDate(weekStart.getDate() + 6);
+      
+      // 格式化日期为 YYYY-MM-DD
+      const startStr = formatDate(weekStart);
+      const endStr = formatDate(weekEnd);
+      
+      result.push([startStr, endStr]);
+    }
+    
+    return result;
+  }
+  
+  // 辅助函数：格式化日期为 YYYY-MM-DD
+  function formatDate(date) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  }
+  

pages/recruitmentData/index.vue

@@ -28,10 +28,12 @@
             <text>今日数据</text>
             <image src="/static/images/qiehuan.svg" class="switch-icon" mode="aspectFit" @click="goToDataCenter"></image>
           </view>
-          <view class="filter-btn" @click="goToDataCenter">
-            <text class="filter-text">亚马逊运营总监</text>
-            <u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
-          </view>
+		  <picker @change="changeZw" :value="zwIndex" :range="zwList" :range-key="'name'">
+			<view class="filter-btn">
+				<text class="filter-text">{{zwList.length?zwList[zwIndex].name:''}}</text>
+				<u-icon name="arrow-down" color="#016BF6" size="16"></u-icon>
+			</view>
+		  </picker>
         </view>
         
         <view class="data-grid">
@@ -109,52 +111,112 @@ export default {
     return {
       statusBarHeight: 0,
       todayData: [
-        { title: '我看过', number: 1120, change: -9 },
-        { title: '看过我', number: 1120, change: -9 },
-        { title: '我沟通', number: 1120, change: -9 },
-        { title: '求职者沟通', number: 1120, change: -9 },
-        { title: '收获简历', number: 1120, change: -9 },
-        { title: '交换电话微信', number: 1120, change: -9 },
-        { title: '接受面试', number: 1120, change: -9 }
+        { title: '我看过', number: 0, change: 0 },
+        { title: '看过我', number: 0, change: -9 },
+        { title: '我沟通', number: 0, change: -9 },
+        { title: '求职者沟通', number: 0, change:0 },
+        { title: '收获简历', number: 0, change: 0 },
+        { title: '交换电话微信', number: 0, change: 0 },
+        { title: '接受面试', number: 0, change: 0 }
       ],
       benefitsData: [
         {
           action: '查看',
           type: '招聘职位',
-          used: 4,
+          used: 0,
           total: 10,
           isUrgent: false
         },
         {
           action: '沟通',
           type: '招聘职位',
-          used: 4,
+          used: 0,
           total: 10,
           isUrgent: false
         },
         {
           action: '查看',
           type: '急聘职位',
-          used: 4,
+          used: 0,
           total: 10,
           isUrgent: true
         },
         {
           action: '沟通',
           type: '急聘职位',
-          used: 4,
+          used: 0,
           total: 10,
           isUrgent: true
         }
-      ]
+      ],
+	    zwList:[],
+	    zwIndex:0,
+	  
     }
   },
   onLoad() {
     // 获取状态栏高度
     const systemInfo = uni.getSystemInfoSync()
     this.statusBarHeight = systemInfo.statusBarHeight || 0
+	// this.getData()
+	this.getZwList()
   },
   methods: {
+	getZwList(){
+	  this.$Request.getT("/app/postPush/getMyPostPush").then(res=>{
+		  res.data.records.forEach(item=>{
+		  	this.zwList.push({
+		  		name:item.ruleClassifyName,
+		  		id:item.postPushId
+		  	})
+		  })
+			this.getDataStatics()
+	  })
+	},
+	getDataStatics(){
+		let data = {
+			postPushId:this.zwList[this.zwIndex].id,
+			todayStart:this.formatDateRange(new Date(),new Date())[0],
+			todayEnd:this.formatDateRange(new Date(),new Date())[1],
+		}
+		this.$Request.getT("/app/user/userYesterdayData",data).then(res=>{
+      this.todayData[0].number=res.data.iSaw;
+      this.todayData[0].change=res.data.tyIsaw;
+      this.todayData[1].number=res.data.sawMe;
+      this.todayData[1].change=res.data.tySawMe;
+      this.todayData[2].number=res.data.iCommunicated;
+      this.todayData[2].change=res.data.tyICommunicated;
+      this.todayData[3].number=res.data.tyCandidateCommunicated;
+      this.todayData[3].change=res.data.tyCandidateCommunicated;
+      this.todayData[4].number=res.data.receivedResumes;
+      this.todayData[4].change=res.data.tyReceivedResumes;
+      this.todayData[5].number=res.data.exchangedContact;
+      this.todayData[5].change=res.data.tyExchangedContact;
+      this.todayData[6].number=res.data.acceptedInterview;
+      this.todayData[6].change=res.data.tyAcceptedInterview;
+
+    })
+	},
+	formatDateRange(startDate, endDate) {
+	    // 格式化日期为 YYYY-MM-DD 格式
+	    const formatDate = (date) => {
+	        const year = date.getFullYear();
+	        const month = String(date.getMonth() + 1).padStart(2, '0');
+	        const day = String(date.getDate()).padStart(2, '0');
+	        return `${year}-${month}-${day}`;
+	    };
+	    
+	    // 创建开始日期的 00:00:00
+	    const startDateTime = `${formatDate(startDate)} 00:00:00`;
+	    
+	    // 创建结束日期的 23:59:59
+	    const endDateTime = `${formatDate(endDate)} 23:59:59`;
+	    
+	    return [startDateTime, endDateTime];
+	},
+	changeZw (e){
+		this.zwIndex=e.detail.value
+	},
     getBenefitIcon(action) {
       switch(action) {
         case '查看':
@@ -176,11 +238,19 @@ export default {
     toggleWeekData() {
       // 切换周数据视图
       console.log('切换周数据')
+	  uni.navigateTo({
+	    url: '/pages/recruitmentData/dataCenter'
+	  })
     },
     showDetail(item) {
       // 显示详情
       console.log('显示详情:', item)
-    }
+    },
+	getData(){
+		this.$Request.getT("/app/user/userData").then(res=>{
+			
+		})
+	},
   }
 }
 </script>

pages/talentSearch/resumeDetail.vue

@@ -54,7 +54,7 @@
 			<!-- 个人优势 -->
 			<view class="section-item">
 				<view class="advantage-content">
-					{{resumeList.adv || '这是求职者的个人优势这是求职者的个人优势这是求职者的个人优势这是求职者的个人优势这是求职者的个人优势这是求职者的个人优势这是求职者的个人优。(最多展示三行)'}}
+					{{resumeList.adv || '暂无个人优势。(最多展示三行)'}}
 				</view>
 			</view>