接单中心

pages.json

@@ -198,6 +198,12 @@
 				"navigationBarTitleText": "线索发单",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/order/index",
+			"style": {
+				"navigationBarTitleText": "接单中心"
+			}
 		}
 	],
 	"globalStyle": {
@@ -229,6 +235,11 @@
 			"pagePath": "pages/privateClue/index",
 			"iconPath": "static/tabs/private.png",
 			"selectedIconPath": "static/tabs/private1.png"
+		}, {
+			"text": "接单中心",
+			"pagePath": "pages/order/index",
+			"iconPath": "static/tabs/private.png",
+			"selectedIconPath": "static/tabs/private1.png"
 		},{
 			"text": "我的",
 			"pagePath": "pages/person/index",

pages/clueDetail/page/clueDetail.vue

@@ -93,21 +93,24 @@
 		</view>
 
 
-		<yui-tabs :tabs="tabs" :swipeThreshold="10" v-model="activeIndex" :lineWidth="'120rpx'" :isLazyRender="false"
-			color="#108cff" titleActiveColor="#108cff" :swipeable="true" :swiper="true" :scrollspy="true">
+		<yui-tabs :tabs="tabs" v-model="activeIndex" :lineWidth="'120rpx'" :isLazyRender="false"
+			color="#108cff" titleActiveColor="#108cff" :swipeable="true" :swiper="false" :ellipsis="false" :scroll-threshold="3">
 			<template #clueInfo>
-				<clueInfo :clueId="clueDetail.id" v-if="clueDetail.id" :params="params" ref="clueInfoRef"></clueInfo>
+				<clueInfo :clueId="clueDetail.id" v-if="clueDetail.id" :params="params" ref="clueInfoRef" type="1"></clueInfo>
 			</template>
 			<template #advertising>
 				<advertising :clueId="clueDetail.id" v-if="clueDetail.id" ref="advertisingRef"></advertising>
 			</template>
 			<template #followRecord>
-				<followRecord :clueId="clueDetail.id" v-if="clueDetail.id" ref="followRecordRef"></followRecord>
+				<followRecord :clueId="clueDetail.id" v-if="clueDetail.id" ref="followRecordRef" type="1"></followRecord>
 			</template>
 			<template #callRecord>
 				<callRecord :clueId="clueDetail.id" :clueDetail="clueDetail" v-if="clueDetail.id" ref="callRecordRef">
 				</callRecord>
 			</template>
+			<template #orderFollow>
+				<followRecord :clueId="clueDetail.id" v-if="clueDetail.id" ref="followRecordRef" type="3"></followRecord>
+			</template>
 		</yui-tabs>
 		<u-tabbar class="clueDetail_tabber" :fixed="true" inactiveColor="#ffffff" :placeholder="true"
 			:safeAreaInsetBottom="true">
@@ -196,13 +199,7 @@
 					},
 					{
 						label: '后端跟进',
-						slot: 'callRecord'
-					},{
-						label: '后端跟进',
-						slot: 'callRecord'
-					},{
-						label: '后端跟进',
-						slot: 'callRecord'
+						slot: 'orderFollow'
 					}
 				],
 				activeIndex: 0,

pages/clueDetail/tabs/followRecord/index.vue

@@ -52,12 +52,26 @@
 		props: {
 			clueId: {
 				required: true
+			},
+			orderId: {
+				type: String | Number,
+				required: false
+			},
+			type: {
+				type: String,
+				required: true
+				// '1' : 线索跟进
+				// '2' : 订单跟进(通过orderId)
+				// '3' : 订单跟进(通过clueId)
+				// '4' : 重复线索跟进
+				// 其他 : 重复订单跟进
 			}
 		},
 		data() {
 			return {
 				list: [0, 1],
 				dataList: {},
+				loading: false,
 				
 				showModal: false,
 				currentDeleteFollowId : undefined
@@ -71,18 +85,60 @@
 			},
 			isEmpty,
 			async getData() {
-				const {
-					data
-				} = await uni.$u.api.getClueFollowList({
-					clueId: this.clueId
-				});
-				this.dataList = data;
+				this.loading = true;
+				let data;
+				
+				// 根据type类型调用不同接口
+				if (this.type === '1') {
+					// 线索跟进
+					data = await uni.$u.api.getClueFollowList({
+						clueId: this.clueId
+					});
+				} else if (this.type === '2') {
+					// 订单跟进(通过orderId)
+					data = await uni.$u.api.getOrderFollowList({
+						orderId: this.orderId
+					});
+				} else if (this.type === '3') {
+					// 订单跟进(通过clueId)
+					data = await uni.$u.api.getOrderFollowListByClueId({
+						clueId: this.clueId
+					});
+				} else if (this.type === '4') {
+					// 重复线索跟进
+					data = await uni.$u.api.getDuplicateClueFollowByClueId({
+						clueId: this.clueId
+					});
+				} else {
+					// 重复订单跟进
+					data = await uni.$u.api.getDuplicateOrderFollowListByClueId({
+						clueId: this.clueId
+					});
+				}
+				
+				this.dataList = data.data;
+				this.loading = false;
 			},
 			async confirm() {
-				await uni.$u.api.deleteClueFollow([this.currentDeleteFollowId]);
-				uni.$u.toast("删除成功");
-				this.getData();
-				this.showModal = false;
+				try {
+					// 根据type类型调用不同删除接口
+					if (this.type === '1' || this.type === '4') {
+						// 线索跟进和重复线索跟进使用deleteClueFollow
+						await uni.$u.api.deleteClueFollow([this.currentDeleteFollowId]);
+					} else {
+						// 订单跟进(通过orderId)、订单跟进(通过clueId)、重复订单跟进使用deleteOrderFollow
+						await uni.$u.api.deleteOrderFollow([this.currentDeleteFollowId]);
+					}
+					
+					uni.$u.toast("删除成功");
+					this.getData();
+				} catch (error) {
+					console.error('删除跟进记录失败:', error);
+					uni.$u.toast("删除失败");
+				} finally {
+					this.showModal = false;
+					this.currentDeleteFollowId = undefined;
+				}
 			},
 		},
 		mounted() {

pages/order/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

uni_modules/yui-tabs/components/yui-tabs/css/index.less

@@ -114,7 +114,7 @@ uni-view , swiper-item, view{
 			font-size: 28rpx;
 			color: @inactiveColor;
 			text-align: center;
-			padding: 0 8rpx;
+			padding: 0 28rpx;
 			flex: 1;
 			cursor: pointer;
 			-webkit-tap-highlight-color: transparent;

uni_modules/yui-tabs/components/yui-tabs/yui-tabs.vue

@@ -535,7 +535,6 @@
 			// 设置标签栏底部线条位置
 			setLine() {
 				if (this.isLine) { // 仅在 type="line" 时有效
-					console.log("currentIndex:", this.currentIndex);
 					const val = this.tabList[this.currentIndex].translateX
 					const transform = `translateX(${isDef(val) ? val + "px" : '-100%'}) translateX(-50%)`
 					const duration = `${this.lineAnimated?this.duration:'0'}s`

utils/api.js

@@ -76,6 +76,11 @@ const install = (Vue, vm) => {
 		getCallClueFileByClueId : (params)=> http.get(store.state.user.path + '/clueFile/getCallClueFileByClueId',{params, custom : { noAuth: true }}),
 		getClueSendFormCountByClueId : (params = {},config = {})=>http.get(store.state.user.path + '/clueSendForm/getClueSendFormCountByClueId',{ params }),
 		saveClueOrderForm:(data,config={})=>http.post(store.state.user.path + '/clueSendForm/saveClueOrderForm',data),
+		getOrderFollowListByClueId:(params = {},config = {})=>http.get(store.state.user.path + '/orderFollow/getOrderFollowListByClueId',{ params }),
+		getDuplicateOrderFollowListByClueId:(params = {},config = {})=>http.get(store.state.user.path + '/orderFollow/getDuplicateOrderFollowListByClueId',{ params }),
+		deleteOrderFollow:(data,config={})=>http.post(store.state.user.path + '/orderFollow/deleteOrderFollow',data),
+		getOrderFollowList:(params = {},config = {})=>http.get(store.state.user.path + '/orderFollow/getOrderFollowList',{ params }),
+		getDuplicateClueFollowByClueId:(params = {},config = {})=>http.get(store.state.user.path + '/clueFollow/getDuplicateClueFollowByClueId',{ params }),
 	}
 }