From 231f64496f7ad873937895ba000aa598610df949 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Tue, 2 Sep 2025 11:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/list/apply.vue         |  7 ++---
 pages/workBench/index.vue         | 57 ++++++++++++++++++++++++++-------------
 root/NEUIKit/pages/Chat/index.vue | 15 +++++------
 utils/common.js                   |  8 +++---
 4 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/components/list/apply.vue b/components/list/apply.vue
index 85f1778..842e5fa 100644
--- a/components/list/apply.vue
+++ b/components/list/apply.vue
@@ -17,7 +17,8 @@
 						<g-button btnText="去登录" size="small" class="g_mt_32" @clickBtn="goLogin" />
 					</view>
 				</view>
-				<scroll-view v-if="speed > 0" :style="{ height: `calc(100vh - ${99 + tabbarHeight}px)` }" :scroll-y="true" @scrolltolower="reachBottom" :lower-threshold="100">
+        <!-- :style="{ height: `calc(100vh - ${108 + tabbarHeight}px)` }" :scroll-y="true" @scrolltolower="reachBottom" -->
+				<view v-if="speed > 0"  :lower-threshold="100">
 					<view class="" style="min-height: calc(100% - 90px)">
 						<view class="item g_pt_18 g_pl_10 g_pr_10 g_pb_18 g_bg_f g_border_e_b" hover-class="g_bg_f_5" v-for="(item, index) in query.list" :key="index" @click="goDetail(item, index)">
 							<view class="g_flex_row_start">
@@ -36,7 +37,7 @@
 									</view>
 								</view>
 							</view>
-							<view class="g_flex_row_center flex_center g_mt_8" v-if="from" @click.stop>
+							<view class="g_flex_row_end flex_center g_mt_8" v-if="from == 'chat'" @click.stop>
 								<g-button btnText="发送" fontSize="14" type="primary" size="mini" @clickBtn="sendApply(item)" />
 							</view>
 						</view>
@@ -48,7 +49,7 @@
 					<!-- #ifdef H5 -->
 					<view class="g-h-100"></view>
 					<!-- #endif -->
-				</scroll-view>
+				</view>
 			</view>
 		</view>
 	</view>
diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue
index d9e2355..a31290c 100644
--- a/pages/workBench/index.vue
+++ b/pages/workBench/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="p-apply-inedx g_w_all g_h_all g_bg_f_5 g_kuaishou g-apply-tab">
+	<view class="p-apply-inedx g_w_all g_bg_page g_kuaishou g-apply-tab">
 		<!-- #ifdef MP-TOUTIAO  -->
 		<view class="g_flex_row_center apply-header" v-if="isHaveOrder == 1">
 			<view class="g_flex_row_between box">
@@ -12,28 +12,32 @@
 
 		<view class="">
 			<!-- #ifdef APP-PLUS || H5 || MP-KUAISHOU || MP-WEIXIN -->
-			<view class="" style="height: calc(58px + 48px)" v-if="from != 'chat'"></view>
+			<!-- <view class="" style="height: calc(58px + 48px)" v-if="from != 'chat'"></view> -->
 			<!-- #endif -->
-			<view class="">
-				<view class="m-box-fixed" :style="{ top: 0 }" v-if="isLogin">
-					<view style="background-color: #fff" class="">
-						<view class="m-select">
-							<view style="height: 52px" class="g_flex_column_center g_pt_8">
-								<view class="m-search g_pb_0 g_position_rela" style="padding-bottom: 0; padding-left: 12px; padding-right: 12px">
-									<u-search @btnSearch="getSearch" height="80" v-model="keyword" placeholder="搜索姓名/职位/手机号" bg-color="#ededed" :show-action="false" @clear="getSearch('search')" @change="getSearch('clear')" @search="getSearch('search')" search-icon-color="#999999" :maxlength="20"></u-search>
-									<!-- <view class="g_w_all g_h_40 g_position_abso" style="left: 0; top: 0px; z-index: 9999" @click.stop="goSearch"></view> -->
+			<scroll-view class="m-list" :style="{ height: from != 'chat' ? `calc(100vh - ${tabbarHeight}px)` : `calc(95vh )` }" :scroll-y="true" @scrolltolower="reachBottom">
+				<!-- <view class=""> -->
+				<view>
+					<view :class="[from ? 'sticky' : '']" v-if="isLogin">
+						<div class="g_text_c g_h_24 g_pt_12 g_pb_12 g_bg_f" style="z-index: 100" v-if="from == 'chat'">发送工单</div>
+						<view style="background-color: #fff" class="">
+							<view class="m-select">
+								<view style="height: 52px" class="g_flex_column_center g_pt_8">
+									<view class="m-search g_pb_0 g_position_rela" style="padding-bottom: 0; padding-left: 12px; padding-right: 12px">
+										<u-search @btnSearch="getSearch" height="80" v-model="keyword" placeholder="搜索姓名/职位/手机号" bg-color="#ededed" :show-action="false" @clear="getSearch('search')" @change="getSearch('clear')" @search="getSearch('search')" search-icon-color="#999999" :maxlength="20"></u-search>
+										<!-- <view class="g_w_all g_h_40 g_position_abso" style="left: 0; top: 0px; z-index: 9999" @click.stop="goSearch"></view> -->
+									</view>
 								</view>
 							</view>
+							<!-- <view class="g_h_10 g_bg_f_5"></view> -->
+						</view>
+						<view style="width: 100vw" class="g_border_e_b" v-if="isLogin">
+							<u-tabs :list="menuList" item-width="126" v-model="menuActive" active-color="#00b666" bar-width="60" bar-height="6" font-size="32" @change="handleUpdateMenu" :gutter="22" duration="0.1" itemWidth="auto" height="84"></u-tabs>
 						</view>
-						<!-- <view class="g_h_10 g_bg_f_5"></view> -->
-					</view>
-					<view style="width: 100vw" class="g_border_e_b" v-if="isLogin">
-						<u-tabs :list="menuList" item-width="126" v-model="menuActive" active-color="#00b666" bar-width="60" bar-height="6" font-size="32" @change="handleUpdateMenu" :gutter="22" duration="0.1" itemWidth="auto" height="84"></u-tabs>
 					</view>
+					<!-- 面板 -->
+					<g-list-apply :from="from" @uploadList="getList('concat')" bg="" class="" :tabActive="tabActive" :loading="loading" :speed="speed" :isLogin="isLogin" :query.sync="query" :navInfo="navInfo" />
 				</view>
-				<!-- 面板 -->
-				<g-list-apply from="home" @uploadList="getList('concat')" bg="" class="" :tabActive="tabActive" :loading="loading" :speed="speed" :isLogin="isLogin" :query.sync="query" :navInfo="navInfo" />
-			</view>
+			</scroll-view>
 		</view>
 		<g-tabbar class="tabbar" v-if="from != 'chat'"></g-tabbar>
 	</view>
@@ -54,7 +58,7 @@ export default {
 	props: {
 		from: {
 			type: String,
-			default: "",
+			default: "home",
 		},
 		upAgencyId: {
 			type: Number,
@@ -75,6 +79,7 @@ export default {
 			GZHInfo: 0,
 			cdnBaseImg: this.G.store().cdnBaseImg,
 			keyword: "",
+			tabbarHeight: uni.getStorageSync("TABBAR_HEIGHT"),
 
 			tabActive: 0,
 			tabTip: "",
@@ -231,6 +236,16 @@ export default {
 		}
 	},
 	methods: {
+		reachBottom() {
+			let that = this;
+			this.G.isLogin();
+			if (this.G.isLogin()) {
+				if (that.query.isFinish == -1 || that.query.isFinish == that.query.size) {
+					that.query.page++;
+					that.getList("concat");
+				}
+			}
+		},
 		getList($type = "init") {
 			let that = this;
 			console.log("是否登录", that.isLogin);
@@ -531,4 +546,10 @@ export default {
 		z-index: 999;
 	}
 }
+.sticky {
+	position: sticky;
+	top: 0px;
+	left: 0;
+	z-index: 100;
+}
 </style>
diff --git a/root/NEUIKit/pages/Chat/index.vue b/root/NEUIKit/pages/Chat/index.vue
index dd2d56b..8181a6b 100644
--- a/root/NEUIKit/pages/Chat/index.vue
+++ b/root/NEUIKit/pages/Chat/index.vue
@@ -33,18 +33,17 @@
 		<u-popup v-model="jobListShow" mode="bottom" z-index="999999" border-radius="12" :closeable="true" :mask-close-able="true" :mask="true" @close="jobListShow = false">
 			<scroll-view :scroll-y="true" @scrolltolower="reachBottom" class="g_bg_ed" style="height: 95vh">
 				<div class="">
-					<div class="m-search g_p_10 g_pt_8 g_position_rela g_flex_1 g_bg_ed sticky" style id="searchInputBox">
-						<div class="g_text_c g_h_24 g_pt_6 g_pb_12">发送职位</div>
-						<u-search height="80" v-model="keyword" @input="checkLength" @clear="searchJob" @search="searchJob" class="" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search>
-						<div class="g_pt_8" v-if="popType == 'job'">
-							<u-tabs bg-color="transparent" from="index" gutter="20" :showBar="false" :list="tabInfo.list" :is-scroll="true" v-model="tabInfo.active" active-color="#00b666" @change="handleUpdateTab" font-size="34" duration="0.05" height="48"></u-tabs>
-						</div>
-					</div>
 					<div class="" v-if="popType == 'apply'">
 						<gListApply from="chat" :upAgencyId="beCollectedAgencyId" @sendApply="sendApply"></gListApply>
-						<!-- <g-list-apply from="home" @uploadList="getList('concat')" bg="" class="" :tabActive="tabActive" :loading="loading" :speed="speed" :isLogin="isLogin" :query.sync="query" :navInfo="navInfo" /> -->
 					</div>
 					<div class="" v-if="popType == 'job'">
+						<div class="m-search g_p_10 g_pt_8 g_position_rela g_flex_1 g_bg_ed sticky">
+							<div class="g_text_c g_h_24 g_pt_6 g_pb_12">发送职位</div>
+							<u-search height="80" v-model="keyword" @input="checkLength" @clear="searchJob" @search="searchJob" class="" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search>
+							<div class="g_pt_8" v-if="popType == 'job'">
+								<u-tabs bg-color="transparent" from="index" gutter="20" :showBar="false" :list="tabInfo.list" :is-scroll="true" v-model="tabInfo.active" active-color="#00b666" @change="handleUpdateTab" font-size="34" duration="0.05" height="48"></u-tabs>
+							</div>
+						</div>
 						<g-list-job from="chat" @uploadList="getList" @sendJob="sendJob" bg="#ededed" class="" :query="query" :list="query.list" :loading="loading" :speed="speed" :isShowLoginBtn="false" emptyText="嘿，这里还没有数据呢" />
 					</div>
 				</div>
diff --git a/utils/common.js b/utils/common.js
index 30bb530..9b0b693 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -13,7 +13,7 @@ let data = {
       fadanBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/",
       loginText: '请登录',
       coziID: '7537572244600471579',
-      baseUrl:"https://daotian.matripe.com.cn",// 网络请求的基础路径
+      baseUrl: "https://daotian.matripe.com.cn",// 网络请求的基础路径
       // baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
       // #ifdef MP-WEIXIN
       version: uni.getAccountInfoSync().miniProgram.version || "1.0.16",
@@ -286,7 +286,7 @@ let data = {
       type = "YY--MM--DD"
     } else if (type == "first-week") { } else {
       // 时间戳
-      time = new Date(str) ;
+      time = str ? new Date(str) : new Date(new Date().getTime());
     }
     if (time && typeof time == 'object') {
       year = time.getFullYear()
@@ -297,7 +297,9 @@ let data = {
       second = (time.getSeconds()).toString().padStart(2, '0')
     }
     let result;
-
+    if (!str) {
+      return '-'
+    }
     switch (type) {
       case 'default': // 2023-10-31 09:00:00
         result = year + '-' + month + '-' + date + ' ' + hours + ':' + minute + ':' + second;