Merge branch 'cyl/master-0822'

root/NEUIKit/pages/Chat/index.vue

@@ -26,6 +26,7 @@
 			"
 			:conversation-type="conversationType"
 			:to="to"
+			@exportPointJob="exportPointJob"
 		/>
 		<!-- </div> -->
 
@@ -69,6 +70,7 @@ import { V2NIMConst } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK";
 const G = getCurrentInstance().appContext.app.config.globalProperties.G;
 const F = getCurrentInstance().appContext.app.config.globalProperties.F;
 const api = getCurrentInstance().appContext.app.config.globalProperties.api;
+import { getList, query } from "../../components/list/job/api";
 export interface YxReplyMsg {
 	messageClientId: string;
 	scene: V2NIMConst.V2NIMConversationType;
@@ -460,6 +462,7 @@ onUnmounted(() => {
 	connectedWatch();
 	msgsWatch();
 	conversationTypeWatch();
+	uni.removeStorageSync('im_sendParams');
 });
 const query = ref({
 	page: 1,
@@ -639,6 +642,10 @@ onUnload(() => {
 	uni.$off(events.CONFIRM_FORWARD_MSG);
 	uni.$off(events.CANCEL_FORWARD_MSG);
 });
+
+const exportPointJob = ()=>{
+	F.wyyxPost(api.wyyx_sendCard,JSON.parse(uni.getStorageSync('im_sendParams')),() => {},() => {});
+}
 </script>
 
 <style lang="scss">

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

@@ -1,6 +1,6 @@
 <template>
 	<div style="" class="pbInput" :style="writeStyle">
-		<div class="input-root">
+		<div class="input-root" style="position: relative;">
 			<!-- 以下这个 div 用于确保 vue2 的 ref 会更新 -->
 			<div style="display: none">
 				<div>{{ teamMute ? "禁言" : "不禁言" }}</div>
@@ -158,6 +158,56 @@
 			<UniPopup ref="popupRef" background-color="#ffffff" type="bottom" mask-background-color="rgba(0,0,0,0.4)" @change="onPopupChange">
 				<MentionMemberList :team-id="to"></MentionMemberList>
 			</UniPopup>
+		
+		  <div class="choose-job-send" 
+					 style="
+						width: calc(100vw - 48px);
+						min-height: 50px;
+						background-color: #fff;
+						position: absolute;
+						left: 50%;
+						transform: translateX(-50%);
+						top: -92px;
+						padding: 12px;
+						border-radius: 12px;
+					 "
+					 v-if="chooseData && chooseData.title && false"
+			>
+				<div class="g_w_all g_h_all">
+					<div class="g_mb_12 g_flex_row_between">
+						<div style="font-weight:bold;font-size:16px;color:#000" class="g_flex_1">{{ chooseData.title }}</div>
+						<div class="g_flex_none g_flex_column_center">
+							<i class="iconfont icon-guanbi" style="font-size: 14px;color: #666;"></i>
+						</div>
+					</div>
+					<div class="g_flex_row_between">
+						<div class="g_flex_1 g_flex_column_center">
+							<div class="g_flex_row_start">
+								<view class="g_fs_16 g_fw_600 g_c_f40 g_lh_1_2 g_flex_column_center"
+									v-if="chooseData.salaryClassifyValue"
+									v-html="chooseData.salaryClassifyValue"> </view>
+								<view class="g_fs_14 g_c_9" v-if="chooseData.monthPay">
+									{{ chooseData.monthPay ? "丨" + chooseData.monthPay : "" }}
+								</view>
+							</div>
+						</div>
+						<div class="g_flex_none g_flex_column_center" @tap="sendPointJob">
+							<div style="
+										font-size: 12px;
+										border-radius: 20px;
+										height: 26px;
+										line-height: 26px;
+										width: 70px;
+										text-align: center;
+										background-color: #1890ff;
+										color: #fff;
+									">
+								发送职位
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 </template>
@@ -528,6 +578,9 @@ const handleSendJob = () => {
 	console.log("props.jobListShow", props.jobListShow);
 	emits("jobListShow", true);
 };
+const sendPointJob = () => { 
+	emits("exportPointJob");
+};
 const handleSendCustomMsg = () => {
 	const customMsg = uni.$UIKitNIM.V2NIMMessageCreator.createCustomMessage(
 		"这是PGQ的自定义消息",
@@ -756,8 +809,11 @@ let uninstallTeamWatch = () => {};
 const msgHeight = ref(0);
 const screenHeight = ref(0);
 screenHeight.value = uni.getSystemInfoSync().windowHeight;
-
+const chooseData = ref({});
 onMounted(() => {
+	if(uni.getStorageSync("im_sendParams")){
+		chooseData.value = JSON.parse(uni.getStorageSync("im_sendParams")).jobDetail;
+	}
 	uninstallTeamWatch = autorun(() => {
 		if (props.conversationType === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM) {
 			const _team: V2NIMTeam = deepClone(uni.$UIKitStore.teamStore.teams.get(props.to));

root/components/chatEvent/message.vue

@@ -31,7 +31,7 @@
 			cusMessage: {
 				handler(newVal) {
 					console.log('newVal',newVal)
-					const hasDot = newVal.endsWith('。');
+					const hasDot = String(newVal).endsWith('。');
 					const messageWithoutDot = hasDot ? newVal.slice(0, -1) : newVal;
 					this.displayedMessage = messageWithoutDot;
 					if (this.isShow) {
@@ -45,9 +45,12 @@
 			'isRender': {
 					handler(newVal) {
 							this.isShow = newVal;
-							const hasDot = this.cusMessage.endsWith('。');
-							const messageWithoutDot = hasDot ? this.cusMessage.slice(0, -1) : this.cusMessage;
-							this.displayedMessage = this.isShow ? messageWithoutDot + '...' : (hasDot ? messageWithoutDot + '。' : messageWithoutDot);
+							if(this.cusMessage){
+								let _str = String(this.cusMessage);
+								const hasDot = _str.endsWith('。');
+								const messageWithoutDot = hasDot ? _str.slice(0, -1) : _str;
+								this.displayedMessage = this.isShow ? messageWithoutDot + '...' : (hasDot ? messageWithoutDot + '。' : messageWithoutDot);
+							}
 					},
 					immediate: true
 			}

root/detail/job.vue

@@ -1383,33 +1383,26 @@ export default {
 							}
 						});
 						that.jobDetail.info = newList.join("丨");
-						that.F.wyyxPost(
-							that.api.wyyx_sendCard,
-							{
-								conversationType: 1,
-								// senderUserId: uni.getStorageSync("apply-uid"), // 发送者id 即当前登录用户id
-								// receiverUserId: cusData, // 接收方用户id
-								senderAccid: uni.getStorageSync("im-accid"),
-								receiverAccid: cusData.accid,
-								type: 100000,
-								jobDetail: {
-									title: that.jobDetail.jobName,
-									info: that.jobDetail.info,
-									label: that.jobDetail.jobRequestLabelNames.length > 0 ? that.jobDetail.jobRequestLabelNames : [],
-									salaryClassifyValue: that.jobDetail.priceStr,
-									serviceFee: that.showPrice ? that.jobDetail.serverPrice : "",
-									monthPay: that.jobDetail.monthPay,
-									jobId: that.uid,
-								},
+						let sendParams = {
+							conversationType: 1,
+							senderAccid: uni.getStorageSync("im-accid"),
+							receiverAccid: cusData.accid,
+							type: 100000,
+							jobDetail: {
+								title: that.jobDetail.jobName,
+								info: that.jobDetail.info,
+								label: that.jobDetail.jobRequestLabelNames.length > 0 ? that.jobDetail.jobRequestLabelNames : [],
+								salaryClassifyValue: that.jobDetail.priceStr,
+								serviceFee: that.showPrice ? that.jobDetail.serverPrice : "",
+								monthPay: that.jobDetail.monthPay,
+								jobId: that.uid,
 							},
-							() => {
-								uni.navigateTo({
-									url: "/root/NEUIKit/pages/Chat/index",
-								});
-								that.goImLoading = false;
-							},
-							() => {}
-						);
+						}
+						uni.setStorageSync("im_sendParams", JSON.stringify(sendParams));
+						uni.navigateTo({
+							url: "/root/NEUIKit/pages/Chat/index",
+						});
+						that.goImLoading = false;
 					},
 					() => {}
 				);