From 940a52caa18fa62d9b0c220e2bfa8c98ea68626c Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Wed, 5 Feb 2025 14:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                             | 14 +++++++++-----
 .../FirstJob/components/rightPanel/active.vue         |  5 +++++
 src/components/FirstJob/components/rightPanel/hot.vue | 13 +++++++++++++
 .../FirstJob/components/rightPanel/recommend.vue      |  5 +++++
 .../FirstJob/components/rightPanel/sponsor.vue        |  5 +++++
 src/components/FirstJob/joblist.vue                   | 19 +++++++++++++++++--
 src/views/main.vue                                    |  4 ----
 7 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 src/components/FirstJob/components/rightPanel/active.vue
 create mode 100644 src/components/FirstJob/components/rightPanel/hot.vue
 create mode 100644 src/components/FirstJob/components/rightPanel/recommend.vue
 create mode 100644 src/components/FirstJob/components/rightPanel/sponsor.vue

diff --git a/README.md b/README.md
index 92a4cc7..320da9c 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,17 @@
 ## 伯才供应链
 
 ```
-访问网址：https://ibocai.cn
 FTP文件夹：
   1）正式环境：webapp/yishoudan（git对应分支master）
-     测试环境：webapp/yishoudan/supplychaintest（git对应分支test）
-     两个环境的区别：
-       均链接正式环境，但测试环境会比正式环境多一些测试性质功能
-  2）删除并重新上传：static，index.html，favicon.ico
+     访问网址：https://ibocai.cn
+  2）测试环境：webapp/yishoudan/supplychaintest（git对应分支test）
+     访问网址：https://ibocai.cn
+  3）删除并重新上传：static，index.html，favicon.ico
+```
+
+```
+两个环境的区别：
+  均链接正式环境，但测试环境会比正式环境多一些测试性质功能
 ```
 
 
diff --git a/src/components/FirstJob/components/rightPanel/active.vue b/src/components/FirstJob/components/rightPanel/active.vue
new file mode 100644
index 0000000..9727a98
--- /dev/null
+++ b/src/components/FirstJob/components/rightPanel/active.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    活动
+  </div>
+</template>
\ No newline at end of file
diff --git a/src/components/FirstJob/components/rightPanel/hot.vue b/src/components/FirstJob/components/rightPanel/hot.vue
new file mode 100644
index 0000000..bf91bd5
--- /dev/null
+++ b/src/components/FirstJob/components/rightPanel/hot.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    热门
+  </div>
+</template>
+
+<script>
+
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/components/FirstJob/components/rightPanel/recommend.vue b/src/components/FirstJob/components/rightPanel/recommend.vue
new file mode 100644
index 0000000..fd75411
--- /dev/null
+++ b/src/components/FirstJob/components/rightPanel/recommend.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    推荐
+  </div>
+</template>
\ No newline at end of file
diff --git a/src/components/FirstJob/components/rightPanel/sponsor.vue b/src/components/FirstJob/components/rightPanel/sponsor.vue
new file mode 100644
index 0000000..ec232dd
--- /dev/null
+++ b/src/components/FirstJob/components/rightPanel/sponsor.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    赞助
+  </div>
+</template>
\ No newline at end of file
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 74f82ee..5979761 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -890,6 +890,10 @@
 				</div>
 				<!-- 右侧 -->
 				<div class="rightCard g_flex_none">
+					<hotPanel />
+					<sponsorPanel />
+					<recommendPanel />
+					<activePanel />
 					<promotion :code="managerInfo.qrCode" />
 				</div>
 			</div>
@@ -927,6 +931,10 @@ import $ from "jquery";
 import { moneyToFixed, getSalaryClassifyValue, isNotEmptyCheck, disposeJobListData, setReturnFee,setJobInfoPosition } from "../../utils/commonUtil";
 import recommend from "@/components/FirstJob/components/recommend.vue";
 import promotion from "@/components/FirstJob/components/promotion.vue";
+import hotPanel from "@/components/FirstJob/components/rightPanel/hot.vue";
+import sponsorPanel from "@/components/FirstJob/components/rightPanel/sponsor.vue";
+import recommendPanel from "@/components/FirstJob/components/rightPanel/recommend.vue";
+import activePanel from "@/components/FirstJob/components/rightPanel/active.vue";
 import { nationlist } from "../../utils/datalist";
 import Clipboard from "clipboard";
 // 报名弹窗
@@ -944,7 +952,11 @@ export default {
 	components: {
 		recommend,
 		recordModal,
-		promotion
+		promotion,
+		hotPanel,
+		sponsorPanel,
+		recommendPanel,
+		activePanel,
 		// recordbill,
 	},
 	// 组件参数 接收来自父组件的数据
@@ -1291,11 +1303,14 @@ export default {
 			const threshold = windowHeight * 0.4;
 
 			if (scrollTop + windowHeight >= scrollHeight - 100 && !this.isFetching && !this.isStop) { // 100 是一个阈值，可以根据需要调整
+				console.log('触发滚动 true')
 				this.isFetching = true;
 				setTimeout(() => {
 					this.speed = 1;
 					this.loadMoreData();
 				}, 300);
+			}else{
+				console.log('触发滚动 false')
 			}
 			if (scrollTop >= threshold) {
         this.$refs.backToTop.style.opacity = 1;
@@ -1344,7 +1359,7 @@ export default {
 				if (this.isLogin) {
 					const { data } = await JobListApi({
 						pageNum: 1,
-						pageSize: 4,
+						pageSize: 8,
 						jobCategory: 608,
 					});
 					console.log(data.data.recordList);
diff --git a/src/views/main.vue b/src/views/main.vue
index 7e66e1f..87d088c 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -1,9 +1,5 @@
 <template>
 	<div class="index-container" @click="isspecialboxshow = false"
-			 :style="{
-				'overflow-y': isSC ? 'auto' : 'hidden',
-				'overflow-x':'hidden'
-			 }"
 	>
 		<!-- title部分 -->
 		<div class="pagetitle" v-if="isLogin && routertitleindex != 0"