线索公海+销售线索增加最新跟进记录

pages/clue/post/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="post_item">
+	<view class="post_item" @click.stop="handlePostRootClick">
 		<view class="post_top">
 			<view class="top_left">{{ item.name }}
 				&nbsp;&nbsp;&nbsp;
@@ -42,6 +42,14 @@
 			<view class="info">
 				<view class="operation">运营人 {{ item.clueOperationName ? item.clueOperationName : "-" }}</view>
 			</view>
+			<view class="info latest_follow_row" @click.stop="handleShowFollowDetail(item)">
+				<view class="label">最新跟进记录:</view>
+				<view class="latest_follow_content">
+					<text class="latest_follow_text">{{ item.latestDynamicData || '暂无' }}</text>
+					<text class="latest_follow_time" v-if="item.latestDynamicTime">{{ item.latestDynamicTime }}</text>
+				</view>
+				<!-- <view class="latest_follow_add" @click.stop="handleAddFollow(item)">增加</view> -->
+			</view>
 		</view>
 		<view class="clue_state_wrap">
 			<view class="clue_state">
@@ -65,6 +73,27 @@
 			<view>发单</view>
 		</view>
 		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" @cancel="handleInquiryCancel" :type="1"/>
+		<!-- 最新跟进记录详情弹窗；关闭时记时间戳，避免蒙层点击冒泡触发详情跳转 -->
+		<u-popup :show="followPopupVisible" mode="bottom" round="16" @close="onFollowPopupClose"
+			:closeOnClickOverlay="true" @open="loadFollowList">
+			<view class="follow_popup">
+				<view class="follow_popup_title">跟进记录</view>
+				<scroll-view scroll-y class="follow_popup_list" v-if="followList.length">
+					<view class="follow_item" v-for="f in followList" :key="f.id">
+						<view class="follow_top">
+							<text class="person_name">{{ f.createNickname || f.createNickName || '-' }}</text>
+							<text class="follow_time">{{ f.createTime }}</text>
+						</view>
+						<view class="follow_content">{{ f.content }}</view>
+					</view>
+				</scroll-view>
+				<view class="follow_popup_empty" v-else-if="!followLoading">{{ followListError || '暂无跟进记录' }}</view>
+				<view class="follow_popup_loading" v-else>加载中...</view>
+				<!-- <view class="follow_popup_footer">
+					<u-button type="primary" @click="handleAddFollowFromPopup">增加跟进</u-button>
+				</view> -->
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -96,7 +125,13 @@ export default {
 			caseStatusDicts: [],
 			clueId: '',
 			editOrAdd: 'add',
-			editInfo: {}
+			editInfo: {},
+			followPopupVisible: false,
+			followList: [],
+			followLoading: false,
+			followListError: '',
+			currentFollowClue: null,
+			closedFollowPopupAt: 0
 		}
 	},
 	methods: {
@@ -193,6 +228,51 @@ export default {
 		handleInquiryCancel() {
 			this.$refs.inquiryDialog.closeDialog()
 		},
+		// 卡片根节点点击：若刚因点蒙层关闭弹窗则不跳转，否则通知父组件跳转详情
+		handlePostRootClick() {
+			if (Date.now() - this.closedFollowPopupAt < 400) return
+			this.$emit('to-detail', this.item)
+		},
+		onFollowPopupClose() {
+			this.followPopupVisible = false
+			this.closedFollowPopupAt = Date.now()
+		},
+		// 点击最新跟进记录，打开详情弹窗
+		handleShowFollowDetail(item) {
+			this.currentFollowClue = item
+			this.followPopupVisible = true
+			this.followList = []
+			this.followListError = ''
+		},
+		// 弹窗打开时加载该线索的跟进列表
+		async loadFollowList() {
+			if (!this.currentFollowClue || !this.currentFollowClue.id) return
+			this.followLoading = true
+			this.followListError = ''
+			try {
+				const res = await uni.$u.api.getClueFollowListByClueId({ clueId: this.currentFollowClue.id })
+				this.followList = (res.data || res) || []
+			} catch (e) {
+				console.error('获取跟进记录失败', e)
+				this.followListError = '加载失败'
+				this.followList = []
+			} finally {
+				this.followLoading = false
+			}
+		},
+		// 增加跟进：跳转添加跟进页
+		handleAddFollow(item) {
+			const id = (item && item.id) || (this.currentFollowClue && this.currentFollowClue.id)
+			if (!id) return
+			uni.navigateTo({
+				url: `/pages/addFollow/index?clueId=${id}`
+			})
+			this.followPopupVisible = false
+		},
+		// 弹窗内点击「增加跟进」
+		handleAddFollowFromPopup() {
+			this.handleAddFollow(this.currentFollowClue)
+		},
 	},
 }
 </script>
@@ -250,6 +330,42 @@ export default {
 				flex-wrap: wrap;
 			}
 		}
+
+		.latest_follow_row {
+			align-items: flex-start;
+			flex-wrap: wrap;
+
+			.label {
+				flex: 0 0 90px;
+				color: #666;
+			}
+
+			.latest_follow_content {
+				flex: 1;
+				min-width: 0;
+				display: flex;
+				flex-direction: column;
+				gap: 4px;
+			}
+
+			.latest_follow_text {
+				font-size: 13px;
+				color: #333;
+				word-break: break-all;
+			}
+
+			.latest_follow_time {
+				font-size: 12px;
+				color: #999;
+			}
+
+			.latest_follow_add {
+				flex-shrink: 0;
+				color: #4fa5fe;
+				font-size: 14px;
+				margin-left: 8px;
+			}
+		}
 	}
 
 	.clue_state_wrap {
@@ -308,4 +424,69 @@ export default {
 		background-color: #fff;
 	}
 }
+
+.follow_popup {
+	padding: 24rpx 30rpx 40rpx;
+	max-height: 70vh;
+	display: flex;
+	flex-direction: column;
+
+	.follow_popup_title {
+		font-size: 34rpx;
+		font-weight: 600;
+		margin-bottom: 24rpx;
+		text-align: center;
+	}
+
+	.follow_popup_list {
+		flex: 1;
+		max-height: 50vh;
+		margin-bottom: 24rpx;
+	}
+
+	.follow_item {
+		padding: 20rpx 0;
+		border-bottom: 1rpx solid #eee;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.follow_top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 12rpx;
+			font-size: 24rpx;
+
+			.person_name {
+				color: #333;
+				font-weight: 500;
+			}
+
+			.follow_time {
+				color: #999;
+			}
+		}
+
+		.follow_content {
+			font-size: 26rpx;
+			color: #666;
+			line-height: 1.5;
+			word-break: break-all;
+		}
+	}
+
+	.follow_popup_empty,
+	.follow_popup_loading {
+		text-align: center;
+		color: #999;
+		font-size: 28rpx;
+		padding: 60rpx 0;
+	}
+
+	.follow_popup_footer {
+		padding-top: 20rpx;
+	}
+}
 </style>

pages/privateClue/index.vue

@@ -36,7 +36,7 @@
 			<show-emtry v-if="listData.length === 0"></show-emtry>
 			<view class="case_main_wrap" v-else>
 				<post v-for="(item,index) in listData" :key="item.id + index" :item="item" :dicts="dicts"
-					:type="queryParams.type" @click.native="handleToDetail(item)" @inquirySuccess="inquirySuccess">
+					:type="queryParams.type" @to-detail="handleToDetail" @inquirySuccess="inquirySuccess">
 				</post>
 				<u-loadmore :status="finished ? 'nomore' : loadStatus" icon line />
 			</view>

pages/publicClue/index.vue

@@ -36,7 +36,7 @@
 			<show-emtry v-if="listData.length === 0"></show-emtry>
 			<view class="case_main_wrap" v-else>
 				<post v-for="(item,index) in listData" :key="item.id + index" :item="item" :dicts="dicts"
-					:type="queryParams.type" @click.native="handleToDetail(item)">
+					:type="queryParams.type" @to-detail="handleToDetail">
 				</post>
 				<u-loadmore :status="finished ? 'nomore' : loadStatus" icon line />
 			</view>

utils/api.js

@@ -60,6 +60,7 @@ const install = (Vue, vm) => {
 		getClueMainInfoById: (params = {}, config = {}) => http.get(store.state.user.path + '/clueMainInfo/getClueMainInfoById', { params, ...config }),
 		getClueAdInfoByClueId: (params = {}, config = {}) => http.get(store.state.user.path + '/clueAdInfo/getClueAdInfoByClueId', { params, ...config }),
 		getClueFollowList: (params = {}, config = {}) => http.get(store.state.user.path + '/clueFollow/getClueFollowList', { params, ...config }),
+		getClueFollowListByClueId: (params = {}, config = {}) => http.get(store.state.user.path + '/clueFollow/getClueFollowListByClueId', { params, ...config }),
 		deleteClueFollow: (data, config = {}) => http.post(store.state.user.path + '/clueFollow/deleteClueFollow', data),
 		updateClueFixedFieldsClueOwner: (data, config = {}) => http.post(store.state.user.path + '/clueFixedFields/updateClueFixedFieldsClueOwner', data),
 		addClueFollow: (data, config = {}) => http.post(store.state.user.path + '/clueFollow/addClueFollow', data),