From c03732498a0b7824555351eca5357f02665f3e17 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 29 Aug 2025 10:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/list/job.vue                            |  2 +-
 .../conversation-list/conversation-item.vue        | 20 ++++----
 .../pages/Conversation/conversation-list/index.vue | 10 ++--
 pages/message/index.vue                            |  2 +-
 root/NEUIKit/pages/Chat/index.vue                  | 45 +++++++++++++++---
 root/NEUIKit/pages/Chat/message/message-input.vue  |  6 +--
 root/NEUIKit/pages/Chat/message/message-list.vue   |  2 +-
 root/detail/apply.vue                              |  2 +-
 root/detail/userShare.vue                          | 53 +++++++++++++---------
 root/person/changeTeam.vue                         |  1 +
 utils/ajax.js                                      |  5 +-
 utils/common.js                                    | 10 ++--
 utils/wyyx.js                                      |  5 +-
 13 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/components/list/job.vue b/components/list/job.vue
index e7dfd01..b2454f4 100644
--- a/components/list/job.vue
+++ b/components/list/job.vue
@@ -131,7 +131,7 @@
 						<checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox>
 					</view>
 					<view class="checkBox g_c_main g_fs_14" hover-class="none" v-if="from == 'chat'" @click.stop="sendJob(item)">
-						选择
+						发送
 					</view>
 				</view>
 			</block>
diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
index 38271c5..e31ea16 100644
--- a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
+++ b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
@@ -14,23 +14,23 @@
 		@click="handleConversationItemClick()"
 	>
 		<div class="conversation-item-content">
-			<div class="conversation-item-left">
+			<div class="conversation-item-left u-skeleton-fillet">
 				<div class="unread" v-if="unread">
 					<div class="dot" v-if="isMute"></div>
 					<div class="badge" v-else>{{ unread }}</div>
 				</div>
-				<Avatar class="u-skeleton-fillet" :account="to" size="48" :avatar="teamAvatar" />
+				<Avatar class="" :account="to" size="48" :avatar="teamAvatar" />
 			</div>
 			<div class="conversation-item-right">
-				<div class="conversation-item-top">
-					<Appellation :pid="props.conversation.conversationId" class="conversation-item-title u-skeleton-fillet" fontSize="17" v-if="conversation.type === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P" :account="to" />
-					<span v-else class="conversation-item-title u-skeleton-fillet">
+				<div class="conversation-item-top u-skeleton-fillet">
+					<Appellation :pid="props.conversation.conversationId" class="conversation-item-title" fontSize="17" v-if="conversation.type === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P && !loading" :account="to" />
+					<span v-else class="conversation-item-title">
 						{{ sessionName }}
 					</span>
 					<span class="conversation-item-time" :data-time="date">{{ date }}</span>
 				</div>
-				<div class="conversation-item-desc">
-					<span v-if="beMentioned" class="beMentioned u-skeleton-fillet">
+				<div class="conversation-item-desc u-skeleton-fillet">
+					<span v-if="beMentioned && !loading" class="beMentioned">
 						{{ "[" + t("someoneText") + "@" + t("meText") + "]" }}
 					</span>
 					<!-- <ConversationItemIsRead v-if="showSessionUnread" :conversation="props.conversation"></ConversationItemIsRead> -->
@@ -44,8 +44,10 @@
 				{{ action.name }}
 			</div>
 		</div>
-		<u-skeleton :loading="loading" :animation="true" bgColor="#ededed"></u-skeleton>
+
+		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#ededed"></u-skeleton> -->
 	</div>
+	<u-skeleton :loading="loading" :animation="true" el-color="#ededed" bg-color="#fff"></u-skeleton>
 </template>
 
 <script lang="ts" setup>
@@ -343,7 +345,7 @@ $cellHeight: 72px;
 	padding: 10px 16px;
 	height: $cellHeight;
 	box-sizing: border-box;
-  // background-color: #fff;
+	// background-color: #fff;
 }
 
 .conversation-item-left {
diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/index.vue b/pages/NEUIKit/pages/Conversation/conversation-list/index.vue
index 5deec57..a235e8c 100644
--- a/pages/NEUIKit/pages/Conversation/conversation-list/index.vue
+++ b/pages/NEUIKit/pages/Conversation/conversation-list/index.vue
@@ -1,16 +1,18 @@
 <template>
 	<div class="conversation-wrapper">
+		<!-- {{ conversationList }} -->
 		<!-- 页面初始化的过程中，sessionList编译到小程序和h5出现sessionList为undefined的情况，即使给了默认值为空数组，故在此处进行判断 -->
-		<div class="conversation-list-wrapper" v-if="conversationList && conversationList.length > 0">
+		<div class="conversation-list-wrapper " v-if="conversationList && conversationList.length > 0">
 			<!-- 此处的key如果用session.id，会在ios上渲染存在问题，会出现会话列表显示undefined -->
-			<div v-for="(conversation, index) in conversationList" :key="conversation.renderKey">
+			<div v-for="(conversation, index) in conversationList" class="" style="min-height:72px" :key="conversation.renderKey">
 				<ConversationItem :key="conversation.renderKey" :loading="loading" :showMoreActions="currentMoveSessionId === conversation.conversationId" :conversation="conversation" @delete="handleSessionItemDeleteClick" :heihei="'mmp' + index" @stickyToTop="handleSessionItemStickTopChange" @click="handleSessionItemClick" @leftSlide="handleSessionItemLeftSlide" />
 			</div>
 		</div>
 		<!-- <div style="height: 48px; background-color: #ededed" v-if="conversationList && conversationList.length > 0"></div> -->
-		<div v-if="conversationList.length == 0" style="padding-top: 130px; background-color: #ededed">
+		<div v-if="conversationList.length == 0 && !loading" style="padding-top: 130px; background-color: #ededed">
 			<g-empty text="暂无会话" style="margin-top: 0px" />
 		</div>
+		<!-- <u-skeleton :loading="loading" :animation="true"  el-color="#fff" bg-color="#000"></u-skeleton> -->
 	</div>
 </template>
 
@@ -34,7 +36,7 @@ defineExpose({
 	conversationList,
 });
 const addDropdownVisible = ref(false);
-const loading = ref(false);
+const loading = ref(true);
 
 const currentMoveSessionId = ref("");
 
diff --git a/pages/message/index.vue b/pages/message/index.vue
index cbc318e..7df6791 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -66,7 +66,7 @@ const contactList = ref(null);
 const AIList = ref(null);
 const cdnBaseImg = ref(G.store().cdnBaseImg);
 
-const isLogin = ref(false);
+const isLogin = ref(true);
 // 回到顶部
 const resetScroll = ref(0);
 const tabbarHeight = ref(uni.getStorageSync("TABBAR_HEIGHT"));
diff --git a/root/NEUIKit/pages/Chat/index.vue b/root/NEUIKit/pages/Chat/index.vue
index 1dd3f6e..fcb4cb7 100644
--- a/root/NEUIKit/pages/Chat/index.vue
+++ b/root/NEUIKit/pages/Chat/index.vue
@@ -18,7 +18,7 @@
 		<!-- <div style="height: 'auto';position: fixed;left: 0;bottom: 0;width: 100vw;"> -->
 		<MessageInput
 			:reply-msgs-map="replyMsgsMap"
-			:jobListShow.sync="jobListShow"
+			:jobListShow="jobListShow"
 			@jobListShow="
 				(e) => {
 					jobListShow = e;
@@ -30,12 +30,15 @@
 		<!-- </div> -->
 
 		<u-popup v-model="jobListShow" mode="bottom" z-index="999999" border-radius="12" :closeable="false" :mask-close-able="true" :mask="true" @close="jobListShow = false">
-			<view class="g_bg_ed" style="min-height: 70vh">
-				<div class="m-search g_p_10 g_pt_8 g_position_rela g_flex_1 bg_shawdoc" style id="searchInputBox">
-					<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="" @click="sendMsg">123123</div>
+			<scroll-view :scroll-y="true" @scrolltolower="reachBottom" class="g_bg_ed" style="height: 90vh">
+				<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">
+						<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>
+					<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>
-				<g-list-job from="chat" @uploadList="getList" @sendJob="sendJob" bg="#ededed" class="" :query="query" :list="query.list" :loading="loading" :speed="speed" :isShowLoginBtn="false" emptyText="嘿，这里还没有数据呢" />
-			</view>
+			</scroll-view>
 		</u-popup>
 	</div>
 </template>
@@ -524,6 +527,23 @@ const getList = ($type = "init") => {
 		}
 	);
 };
+const sendMsg = () => {
+	const customMsg = uni.$UIKitNIM.V2NIMMessageCreator.createCustomMessage(
+		"",
+		JSON.stringify({
+			type: "0",
+			content: "测试自定义消息",
+		})
+	);
+	uni.$UIKitStore.msgStore.sendMessageActive({
+		message: customMsg,
+		conversationId,
+		sendBefore: () => {
+			jobListShow.value = false;
+			uni.$emit(events.ON_SCROLL_BOTTOM);
+		},
+	});
+};
 const sendJob = (_item) => {
 	console.log("_item", _item);
 	let listInner = ["district", "gender", "age"];
@@ -558,6 +578,12 @@ const sendJob = (_item) => {
 		},
 	});
 };
+const reachBottom = () => {
+	if (query.value.isFinish == -1 || query.value.isFinish == query.value.size) {
+		query.value.page++;
+		getList("concat");
+	}
+};
 onUnload(() => {
 	uni.$off(events.CONFIRM_FORWARD_MSG);
 	uni.$off(events.CANCEL_FORWARD_MSG);
@@ -566,6 +592,7 @@ onUnload(() => {
 
 <style lang="scss">
 @import "../../base.scss";
+@import "../../../../static/css/iconfont.css";
 page {
 	height: 100%;
 	overflow: hidden;
@@ -623,4 +650,10 @@ page {
 .msg-wrapper > message-list {
 	height: 100%;
 }
+.sticky {
+	position: sticky;
+	top: 0px;
+	left: 0;
+	z-index: 100;
+}
 </style>
diff --git a/root/NEUIKit/pages/Chat/message/message-input.vue b/root/NEUIKit/pages/Chat/message/message-input.vue
index 2a977e9..8b10ed9 100644
--- a/root/NEUIKit/pages/Chat/message/message-input.vue
+++ b/root/NEUIKit/pages/Chat/message/message-input.vue
@@ -130,7 +130,7 @@
 					</div> -->
 					<div class="send-more-panel-item-wrapper" v-if="corpUserFlag">
 						<div class="send-more-panel-item" @tap="(event) => handleSendJob()">
-							<Icon type="icon-touxiang5" :size="30"></Icon>
+							<div class="iconfont icon-fasong1 g_c_6 g_fs_24 g_fw_600"></div>
 						</div>
 						<div class="icon-text">{{ "发送职位" }}</div>
 					</div>
@@ -158,7 +158,7 @@
 import Face from "./face.vue";
 import VoicePanel from "./voice-panel.vue";
 import Icon from "../../../components/Icon.vue";
-import { ref, getCurrentInstance, computed, onUnmounted, onMounted, defineProps, withDefaults, defineEmits,watch } from "../../../utils/transformVue";
+import { ref, getCurrentInstance, computed, onUnmounted, onMounted, defineProps, withDefaults, defineEmits, watch } from "../../../utils/transformVue";
 import { ALLOW_AT, events, REPLY_MSG_TYPE_MAP } from "../../../utils/constants";
 import { emojiMap } from "../../../utils/emoji";
 import { t } from "../../../utils/i18n";
@@ -388,7 +388,7 @@ const keyboardheightchange = (e) => {
 		const availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 120;
 		uni.$emit("msgKeyHeight", availableHeight); // 传递实际可用高度
 
-		writeStyle.value = `bottom: calc(${e.detail.height}px - env(safe-area-inset-bottom))`;
+		writeStyle.value = `bottom: calc(${e.detail.height}px + env(safe-area-inset-bottom))`;
 		// #endif
 		// #ifdef APP-PLUS
 		// 区分安卓和苹果平台
diff --git a/root/NEUIKit/pages/Chat/message/message-list.vue b/root/NEUIKit/pages/Chat/message/message-list.vue
index eefd349..794ef30 100644
--- a/root/NEUIKit/pages/Chat/message/message-list.vue
+++ b/root/NEUIKit/pages/Chat/message/message-list.vue
@@ -151,7 +151,7 @@
 		  screenHeight1.value = res;
 		  // 无论是否为小程序，都直接应用高度（移除100%的特殊处理）
 		  if (typeof res === 'number') {
-		    msgKeyHeight.value = `${(res) * 2}rpx`;
+		    msgKeyHeight.value = `${res * 2}rpx`;
 		  } else {
 		    msgKeyHeight.value = res; // 处理'100%'的情况
 		  }
diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 562f1ca..2f44fc7 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -371,7 +371,7 @@
 				</view>
 			</slot>
 		</g-panel-fixed> -->
-		<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed">
+		<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed" v-if="(orderDetail.downAgencyId && orderDetail.downAgencyId != agencyId) || (orderDetail.upAgencyId && orderDetail.upAgencyId != agencyId)">
 			<slot>
 				<view class="g_ml_20 g_mr_20 g_flex_row_between flex_center flex_nw">
 					<view class="g_flex_column_center flex_center g_mr_12" @click="getServiceInfo({ type: 'tel' })"> <i class="iconfont icon-phone g_c_main"></i><view class="g_fs_12 g_c_6 g_mt_4">电话客服</view> </view>
diff --git a/root/detail/userShare.vue b/root/detail/userShare.vue
index fa260b3..6029cc9 100644
--- a/root/detail/userShare.vue
+++ b/root/detail/userShare.vue
@@ -71,7 +71,7 @@
 								<div class="g_flex_1">
 									<g-button btnText="已关注发单号" size="auto" @clickBtn="handleCancel" type="noStyle" class></g-button>
 								</div>
-								<div class="g_ml_16 g_flex_1 ">
+								<div class="g_ml_16 g_flex_1">
 									<g-button btnText="联系客服" class="" type="noStyle" size="auto" @clickBtn="goIm"></g-button>
 								</div>
 								<!-- <div style="width:calc((100vw - 50px) / 2);">
@@ -83,7 +83,7 @@
 								<div class="g_flex_1">
 									<g-button btnText="互相关注" size="auto" type="noStyle" @clickBtn="handleCancel" class></g-button>
 								</div>
-								<div class="g_ml_16 g_flex_1 ">
+								<div class="g_ml_16 g_flex_1">
 									<g-button btnText="联系客服" class="" type="noStyle" size="auto" @clickBtn="goIm"></g-button>
 								</div>
 							</div>
@@ -101,7 +101,7 @@
 						</template>
 					</div>
 				</view>
-				<div class="g_bg_f g_pt_8">
+				<div class="g_bg_f g_pt_8" v-if="info.recordStatus == 1 || info.recordStatus == 2">
 					<u-tabs bg-color="transparent" from="index" gutter="20" :list="tabInfo.list" :is-scroll="true" v-model="tabInfo.active" active-color="#000" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="32" duration="0.05" height="56"></u-tabs>
 				</div>
 
@@ -569,26 +569,29 @@ export default {
 			let that = this;
 			console.log("$type", $type);
 			this.G.isLogin();
+			let params = {
+				pageNum: that.query.page,
+				pageSize: that.query.size,
+				agencyId: that.info.id,
+			};
+			console.log("that.tabInfo.active", that.tabInfo.active);
+			if (that.tabInfo.active == 1) {
+				params.jobClassify = 1;
+			} else if (that.tabInfo.active == 2) {
+				params.recruitment = 1;
+			}
 			if (this.G.isLogin()) {
-				that.G.Post(
-					that.api.job_list,
-					{
-						pageNum: that.query.page,
-						pageSize: that.query.size,
-						agencyId: that.info.id,
-					},
-					(res) => {
-						console.log("resresresresresres", res);
-						if (res.recordCount == 0) {
-							that.loading = false;
-						} else {
-							that.loading = true;
-						}
-						that.speed = res.recordCount;
-						that.setJobList(res.recordList, $type);
-						console.log("query.list", that.query.list);
+				that.G.Post(that.api.job_list, params, (res) => {
+					console.log("resresresresresres", res);
+					if (res.recordCount == 0) {
+						that.loading = false;
+					} else {
+						that.loading = true;
 					}
-				);
+					that.speed = res.recordCount;
+					that.setJobList(res.recordList, $type);
+					console.log("query.list", that.query.list);
+				});
 			}
 		},
 		checkLength(e) {
@@ -756,7 +759,13 @@ export default {
 			}
 		},
 
-		handleUpdateTab() {},
+		handleUpdateTab(e) {
+			let that = this;
+			console.log("eeeeeee", e);
+			that.tabInfo.active = e;
+			that.query.page = 1;
+			that.getDefault();
+		},
 		goIm() {
 			let that = this;
 			if (that.goImLoading) {
diff --git a/root/person/changeTeam.vue b/root/person/changeTeam.vue
index a884ac0..1aacb4f 100644
--- a/root/person/changeTeam.vue
+++ b/root/person/changeTeam.vue
@@ -119,6 +119,7 @@ export default {
 						duration: 2000,
 					});
 					let userInfo = uni.getStorageSync("apply-userinfo");
+					uni.$emit("updateJobList");
 					uni.$emit("isGlogin", {
 						uid: userInfo.user.id,
 					});
diff --git a/utils/ajax.js b/utils/ajax.js
index 1d52c86..0d4023a 100644
--- a/utils/ajax.js
+++ b/utils/ajax.js
@@ -1,5 +1,8 @@
+import common from './common.js'
+console.log('common',common);
 // let ajaxUrl = "http://192.168.3.83:8001";
-let ajaxUrl = "https://daotian.matripe.com.cn";
+// let ajaxUrl = "https://daotian.matripe.com.cn";
+let ajaxUrl = common.store().baseUrl;
 let data = {
   ajaxUrl: ajaxUrl,
   Get ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {
diff --git a/utils/common.js b/utils/common.js
index 45b7c8b..62414ae 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -10,6 +10,8 @@ let data = {
       fadanBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/",
       loginText: '请登录',
       coziID: '7537572244600471579',
+      // baseUrl:"https://daotian.matripe.com.cn",// 网络请求的基础路径
+      baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
       // #ifdef MP-WEIXIN
       version: uni.getAccountInfoSync().miniProgram.version || "1.0.16",
       // #endif
@@ -442,7 +444,7 @@ let data = {
       return [];
     }
   },
-  handleSetSex($obj={}){
+  handleSetSex ($obj = {}) {
     if (Boolean($obj.minAgeWoman) === true && Boolean($obj.minAgeMan) === false) {
       $obj.gender = "女";
     } else if (Boolean($obj.minAgeWoman) === false && Boolean($obj.minAgeMan) === true) {
@@ -452,7 +454,7 @@ let data = {
     }
     return $obj;
   },
-  handleSetAge($obj={}){
+  handleSetAge ($obj = {}) {
     if ($obj.minAge && $obj.maxAge) {
       $obj["age"] = $obj.minAge + '-' + $obj.maxAge + '岁';
     } else if ($obj.minAge) {
@@ -730,7 +732,7 @@ let data = {
           jobList["jobDesp"] = jobList["jobDesp"].replaceAll("*****", "");
         }
         // 性别限制
-         if (Boolean(jobList.minAgeWoman) === true && Boolean(jobList.minAgeMan) === false) {
+        if (Boolean(jobList.minAgeWoman) === true && Boolean(jobList.minAgeMan) === false) {
           jobList.genderAge = "女" + '丨' + jobList.minAgeWoman + "-" + jobList.maxAgeWoman + "岁";
         } else if (Boolean(jobList.minAgeWoman) === false && Boolean(jobList.minAgeMan) === true) {
           jobList.genderAge = "男" + '丨' + jobList.minAgeMan + "-" + jobList.maxAgeMan + "岁";
@@ -1285,7 +1287,7 @@ let data = {
   calculateTotalWidth (ctx, segments) {
     let totalWidth = 0;
     segments.forEach((segment) => {
-      console.log('segment',segment);
+      console.log('segment', segment);
       if (segment) {
         ctx.font = `${segment.fontWeight} ${segment.fontSize}px Arial`;
         totalWidth += ((ctx.measureText(segment.content).width) + (segment.space || 0));
diff --git a/utils/wyyx.js b/utils/wyyx.js
index 28d0d86..543dd09 100644
--- a/utils/wyyx.js
+++ b/utils/wyyx.js
@@ -1,5 +1,8 @@
+import common from './common.js'
+console.log('common',common);
 // let ajaxUrl = "http://192.168.3.83:8001";
-let ajaxUrl = "https://daotian.matripe.com.cn";
+// let ajaxUrl = "https://daotian.matripe.com.cn";
+let ajaxUrl = common.store().baseUrl;
 let data = {
   wyyxajaxUrl: ajaxUrl,
   wyyxGet ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {