Merge branch 'cyl/master-0822'

root/NEUIKit/pages/Chat/index.vue

@@ -30,11 +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">
+		<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: 90vh">
+			<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">
+							<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>
@@ -78,7 +82,23 @@ export interface YxReplyMsg {
 }
 
 trackInit("ChatUIKit");
-
+const tabInfo = ref({
+	list: [
+		{
+			name: "我的",
+			classify: 1,
+		},
+		{
+			name: "浏览",
+			classify: 2,
+		},
+		{
+			name: "收藏",
+			classify: 3,
+		},
+	],
+	active: 0,
+});
 const title = ref("");
 const jobListShow = ref(false);
 const toDetail = () => {
@@ -405,9 +425,14 @@ onLoad((options) => {
 	});
 });
 const msgHeight = ref(0);
+const beCollectedAgencyId = ref(0);
+
 onMounted(() => {
 	setNavTitle();
+	agencyIdByAccId().then((res) => {
+		beCollectedAgencyId.value = res.agencyId;
 		getList();
+	});
 	uni.$on("msgHeight", (res) => {
 		console.log(res);
 		msgHeight.value = res;
@@ -422,8 +447,6 @@ onMounted(() => {
 	uni.$UIKitNIM.V2NIMTeamService.on("onTeamLeft", handleRemoveTeamMembers);
 
 	uni.$on(events.GET_HISTORY_MSG, loadMoreMsgs);
-
-	
 });
 
 onUnmounted(() => {
@@ -458,6 +481,27 @@ const checkLength = (e) => {
 		searchJob();
 	}
 };
+const handleUpdateTab = (e) => {
+	console.log(e);
+	tabInfo.value.active = e;
+	uni.showLoading({
+		title: "加载中...",
+	});
+	if (e == 0 || e == 2) {
+		getList();
+	} else {
+		getSeenList();
+	}
+};
+const getSeenList = () => {};
+const agencyIdByAccId = () => {
+	let accid = conversationId.split("|")[2];
+	return new Promise((reso) => {
+		G.Get(api.get_AgencyIdByAccId, { accid }, (res) => {
+			reso(res);
+		});
+	});
+};
 const searchJob = () => {
 	query.value.list = [];
 	query.value.page = 1;
@@ -465,20 +509,26 @@ const searchJob = () => {
 };
 const getList = ($type = "init") => {
 	loading.value = true;
-	G.Post(
+
-		api.job_list,
+	let parmas = {
-		{
 		pageNum: query.value.page,
 		pageSize: query.value.size,
-			agencyId: uni.getStorageSync("apply-agencyId"),
-			classify: 99,
-			sortTag: 2,
 		keys: keyword.value,
 		cityName: "全国",
-		},
+		sortTag: 2,
-		(res) => {
+	};
+	if (tabInfo.value.active === 0) {
+		parmas.agencyId = uni.getStorageSync("apply-agencyId");
+		parmas.classify = 99;
+	} else if (tabInfo.value.active == 2) {
+		parmas.classify = 3;
+		parmas.beCollectedAgencyId = beCollectedAgencyId.value;
+	}
+	console.log("parmas", parmas);
+	G.Post(api.job_list, parmas, (res) => {
 		console.log("res", res);
 		loading.value = false;
+		uni.hideLoading();
 		speed.value = res.recordCount;
 		query.value.isFinish = res.recordList.length;
 		console.log("query.value", query.value);
@@ -529,8 +579,7 @@ const getList = ($type = "init") => {
 			);
 		}
 		console.log("query.value.list", query.value.list);
-		}
+	});
-	);
 };
 const sendMsg = () => {
 	const customMsg = uni.$UIKitNIM.V2NIMMessageCreator.createCustomMessage(

root/NEUIKit/pages/Chat/message/message-input.vue

@@ -66,9 +66,7 @@
 						<!-- {{ssff}}键盘高度{{keyHeight}} 输入框距离底部距离{{writeStyle}}屏幕高度{{screenHeight}}顶部聊天区域高度{{msgKeyHeight}} -->
 						<input v-show="!showEmojiInput" :focus="isFocus" class="msg-input-input g_flex_1" :maxlength="-1" :placeholder="isTeamMute ? t('teamMutePlaceholder') : t('chatInputPlaceHolder')" v-model="inputText" type="text" :disabled="isTeamMute" :confirm-hold="true" cursor-spacing="20" :adjust-position="pushUp" confirm-type="send" @keyboardheightchange="keyboardheightchange" @focus="handleInputFocus" @confirm="handleSendTextMsg" @blur="handleInputBlur" @input="handleInput" id="msg-input" />
 					</div>
-					<div class="msg-input-button" @tap="(event) => handleSendJob()">
+					
-						<div class="iconfont icon-5gongdanguanli g_c_6 g_fs_24"></div>
-					</div>
 					<!-- <div class="send-more-panel-item-wrapper">
 						<div class="send-more-panel-item" @tap="(event) => handleSendJob()">
 							<div class="iconfont icon-5gongdanguanli g_c_6 g_fs_24 g_fw_600"></div>
@@ -77,9 +75,12 @@
 					<!-- <div class="msg-input-button" v-if="false">
 						<Icon @tap="handleEmojiVisible" class="g_p_6" style="padding-right: 5px" :size="28" type="icon-biaoqing" />
 					</div> -->
+          <!-- <div class="msg-input-button" @tap="(event) => handleSendJob()">
+						<div class="iconfont icon-5gongdanguanli g_c_6 g_fs_24"></div>
+					</div>
 					<div class="msg-input-button" v-if="true">
 						<Icon @tap="handleSendMoreVisible" class="g_p_6" style="padding-left: 5px; padding-right: 8px" type="send-more" :size="28" />
-					</div>
+					</div> -->
 				</div>
 				<!-- 表情面板 -->
 				<div v-if="emojiVisible" class="msg-emoji-panel" @click.stop="() => {}">
@@ -137,7 +138,7 @@
 					</div> -->
 					<div class="send-more-panel-item-wrapper" v-if="corpUserFlag">
 						<div class="send-more-panel-item" @tap="(event) => handleSendJob()">
-							<div class="iconfont icon-fasong1 g_c_6 g_fs_24 g_fw_600"></div>
+							<div class="iconfont icon-5gongdanguanli g_c_6 g_fs_24 "></div>
 						</div>
 						<div class="icon-text">{{ "发送职位" }}</div>
 					</div>
@@ -623,13 +624,13 @@ const handleEmojiVisible = () => {
 		uni.$emit(events.ON_SCROLL_BOTTOM);
 	}, 80);
 };
-// watch(sendMoreVisible, (val) => {
+watch(sendMoreVisible, (val) => {
-// 	if (val) {
+	if (val) {
-// 		uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 270); // 传递实际可用高度
+		uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 230 - ssff.value); // 传递实际可用高度
-// 	} else {
+	} else {
-// 		uni.$emit("msgKeyHeight", "100%"); // 传递实际可用高度
+		uni.$emit("msgKeyHeight", "100%"); // 传递实际可用高度
-// 	}
+	}
-// });
+});
 // 显示发送更多"+"面板
 const handleSendMoreVisible = () => {
 	if (isTeamMute.value) return;
@@ -640,10 +641,10 @@ const handleSendMoreVisible = () => {
 	
 	setTimeout(()=>{
 		if (sendMoreVisible.value) {
-			uni.$emit(events.KeyboardEvent, 230);
+			// uni.$emit(events.KeyboardEvent, 230);
-			uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 360); // 传递实际可用高度
+			uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 230 - ssff.value); // 传递实际可用高度
 		} else {
-			uni.$emit(events.KeyboardEvent, 0);
+			// uni.$emit(events.KeyboardEvent, 0);
 			uni.$emit("msgKeyHeight", '100%'); // 传递实际可用高度
 		}
 		uni.$emit(events.ON_SCROLL_BOTTOM);

root/detail/apply.vue

@@ -374,8 +374,10 @@
 		<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>
+					<view class="g_flex_1 g_mr_12">
-					<view class="g_flex_row_between flex_center g_flex_1">
+						<g-button @clickBtn="getServiceInfo({ type: 'tel' })" size="auto" btnText="电话客服"></g-button>
+					</view>
+					<!-- <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> -->
 					<view class="g_flex_1 g_mr_12" v-if="orderDetail.downAgencyId && orderDetail.downAgencyId != agencyId">
 						<g-button @clickBtn="getServiceInfo({ type: 'im', info: 'up' })" size="auto" btnText="下游客服" type="primary"></g-button>
 					</view>
@@ -383,7 +385,6 @@
 						<g-button @clickBtn="getServiceInfo({ type: 'im', info: 'down' })" size="auto" btnText="上游客服" type="primary"></g-button>
 					</view>
 				</view>
-				</view>
 			</slot>
 		</g-panel-fixed>
 		<!-- <u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height="600px" :mask-close-able="true">

root/detail/job.vue

@@ -725,6 +725,7 @@ export default {
 		};
 	},
 	onLoad(options) {
+		let that = this;
 		console.log("详情", options);
 		let loginUrl;
 		if (options.id) {
@@ -755,6 +756,23 @@ export default {
 		this.shareJobAgencyId && this.checkIsFans(this.shareJobAgencyId);
 
 		this.userinfo = uni.getStorageSync("apply-userinfo");
+		that.hasSee();
+		this.IS_CREATOR = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
+		console.log("this.IS_CREATOR", this.IS_CREATOR);
+		this.corpUserFlag = uni.getStorageSync("apply-userinfo").corpUserFlag;
+		uni.$on("updateJobDetail", () => {
+			this.initDetail();
+		});
+		if (uni.getStorageSync("apply-token")) {
+			this.getIgnore();
+			this.initDetail();
+		}
+		uni.getSystemInfo({
+			success: function (res) {
+				console.log(res);
+				that.wxPlat = res.hostName;
+			},
+		});
 		// if (uni.getStorageSync("apply-AGENCY_MAMBER_LIST")) {
 		// 	this.applyList = uni.getStorageSync("apply-AGENCY_MAMBER_LIST");
 		// 	console.log("this.applyList", this.applyList);
@@ -767,14 +785,11 @@ export default {
 		// 	});
 		// }
 	},
-	onShow() {
+	onShow() {},
+
+	methods: {
+		initDetail() {
 			let that = this;
-		that.hasSee();
-		this.IS_CREATOR = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
-		console.log("this.IS_CREATOR", this.IS_CREATOR);
-		this.corpUserFlag = uni.getStorageSync("apply-userinfo").corpUserFlag;
-		if (uni.getStorageSync("apply-token")) {
-			this.getIgnore();
 			this.getDetail().then((res) => {
 				console.log("res", res);
 				let objMiddle = res.cozeStructureRes ? JSON.parse(res.cozeStructureRes) : {};
@@ -812,16 +827,7 @@ export default {
 				that.speed = 1;
 				// this.toKnowInfo(res.agencyId);
 			});
-		}
-		uni.getSystemInfo({
-			success: function (res) {
-				console.log(res);
-				that.wxPlat = res.hostName;
-			},
-		});
 		},
-
-	methods: {
 		hasSee() {
 			var that = this;
 			that.G.Get(that.api.hasSee + "?jobId=" + that.uid, "", (res) => {

root/person/loginIndex.vue

@@ -314,6 +314,7 @@ export default {
 				});
 			} else if (that.fromPageType == "detail" || that.fromPageType == "shareList") {
 				console.log("that.currentId", that.currentId);
+        uni.$emit('updateJobDetail')
 				uni.reLaunch({
 					url: `${that.path}?scene=${that.currentId}`,
 				});

uni_modules/vk-uview-ui/components/u-popup/u-popup.vue

@@ -444,7 +444,7 @@ export default {
 
 .u-close {
 	position: absolute;
-	z-index: 3;
+	z-index: 100;
 }
 
 .u-close--top-left {