Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app into priceCenter

components/order-file-upload-old/order-file-upload.vue

@@ -0,0 +1,181 @@
+<template>
+	<view class="order-file-upload">
+		<view class="upload-section">
+			<view class="upload-title">
+				<text class="title-text">{{ title }}</text>
+				<text class="upload-btn" @click="handleUpload">上传文件</text>
+			</view>
+
+			<view class="file-list" v-if="fileList.length > 0">
+				<view class="file-item" v-for="(item, index) in fileList" :key="index">
+					<view class="file-info">
+						<text class="file-name">{{ item.fileName }}</text>
+						<text class="file-size">{{ item.fileSize }}</text>
+					</view>
+					<view class="file-actions">
+						<text class="delete-btn" @click="handleDelete(index)">删除</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="upload-tip" v-else>
+				<text class="tip-text">{{ tipText }}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import upload from '../../mixins/upload';
+export default {
+	name: 'OrderFileUpload',
+	mixins: [upload],
+	props: {
+		title: {
+			type: String,
+			default: '文件上传'
+		},
+		orderFileType: {
+			type: String,
+			required: true
+		},
+		fileList: {
+			type: Array,
+			default: () => []
+		},
+		tipText: {
+			type: String,
+			default: '点击上传文件'
+		},
+		fileType: {
+			type: String,
+			default: 'all',
+			desc: '文件选择类型：all（所有）、image（图片）、video（视频）、audio（音频）、document（文档）等'
+		},
+	},
+	data() {
+		return {
+		}
+	},
+	watch: {
+		fileList: {
+			handler(newVal) {
+				this.uploadList = [...newVal];
+			},
+			immediate: true
+		}
+	},
+	methods: {
+		handleUploadSuccess() {
+			uni.$u.toast("上传成功");
+		},
+		// 删除文件
+		handleDelete(index) {
+			uni.showModal({
+				title: '提示',
+				content: '确定要删除该文件吗？',
+				success: (res) => {
+					if (res.confirm) {
+						this.uploadList.splice(index, 1);
+						this.$emit('update:fileList', this.uploadList);
+						this.$emit('change', {
+							type: this.orderFileType,
+							fileList: this.uploadList
+						});
+					}
+				}
+			});
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.order-file-upload {
+	.upload-section {
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+
+	.upload-title {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 30rpx 40rpx;
+		border-bottom: 1rpx solid #f5f5f5;
+
+		.title-text {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333;
+		}
+
+		.upload-btn {
+			padding: 12rpx 24rpx;
+			background: #007aff;
+			color: #fff;
+			border-radius: 8rpx;
+			font-size: 28rpx;
+		}
+	}
+
+	.file-list {
+		padding: 20rpx 40rpx;
+	}
+
+	.file-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20rpx 0;
+		border-bottom: 1rpx solid #f5f5f5;
+
+		&:last-child {
+			border-bottom: none;
+		}
+	}
+
+	.file-info {
+		flex: 1;
+		min-width: 0; // 防止flex子元素溢出
+
+		.file-name {
+			display: block;
+			font-size: 30rpx;
+			color: #333;
+			margin-bottom: 8rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			max-width: 400rpx; // 设置最大宽度防止过长
+		}
+
+		.file-size {
+			font-size: 26rpx;
+			color: #999;
+		}
+	}
+
+	.file-actions {
+		.delete-btn {
+			padding: 12rpx 24rpx;
+			background: #ff4757;
+			color: #fff;
+			border-radius: 8rpx;
+			font-size: 26rpx;
+		}
+	}
+
+	.upload-tip {
+		padding: 40rpx;
+		text-align: center;
+
+		.tip-text {
+			font-size: 28rpx;
+			color: #999;
+		}
+	}
+}
+</style>

components/order-file-upload/order-file-upload.vue

@@ -2,180 +2,188 @@
 	<view class="order-file-upload">
 		<view class="upload-section">
 			<view class="upload-title">
-				<text class="title-text">{{title}}</text>
+				<text class="title-text">{{ title }}</text>
 				<text class="upload-btn" @click="handleUpload">上传文件</text>
 			</view>
 
 			<view class="file-list" v-if="fileList.length > 0">
 				<view class="file-item" v-for="(item, index) in fileList" :key="index">
-					<view class="file-info">
-						<text class="file-name">{{item.fileName}}</text>
-						<text class="file-size">{{item.fileSize}}</text>
-					</view>
+					<pictureViewer @delete="handleDelete(index)" :src="item.fileUrl" @needPreviewPic="needPreviewPic">
+					</pictureViewer>
 					<view class="file-actions">
-						<text class="delete-btn" @click="handleDelete(index)">删除</text>
+						<!-- <text class="delete-btn" @click="handleDelete(index)">x</text> -->
 					</view>
 				</view>
 			</view>
 
 			<view class="upload-tip" v-else>
-				<text class="tip-text">{{tipText}}</text>
+				<text class="tip-text">{{ tipText }}</text>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import upload from '../../mixins/upload';
-	export default {
-		name: 'OrderFileUpload',
-		mixins : [upload],
-		props: {
-			title: {
-				type: String,
-				default: '文件上传'
-			},
-			orderFileType: {
-				type: String,
-				required: true
-			},
-			fileList: {
-				type: Array,
-				default: () => []
-			},
-			tipText: {
-				type: String,
-				default: '点击上传文件'
-			},
-			fileType: {
-				type: String,
-				default: 'all',
-				desc: '文件选择类型：all（所有）、image（图片）、video（视频）、audio（音频）、document（文档）等'
-			},
+import upload from '../../mixins/upload';
+import pictureViewer from '../picture-viewer/picture-viewer.vue'
+export default {
+	name: 'OrderFileUpload',
+	mixins: [upload],
+	components: {
+		pictureViewer
+	},
+	props: {
+		title: {
+			type: String,
+			default: '文件上传'
 		},
-		data() {
-			return {
-			}
+		orderFileType: {
+			type: String,
+			required: true
 		},
-		watch: {
-			fileList: {
-				handler(newVal) {
-					this.uploadList = [...newVal];
-				},
-				immediate: true
-			}
+		fileList: {
+			type: Array,
+			default: () => []
 		},
-		methods: {
-			handleUploadSuccess(){
-				uni.$u.toast("上传成功");
+		tipText: {
+			type: String,
+			default: '点击上传文件'
+		},
+		fileType: {
+			type: String,
+			default: 'all',
+			desc: '文件选择类型：all（所有）、image（图片）、video（视频）、audio（音频）、document（文档）等'
+		},
+	},
+	data() {
+		return {
+		}
+	},
+	watch: {
+		fileList: {
+			handler(newVal) {
+				this.uploadList = [...newVal];
 			},
-			// 删除文件
-			handleDelete(index) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除该文件吗？',
-					success: (res) => {
-						if (res.confirm) {
-							this.uploadList.splice(index, 1);
-							this.$emit('update:fileList', this.uploadList);
-							this.$emit('change', {
-								type: this.orderFileType,
-								fileList: this.uploadList
-							});
-						}
+			immediate: true
+		}
+	},
+	methods: {
+		handleUploadSuccess() {
+			uni.$u.toast("上传成功");
+		},
+		// 删除文件
+		handleDelete(index) {
+			uni.showModal({
+				title: '提示',
+				content: '确定要删除该文件吗？',
+				success: (res) => {
+					if (res.confirm) {
+						this.uploadList.splice(index, 1);
+						this.$emit('update:fileList', this.uploadList);
+						this.$emit('change', {
+							type: this.orderFileType,
+							fileList: this.uploadList
+						});
 					}
-				});
-			}
+				}
+			});
+		},
+		needPreviewPic(url) {
+			uni.previewImage({
+				urls: this.fileList.map(item => item.fileUrl),
+				current: url
+			});
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.order-file-upload {
-		.upload-section {
-			background: #fff;
-			margin-bottom: 20rpx;
-			border-radius: 16rpx;
-			overflow: hidden;
+.order-file-upload {
+	.upload-section {
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+
+	.upload-title {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 30rpx 40rpx;
+		border-bottom: 1rpx solid #f5f5f5;
+
+		.title-text {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333;
 		}
 
-		.upload-title {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 30rpx 40rpx;
-			border-bottom: 1rpx solid #f5f5f5;
-
-			.title-text {
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #333;
-			}
-
-			.upload-btn {
-				padding: 12rpx 24rpx;
-				background: #007aff;
-				color: #fff;
-				border-radius: 8rpx;
-				font-size: 28rpx;
-			}
+		.upload-btn {
+			padding: 12rpx 24rpx;
+			background: #007aff;
+			color: #fff;
+			border-radius: 8rpx;
+			font-size: 28rpx;
 		}
+	}
+
+	.file-list {
+		padding: 20rpx 20rpx;
+		display: grid;
+		//一行三个
+		grid-template-columns: repeat(3, 1fr);
+		gap: 20rpx;
+	}
 
-		.file-list {
-			padding: 20rpx 40rpx;
+	.file-item {
+		padding: 0rpx 0;
+
+		&:last-child {
+			border-bottom: none;
 		}
+	}
 
-		.file-item {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 20rpx 0;
-			border-bottom: 1rpx solid #f5f5f5;
+	.file-info {
+		flex: 1;
+		min-width: 0; // 防止flex子元素溢出
 
-			&:last-child {
-				border-bottom: none;
-			}
+		.file-name {
+			display: block;
+			font-size: 30rpx;
+			color: #333;
+			margin-bottom: 8rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			max-width: 400rpx; // 设置最大宽度防止过长
 		}
 
-		.file-info {
-			flex: 1;
-			min-width: 0; // 防止flex子元素溢出
-
-			.file-name {
-				display: block;
-				font-size: 30rpx;
-				color: #333;
-				margin-bottom: 8rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				max-width: 400rpx; // 设置最大宽度防止过长
-			}
-
-			.file-size {
-				font-size: 26rpx;
-				color: #999;
-			}
+		.file-size {
+			font-size: 26rpx;
+			color: #999;
 		}
+	}
 
-		.file-actions {
-			.delete-btn {
-				padding: 12rpx 24rpx;
-				background: #ff4757;
-				color: #fff;
-				border-radius: 8rpx;
-				font-size: 26rpx;
-			}
+	.file-actions {
+		.delete-btn {
+			padding: 12rpx 24rpx;
+			background: #ff4757;
+			color: #fff;
+			border-radius: 8rpx;
+			font-size: 26rpx;
 		}
+	}
 
-		.upload-tip {
-			padding: 40rpx;
-			text-align: center;
+	.upload-tip {
+		padding: 40rpx;
+		text-align: center;
 
-			.tip-text {
-				font-size: 28rpx;
-				color: #999;
-			}
+		.tip-text {
+			font-size: 28rpx;
+			color: #999;
 		}
 	}
+}
 </style>

components/picture-viewer/picture-viewer.vue

@@ -0,0 +1,54 @@
+<template>
+    <view class="pic-comp-container">
+        <image class="picComp" :src="src" mode="aspectFill" @click="click"></image>
+        <view class="delete-btn" @click="handleDelete">×</view>
+    </view>
+</template>
+<script>
+export default {
+    props: {
+        src: {
+            type: String,
+            default: ''
+        }
+    },
+    methods: {
+        click() {
+            this.$emit('needPreviewPic', this.src)
+        },
+        handleDelete() {
+            this.$emit('delete')
+        }
+    }
+}
+</script>
+<style scoped>
+.pic-comp-container {
+    width: 200rpx;
+    height: 200rpx;
+    box-sizing: border-box;
+    /* overflow: hidden; */
+    position: relative;
+}
+
+.picComp {
+    width: 200rpx !important;
+    height: 200rpx !important;
+    object-fit: cover;
+    border-radius: 30rpx;
+
+}
+
+.delete-btn {
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align: center;
+    background: #ff4757;
+    color: #fff;
+    border-radius: 50%;
+    position: absolute;
+    top: -10rpx;
+    right: -20rpx;
+}
+</style>

components/soundRecorder/soundRecorder.vue

@@ -0,0 +1,92 @@
+<template>
+    <view class="sound-recorder">
+        <view class="top-text">{{ topText }}</view>
+        <view class="file-name">{{ dataInner.fileName }}</view>
+        <view class="call-history">{{ callHistory }}</view>
+        <audio :src="dataInner.fileUrl" controls></audio>
+        <view @click="handleDelete">
+            <u-icon class="delectIcon" name="trash" size="22"></u-icon>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        data: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+    data() {
+        return {
+            dataInner: {}
+        }
+    },
+    watch: {
+        data: {
+            deep: true,
+            immediate: true,
+            handler(newVal) {
+                this.dataInner = { ...newVal }
+            }
+        }
+    },
+    computed: {
+        topText() {
+            return `${this.dataInner.createTime}号码(${this.dataInner.caller})上传录音`
+        },
+        callHistory() {
+            return `${this.dataInner.caller} 打给 ${this.dataInner.callee}`
+        }
+    },
+    methods: {
+        handleDelete() {
+            console.log('点击了删除录音的按钮')
+            // this.$emit('delete', this.dataInner)
+        }
+    }
+
+}
+</script>
+<style lang="scss" scoped>
+.sound-recorder {
+    background: #ffffff;
+    border-radius: 20rpx;
+    box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.08);
+    padding: 32rpx;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+    border: 2rpx solid #f0f0f0;
+    position: relative;
+    margin-bottom: 10rpx;
+
+    .top-text {
+        font-size: 20rpx;
+        color: #888;
+        line-height: 1.4;
+    }
+
+    .call-history {
+        font-size: 30rpx;
+        color: #333;
+        font-weight: 500;
+        margin-bottom: 20rpx;
+        line-height: 1.5;
+    }
+
+    .file-name {
+        font-size: 20rpx;
+        color: #666;
+        line-height: 1.4;
+        word-break: break-all;
+    }
+
+
+    .delectIcon {
+        position: absolute;
+        right: 32rpx;
+        top: 32rpx;
+        z-index: 1;
+    }
+}
+</style>

manifest.json

@@ -38,18 +38,43 @@
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_SHORTCUT\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.SEND_RESPOND_VIA_MESSAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>",
                     "<uses-permission android:name=\"android.permission.MANAGE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.FOREGROUND_SERVICE\"/>",
-                    "<uses-permission android:name=\"android.permission.FOREGROUND_SERVICE_SPECIAL_USE\"/>"
+                    "<uses-permission android:name=\"android.permission.FOREGROUND_SERVICE_SPECIAL_USE\" />"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
                 "minSdkVersion" : 21,

pages.json

@@ -141,9 +141,8 @@
 			}
 		},
 		{
-			"path" : "pages/addClue/index",
-			"style" : 
-			{
+			"path": "pages/addClue/index",
+			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#108cff",
@@ -151,72 +150,64 @@
 			}
 		},
 		{
-			"path" : "pages/publicClue/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "线索公海",
+			"path": "pages/publicClue/index",
+			"style": {
+				"navigationBarTitleText": "线索公海",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/wareHouse/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "仓库",
+			"path": "pages/wareHouse/index",
+			"style": {
+				"navigationBarTitleText": "仓库",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/wareHouse/detail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "仓库详情",
+			"path": "pages/wareHouse/detail",
+			"style": {
+				"navigationBarTitleText": "仓库详情",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/wareHouse/add",
-			"style" : 
-			{
-				"navigationBarTitleText" : "仓库新增",
+			"path": "pages/wareHouse/add",
+			"style": {
+				"navigationBarTitleText": "仓库新增",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/wareHouse/openOrder",	
-			"style" : 
-			{
-				"navigationBarTitleText" : "销售业务开单",
+			"path" : "pages/wareHouse/openOrder",
+			"style": {
+				"navigationBarTitleText": "销售业务开单",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/privateClue/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "销售线索",
+			"path": "pages/privateClue/index",
+			"style": {
+				"navigationBarTitleText": "销售线索",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/auth/auth",
-			"style" : 
-			{
-			    "navigationBarTitleText": "",
-			    "enablePullDownRefresh": false,
+			"path": "pages/auth/auth",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/bindSuccess/index",
-			"style" : 
-			{
+			"path": "pages/bindSuccess/index",
+			"style": {
 				"navigationStyle": "custom"
 			}
 		},
@@ -254,7 +245,7 @@
 			"path": "pages/orderDetailNew/index",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
@@ -285,7 +276,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-			{
+		{
 			"path": "pages/pagereceivecenter/pagereceivecenter",
 			"style": {
 				"navigationBarTitleText": "接单中心",
@@ -366,15 +357,15 @@
 				"pagePath": "pages/privateClue/index",
 				"iconPath": "static/tabs/private.png",
 				"selectedIconPath": "static/tabs/private1.png",
-				"visible": false		
-			}, 
+				"visible": false
+			},
 			{
 				"text": "接单中心",
 				"pagePath": "pages/order/index",
 				"iconPath": "static/tabs/order.png",
 				"selectedIconPath": "static/tabs/order1.png",
 				"visible": false
-			}, 
+			},
 			{
 				"text": "我的",
 				"pagePath": "pages/person/index",

pages/circumstances/index.vue

@@ -23,8 +23,8 @@
 					</view>
 					<view class="item-right">
 						<text>{{
-              callAccount ? callAccount.extenNum : "未配置分机号"
-            }}</text>
+							callAccount ? callAccount.extenNum : "未配置分机号"
+						}}</text>
 					</view>
 				</view>
 				<view class="option_item">
@@ -211,246 +211,246 @@
 </template>
 
 <script>
-	import {
-		mapState
-	} from "vuex";
-	import iconImg from "./components/iconImg.vue";
-	import permision from "@/js_sdk/wa-permission/permission.js";
+import {
+	mapState
+} from "vuex";
+import iconImg from "./components/iconImg.vue";
+import permision from "@/js_sdk/wa-permission/permission.js";
 
-	export default {
-		components: {
-			iconImg,
-		},
-		computed: {
-			...mapState({
-				nickName: (state) => state.user.userInfo.nickName,
-				callAccount: (state) => state.app.callAccount,
-				signInState: (state) => state.app.signInState,
-				ipAddress: (state) =>
-					state.app.registerInfo && state.app.registerInfo.register ?
+export default {
+	components: {
+		iconImg,
+	},
+	computed: {
+		...mapState({
+			nickName: (state) => state.user.userInfo.nickName,
+			callAccount: (state) => state.app.callAccount,
+			signInState: (state) => state.app.signInState,
+			ipAddress: (state) =>
+				state.app.registerInfo && state.app.registerInfo.register ?
 					state.app.registerInfo.register["IPv4"].slice(-3) : "异常",
-				redisStatus: (state) => state.app.redisStatus,
-				callSystem: (state) => state.app.callSystem,
-				uuid: (state) => state.user.uuid,
-				isCallOff: (state) => state.user.netConfig.isCallOff,
-				// 从call store获取权限状态
-				isAutoRecord: (state) => state.call.isAutoRecord,
-				hasStoragePermission: (state) => state.call.hasStoragePermission,
-				hasReadPhoneStatePermission: (state) => state.call.hasReadPhoneStatePermission,
-				hasCallPhonePermission: (state) => state.call.hasCallPhonePermission,
-				hasReadCallLogPermission: (state) => state.call.hasReadCallLogPermission,
-				hasReadPhoneNumbersPermission: (state) => state.call.hasReadPhoneNumbersPermission,
-				isPhoneListening: (state) => state.call.isPhoneListening,
-			}),
+			redisStatus: (state) => state.app.redisStatus,
+			callSystem: (state) => state.app.callSystem,
+			uuid: (state) => state.user.uuid,
+			isCallOff: (state) => state.user.netConfig.isCallOff,
+			// 从call store获取权限状态
+			isAutoRecord: (state) => state.call.isAutoRecord,
+			hasStoragePermission: (state) => state.call.hasStoragePermission,
+			hasReadPhoneStatePermission: (state) => state.call.hasReadPhoneStatePermission,
+			hasCallPhonePermission: (state) => state.call.hasCallPhonePermission,
+			hasReadCallLogPermission: (state) => state.call.hasReadCallLogPermission,
+			hasReadPhoneNumbersPermission: (state) => state.call.hasReadPhoneNumbersPermission,
+			isPhoneListening: (state) => state.call.isPhoneListening,
+		}),
+	},
+	data() {
+		return {
+			isX5: false,
+			isRecord: false,
+			isLocation: false,
+			system: "",
+			deviceBrand: "",
+			systemLocation: false,
+		};
+	},
+	methods: {
+		// 刷新
+		handleReset() {
+			this.getAllStatus();
+			uni.$u.toast("刷新成功");
 		},
-		data() {
-			return {
-				isX5: false,
-				isRecord: false,
-				isLocation: false,
-				system: "",
-				deviceBrand: "",
-				systemLocation: false,
-			};
+		// 打开设置
+		handleOpenSet() {
+			this.$store.dispatch('call/handleOpenSet');
 		},
-		methods: {
-			// 刷新
-			handleReset() {
-				this.getAllStatus();
-				uni.$u.toast("刷新成功");
-			},
-			// 打开设置
-			handleOpenSet() {
-				this.$store.dispatch('call/handleOpenSet');
-			},
-			// 请求文件访问权限
-			requestStoragePermission() {
-				this.$store.dispatch('call/requestStoragePermission');
-			},
-			// 跳转到通话录音设置页面
-			toCallRecorderSettings() {
-				this.$store.dispatch('call/toCallRecorderSettings');
-			},
-			// 跳转到系统通话录音界面
-			toSystemRecorderSettings() {
-				this.$store.dispatch('call/toSystemRecorderSettings');
-			},
-			// 切换电话监听状态
-			togglePhoneListener() {
-				this.$store.dispatch('call/togglePhoneListener')
-					.then(() => {
-						const status = this.isPhoneListening ? '已停止' : '已启动';
-						uni.$u.toast(`电话监听${status}`);
-					})
-					.catch(error => {
-						uni.$u.toast('操作失败，请重试');
-						console.error('切换电话监听状态失败:', error);
-					});
-			},
-			// 注册
-			handleRegisterFun() {
-				this.$store
-					.dispatch("app/getExtensionByUserId", {
-						userId: this.$store.state.user.userInfo.userId,
-					})
-					.then((res) => {
-						Promise.all([
-							permision.requestAndroidPermission(
-								"android.permission.RECORD_AUDIO"
-							),
-							permision.requestAndroidPermission(
-								"android.permission.MODIFY_AUDIO_SETTINGS"
-							),
-						]).then((result) => {
-							const flag = result.every((v) => v == 1);
-							if (flag) {
-								this.$store.dispatch("app/createWv");
-							}
-						});
+		// 请求文件访问权限
+		requestStoragePermission() {
+			this.$store.dispatch('call/requestStoragePermission');
+		},
+		// 跳转到通话录音设置页面
+		toCallRecorderSettings() {
+			this.$store.dispatch('call/toCallRecorderSettings');
+		},
+		// 跳转到系统通话录音界面
+		toSystemRecorderSettings() {
+			this.$store.dispatch('call/toSystemRecorderSettings');
+		},
+		// 切换电话监听状态
+		togglePhoneListener() {
+			this.$store.dispatch('call/togglePhoneListener')
+				.then(() => {
+					const status = this.isPhoneListening ? '已停止' : '已启动';
+					uni.$u.toast(`电话监听${status}`);
+				})
+				.catch(error => {
+					uni.$u.toast('操作失败，请重试');
+					console.error('切换电话监听状态失败:', error);
+				});
+		},
+		// 注册
+		handleRegisterFun() {
+			this.$store
+				.dispatch("app/getExtensionByUserId", {
+					userId: this.$store.state.user.userInfo.userId,
+				})
+				.then((res) => {
+					Promise.all([
+						permision.requestAndroidPermission(
+							"android.permission.RECORD_AUDIO"
+						),
+						permision.requestAndroidPermission(
+							"android.permission.MODIFY_AUDIO_SETTINGS"
+						),
+					]).then((result) => {
+						const flag = result.every((v) => v == 1);
+						if (flag) {
+							this.$store.dispatch("app/createWv");
+						}
 					});
-			},
-			// 检测定位服务是否开启
-			checkSystemEnableLocation() {
-				let context = plus.android.importClass("android.content.Context");
-				let locationManager = plus.android.importClass(
-					"android.location.LocationManager"
-				);
-				let main = plus.android.runtimeMainActivity();
-				let mainSvr = main.getSystemService(context.LOCATION_SERVICE);
-				let result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
-				return result;
-			},
-			getAllStatus() {
-				uni.getSystemInfo({
-					success: (res) => {
-						this.deviceBrand = res.deviceBrand + " " + res.model;
-						this.system = res.system ? res.system : "获取失败";
-						this.isX5 = res.browserName.includes("x5");
-					},
 				});
+		},
+		// 检测定位服务是否开启
+		checkSystemEnableLocation() {
+			let context = plus.android.importClass("android.content.Context");
+			let locationManager = plus.android.importClass(
+				"android.location.LocationManager"
+			);
+			let main = plus.android.runtimeMainActivity();
+			let mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+			let result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
+			return result;
+		},
+		getAllStatus() {
+			uni.getSystemInfo({
+				success: (res) => {
+					this.deviceBrand = res.deviceBrand + " " + res.model;
+					this.system = res.system ? res.system : "获取失败";
+					this.isX5 = res.browserName.includes("x5");
+				},
+			});
 
-				// 检查麦克风权限
-				permision
-					.requestAndroidPermission("android.permission.RECORD_AUDIO")
-					.then((result) => {
-						this.isRecord = result == "1";
-					});
+			// 检查麦克风权限
+			permision
+				.requestAndroidPermission("android.permission.RECORD_AUDIO")
+				.then((result) => {
+					this.isRecord = result == "1";
+				});
 
-				// 检查定位服务状态
-				this.systemLocation = this.checkSystemEnableLocation();
+			// 检查定位服务状态
+			this.systemLocation = this.checkSystemEnableLocation();
 
-				// 检查定位权限
-				permision
-					.requestAndroidPermission("android.permission.ACCESS_FINE_LOCATION")
-					.then((result) => {
-						this.isLocation = result == "1";
-					});
+			// 检查定位权限
+			permision
+				.requestAndroidPermission("android.permission.ACCESS_FINE_LOCATION")
+				.then((result) => {
+					this.isLocation = result == "1";
+				});
 
-				// 从store检查所有其他权限状态
-				this.$store.dispatch('call/checkAllPermissions');
-			},
-		},
-		mounted() {
-			this.getAllStatus();
+			// 从store检查所有其他权限状态
+			this.$store.dispatch('call/checkAllPermissions');
 		},
-	};
+	},
+	mounted() {
+		this.getAllStatus();
+	},
+};
 </script>
 
 <style lang="scss" scoped>
-	.right_btn {
+.right_btn {
+	display: flex;
+	align-items: center;
+	font-size: 14px;
+
+	.copy_btn {
 		display: flex;
 		align-items: center;
-		font-size: 14px;
+		margin-right: 20rpx;
+	}
 
-		.copy_btn {
-			display: flex;
-			align-items: center;
-			margin-right: 20rpx;
-		}
+	.reset {
+		display: flex;
+		align-items: center;
+	}
+}
 
-		.reset {
-			display: flex;
-			align-items: center;
-		}
+.tips_wrap {
+	display: flex;
+	align-items: center;
+	justify-content: space-evenly;
+	height: 40px;
+	background: #ececec;
+	border-radius: 4px;
+	margin-top: 15px;
+	margin-left: 15px;
+	margin-right: 15px;
+	margin-bottom: 50px;
+
+	.right {
+		display: flex;
+		align-items: center;
 	}
 
-	.tips_wrap {
+	.left {
 		display: flex;
 		align-items: center;
-		justify-content: space-evenly;
-		height: 40px;
-		background: #ececec;
-		border-radius: 4px;
-		margin-top: 15px;
-		margin-left: 15px;
-		margin-right: 15px;
-		margin-bottom: 50px;
+	}
 
-		.right {
-			display: flex;
-			align-items: center;
-		}
+	.icon_img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 20rpx;
+	}
+}
 
-		.left {
+.option_list {
+	margin-top: 30rpx;
+	padding: 0 30rpx;
+
+	.option_item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-bottom: 36rpx;
+		padding-top: 36rpx;
+		border-bottom: 2rpx solid #dfdfdf;
+
+		.item_left {
 			display: flex;
 			align-items: center;
-		}
 
-		.icon_img {
-			width: 40rpx;
-			height: 40rpx;
-			margin-right: 20rpx;
-		}
-	}
+			image {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 20rpx;
+			}
 
-	.option_list {
-		margin-top: 30rpx;
-		padding: 0 30rpx;
+			.label {
+				font-size: 28rpx;
+				color: #202020;
+			}
+		}
 
-		.option_item {
+		.item-right {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			padding-bottom: 36rpx;
-			padding-top: 36rpx;
-			border-bottom: 2rpx solid #dfdfdf;
-
-			.item_left {
-				display: flex;
-				align-items: center;
-
-				image {
-					width: 32rpx;
-					height: 32rpx;
-					margin-right: 20rpx;
-				}
 
-				.label {
-					font-size: 28rpx;
-					color: #202020;
-				}
+			text {
+				font-size: 24rpx;
+				color: #999999;
+				margin-right: 10rpx;
 			}
 
-			.item-right {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				text {
-					font-size: 24rpx;
-					color: #999999;
-					margin-right: 10rpx;
-				}
-
-				.btn {
-					color: #108cff;
-				}
+			.btn {
+				color: #108cff;
+			}
 
-				.icon_img {
-					width: 40rpx;
-					height: 40rpx;
-				}
+			.icon_img {
+				width: 40rpx;
+				height: 40rpx;
 			}
 		}
 	}
+}
 </style>

pages/clue/mixins/clue.js

@@ -1,8 +1,8 @@
 import pullUpRefresh from "@/utils/pullUpRefresh";
-import dayjs from  "dayjs";
+import dayjs from "dayjs";
 export default {
 	mixins: [pullUpRefresh],
-	
+
 	computed: {
 		currentIndex() {
 			return this.queryParams.type == 1 ? 0 : 1;
@@ -11,7 +11,7 @@ export default {
 	onPullDownRefresh() {
 		uni.stopPullDownRefresh();
 		// 刷新
-		
+
 	},
 	data() {
 		return {
@@ -25,59 +25,59 @@ export default {
 			clueTagGroupVoList: [],
 
 			dicts: {
-					caseStatusDicts: [],
-					crmFollowStatus: [],
-					crmCallStatus: [],
-					clueEntranceType: [],
-					crmClueBiz: [],
-					crmClueObj: [],
-					crmClueType: []
-				},
+				caseStatusDicts: [],
+				crmFollowStatus: [],
+				crmCallStatus: [],
+				clueEntranceType: [],
+				crmClueBiz: [],
+				crmClueObj: [],
+				crmClueType: []
+			},
 
 			options: [{
-					value: "3",
-					label: "电话/微信"
-				},
-				{
-					value: "1",
-					label: "姓名"
-				},
-				{
-					value: "8",
-					label: "广告主ID"
-				},
-				{
-					value: "7",
-					label: "广告主名称"
-				},
-				{
-					value: "10",
-					label: "广告ID"
-				},
-				{
-					value: "9",
-					label: "广告名称"
-				},
-				{
-					value: "11",
-					label: "标题ID"
-				},
-				{
-					value: "12",
-					label: "视频ID"
-				},
-				{
-					value: "5",
-					label: "qq号"
-				},
-				{
-					value: "6",
-					label: "邮箱"
-				},
-				{
-					value: "2",
-					label: "线索ID"
-				},
+				value: "3",
+				label: "电话/微信"
+			},
+			{
+				value: "1",
+				label: "姓名"
+			},
+			{
+				value: "8",
+				label: "广告主ID"
+			},
+			{
+				value: "7",
+				label: "广告主名称"
+			},
+			{
+				value: "10",
+				label: "广告ID"
+			},
+			{
+				value: "9",
+				label: "广告名称"
+			},
+			{
+				value: "11",
+				label: "标题ID"
+			},
+			{
+				value: "12",
+				label: "视频ID"
+			},
+			{
+				value: "5",
+				label: "qq号"
+			},
+			{
+				value: "6",
+				label: "邮箱"
+			},
+			{
+				value: "2",
+				label: "线索ID"
+			},
 			],
 
 			queryParams: {
@@ -91,7 +91,7 @@ export default {
 				batchCodes: [],
 				clueIds: [],
 				deptName: undefined,
-				deptId: undefined,
+				deptIds: [],
 				type: "1",
 				pageNum: 1,
 				pageSize: 20,
@@ -119,9 +119,9 @@ export default {
 				sortField: undefined,
 				appNames: [],
 				appNameLabel: undefined,
-				isRepetitionOperWeixinName : '',
-				isRepetitionOperationName : '',
-				isVideoIdIsNull : '',
+				isRepetitionOperWeixinName: '',
+				isRepetitionOperationName: '',
+				isVideoIdIsNull: '',
 				advName: "",
 				promotionName: "",
 				advId: "",
@@ -178,32 +178,32 @@ export default {
 			this.resetData();
 		},
 		async getDicts() {
-				this.$getDicts('crm_clue_phase').then(res => {
-					this.dicts.caseStatusDicts = res;
-				});
-				this.$getDicts('crm_follow_status').then(res => {
-					this.dicts.crmFollowStatus = res;
-				})
-				this.$getDicts('crm_call_status').then(res => {
-					this.dicts.crmCallStatus = res;
-				})
-				this.$getDicts('clue_entrance_type').then(res => {
-					this.dicts.clueEntranceType = res;
-				});
-				this.$getDicts('crm_clue_biz').then(res => {
-					this.dicts.crmClueBiz = res;
-				});
-				this.$getDicts('crm_clue_obj').then(res => {
-					this.dicts.crmClueObj = res;
-				});
-				this.$getDicts('crm_clue_type').then(res => {
-					this.dicts.crmClueType = res;
-				});
-				uni.$u.api.getClueTagGroupVoList({ tagGroupApplication : '1' }).then(({
-					data
-				}) => {
-					this.clueTagGroupVoList = data;
-				});
+			this.$getDicts('crm_clue_phase').then(res => {
+				this.dicts.caseStatusDicts = res;
+			});
+			this.$getDicts('crm_follow_status').then(res => {
+				this.dicts.crmFollowStatus = res;
+			})
+			this.$getDicts('crm_call_status').then(res => {
+				this.dicts.crmCallStatus = res;
+			})
+			this.$getDicts('clue_entrance_type').then(res => {
+				this.dicts.clueEntranceType = res;
+			});
+			this.$getDicts('crm_clue_biz').then(res => {
+				this.dicts.crmClueBiz = res;
+			});
+			this.$getDicts('crm_clue_obj').then(res => {
+				this.dicts.crmClueObj = res;
+			});
+			this.$getDicts('crm_clue_type').then(res => {
+				this.dicts.crmClueType = res;
+			});
+			uni.$u.api.getClueTagGroupVoList({ tagGroupApplication: '1' }).then(({
+				data
+			}) => {
+				this.clueTagGroupVoList = data;
+			});
 		},
 		getOtherData() {
 			this.statisticsCaseState();
@@ -254,15 +254,15 @@ export default {
 				pageSize,
 				pageNum
 			}, params);
-			rows.forEach(v=>{
-				if(v.repetitionOperationName){
+			rows.forEach(v => {
+				if (v.repetitionOperationName) {
 					// 按逗号分割成数组
 					const parts = v.repetitionOperationName.split(',');
 					// 对每个部分提取 '-' 前面的内容
 					const result = parts.map(part => part.split('-')[0]).join(',');
 					v.repetitionOperationName = result;
 				}
-				if(v.repetitionOperWeixinName){
+				if (v.repetitionOperWeixinName) {
 					// 按逗号分割成数组
 					const parts = v.repetitionOperWeixinName.split(',');
 					// 对每个部分提取 '-' 前面的内容
@@ -270,7 +270,7 @@ export default {
 					v.repetitionOperWeixinName = result;
 				}
 			})
-			
+
 			return rows;
 		}
 	}

pages/clue/post/index.vue

@@ -50,10 +50,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="sendOrder inquiry" @click.stop="handleInquiry(item)">
+		<!-- <view class="sendOrder inquiry" @click.stop="handleInquiry(item)">
 			<image src='/static/publicClue/inquiry.png' mode="aspectFit" class="sendOrder_img"></image>
 			<view>询价</view>
-		</view>
+		</view> -->
 		<view class="sendOrder" @click.stop="handleSendOrder(item)">
 			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
 			<view>发单</view>
@@ -274,6 +274,7 @@ export default {
 			height: 20px;
 		}
 	}
+
 	.inquiry {
 		right: 140rpx;
 		color: #2563eb;

pages/clue/scss/clue.scss

@@ -1,7 +1,7 @@
-.suspension_button{
+.suspension_button {
 	position: fixed;
 	bottom: 200rpx;
-	right: 100rpx;
+	left: 50rpx;
 	border-radius: 50%;
 	width: 100rpx;
 	line-height: 100rpx;
@@ -10,94 +10,95 @@
 	text-align: center;
 	background-color: #4c8afe;
 }
+
 .clueDetail_tabber {
-		::v-deep .u-tabbar__content {
-			background: #108cff;
-			border-top-right-radius: 10px;
-			border-top-left-radius: 10px;
-		}
+	::v-deep .u-tabbar__content {
+		background: #108cff;
+		border-top-right-radius: 10px;
+		border-top-left-radius: 10px;
 	}
+}
 
-	.clue_state_wrap {
-		width: 690rpx;
-		padding: 0 30rpx;
-		margin-top: 20rpx;
-		display: flex;
+.clue_state_wrap {
+	width: 690rpx;
+	padding: 0 30rpx;
+	margin-top: 20rpx;
+	display: flex;
 
-		.clue_state_list {
-			display: flex;
+	.clue_state_list {
+		display: flex;
 
-			.clue_state_item {
-				font-size: 30rpx;
-				display: inline-flex;
-				/* 关键改动：改为行内弹性盒子 */
-				align-items: center;
-				/* 垂直居中 */
-				background: #fff;
-				margin-right: 30rpx;
-				padding: 8rpx 16rpx;
-				/* 增加内边距 */
-				white-space: nowrap;
-				/* 关键：禁止文本换行 */
-				border-radius: 6rpx;
+		.clue_state_item {
+			font-size: 30rpx;
+			display: inline-flex;
+			/* 关键改动：改为行内弹性盒子 */
+			align-items: center;
+			/* 垂直居中 */
+			background: #fff;
+			margin-right: 30rpx;
+			padding: 8rpx 16rpx;
+			/* 增加内边距 */
+			white-space: nowrap;
+			/* 关键：禁止文本换行 */
+			border-radius: 6rpx;
 
-				&.active {
-					color: #fff;
-					background: #4c8afe;
-				}
+			&.active {
+				color: #fff;
+				background: #4c8afe;
 			}
 		}
 	}
+}
 
-	.clueTagsSelect {
-		height: 0;
-		overflow: hidden;
-	}
+.clueTagsSelect {
+	height: 0;
+	overflow: hidden;
+}
 
-	.queryParams_wrap {
-		display: flex;
-		background: #fff;
-		padding: 14px 0;
+.queryParams_wrap {
+	display: flex;
+	background: #fff;
+	padding: 14px 0;
 
-		.query,
-		.sort {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex: 1;
-			font-size: 16px;
-			font-weight: 700;
-			color: #202020;
-		}
+	.query,
+	.sort {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		font-size: 16px;
+		font-weight: 700;
+		color: #202020;
 	}
+}
 
-	#navbar_center_wrap {
-		width: 320rpx;
-		margin: auto;
-		padding: 15px;
-		background-color: #fff;
-	}
+#navbar_center_wrap {
+	width: 320rpx;
+	margin: auto;
+	padding: 15px;
+	background-color: #fff;
+}
 
-	.post_wrap {
-		margin: 10px 0;
-	}
+.post_wrap {
+	margin: 10px 0;
+}
 
-	.case_top_wrap {
-		background-color: #fff;
-		padding: 0px 30rpx 15rpx 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
+.case_top_wrap {
+	background-color: #fff;
+	padding: 0px 30rpx 15rpx 30rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
 
-		.conditionSelect {
-			width: 200rpx;
-		}
+	.conditionSelect {
+		width: 200rpx;
 	}
+}
 
-	.case_wrap {
-		padding-bottom: 30px;
+.case_wrap {
+	padding-bottom: 30px;
 
-		.case_main_wrap {
-			padding: 15px;
-		}
-	}
+	.case_main_wrap {
+		padding: 15px;
+	}
+}

pages/clueDetail/page/clueDetail.vue

@@ -119,14 +119,14 @@
 			:safeAreaInsetBottom="true">
 			<u-tabbar-item text="拨打电话" icon="../../static/clueDetail/icon-phone.png"
 				@click="handleCallPhone"></u-tabbar-item>
-			<!-- 			<u-tabbar-item text="转移线索" icon="../../static/clueDetail/icon-clue.png"
-				@click="handleDistribution"></u-tabbar-item> -->
-			<u-tabbar-item text="发单" icon="../../static/clueDetail/icon-order.png"
+				<u-tabbar-item text="发单" icon="../../static/clueDetail/icon-order.png"
 				@click="handleClueSend"></u-tabbar-item>
-			<u-tabbar-item text="写新跟进" icon="../../static/caseDetail/icon-follow.png"
+				<u-tabbar-item text="写新跟进" icon="../../static/caseDetail/icon-follow.png"
 				@click="handleAddFollow"></u-tabbar-item>
-			<u-tabbar-item text="上传录音" icon="../../static/caseDetail/icon-record.png"
+				<u-tabbar-item text="上传录音" icon="../../static/caseDetail/icon-record.png"
 				@click="handleUploadRecord"></u-tabbar-item>
+				<u-tabbar-item text="分配" icon="../../static/clueDetail/icon-clue.png"
+				@click="handleDistribution"></u-tabbar-item>
 		</u-tabbar>
 
 		<distribution-modal :clueDetail="clueDetail" ref="distribution"

pages/orderDetailNew/components/pageFour.vue

@@ -33,28 +33,74 @@
                 </u-row>
 
                 <!-- 单独一行的收单物品 -->
-                <u-row class="info-row">
-                    <u-col span="12">
+                <u-row class="info-row" justify="space-between">
+                    <u-col span="5.8">
                         <u-form-item label="收单物品" prop="item">
                             <u--input v-model="warehouseInfo.item" placeholder="请输入收单物品" class="info-input" />
                         </u-form-item>
                     </u-col>
+                    <!-- 收单类型 -->
+                    <u-col span="5.8">
+                        <u-form-item label="收单类型" prop="customerServiceNameLabel" @tap="selectCustomerServiceName">
+                            <view class="click-wrapper">
+                                <u--input v-model="warehouseInfo.customerServiceNameLabel" placeholder="点击选择收单类型"
+                                    class="info-input" disabled />
+                            </view>
+                        </u-form-item>
+                        <!-- 收单类型选择 -->
+                        <u-picker :show="showCustomerServicePicker" :columns="customerServiceColumns" confirm
+                            keyName="label" @confirm="handleConfirmCustomerService"
+                            @cancel="showCustomerServicePicker = false"></u-picker>
+                    </u-col>
                 </u-row>
 
-                <!-- 查码费和表款同一行 -->
                 <u-row class="info-row" justify="space-between">
+                    <!-- 收单类别 -->
                     <u-col span="5.8">
-                        <u-form-item label="查码费">
-                            <u--input v-model="warehouseInfo.checkCodeFee" placeholder="请输入查码费" class="info-input"
-                                type="number" />
+                        <u-form-item label="类别" prop="category" @tap="selectCategory">
+                            <view class="click-wrapper">
+                                <u--input v-model="warehouseInfo.categoryLabel" placeholder="点击选择类别" class="info-input"
+                                    disabled />
+                            </view>
                         </u-form-item>
+                        <!-- 收单类型选择 -->
+                        <u-picker :show="showCategoryPicker" :columns="categoryColumns" confirm keyName="label"
+                            @confirm="handleConfirmCategory" @cancel="showCategoryPicker = false"></u-picker>
                     </u-col>
+
+
+                    <!-- 是否需要查码 -->
+                    <u-col span="5.8">
+                        <u-form-item label="是否需要查码" prop="needCheckCode" @tap="selectNeedCheckCode">
+                            <view class="click-wrapper">
+                                <u--input v-model="warehouseInfo.needCheckCodeLabel" placeholder="点击选择是否需要查码"
+                                    class="info-input" disabled />
+                            </view>
+                        </u-form-item>
+                        <!-- 是否需要查码选择 -->
+                        <u-picker :show="showNeedCheckCodePicker" :columns="needCheckCodeColumns" confirm
+                            keyName="label" @confirm="handleConfirmNeedCheckCode"
+                            @cancel="showNeedCheckCodePicker = false"></u-picker>
+                    </u-col>
+
+                </u-row>
+
+
+
+                <!-- 查码费和表款同一行 -->
+                <u-row class="info-row" justify="space-between">
                     <u-col span="5.8">
                         <u-form-item label="表款">
                             <u--input v-model="warehouseInfo.watchPrice" placeholder="请输入表款" class="info-input"
                                 type="number" />
                         </u-form-item>
                     </u-col>
+                    <u-col span="5.8">
+                        <u-form-item label="查码费">
+                            <u--input v-model="warehouseInfo.checkCodeFee" placeholder="请输入查码费" class="info-input"
+                                type="number" :disabled="warehouseInfo.needCheckCode == '2'" />
+                        </u-form-item>
+                    </u-col>
                 </u-row>
 
                 <u-row class="info-row" justify="space-between">
@@ -81,12 +127,33 @@
                         </u-form-item>
                     </u-col>
                     <u-col span="5.8">
-                        <u-form-item label="毛业绩">
-                            <u--input v-model="warehouseInfo.grossPerformance" placeholder="请输入毛业绩" class="info-input"
+                        <u-form-item label="分单比例（0~100）">
+                            <u--input v-model="warehouseInfo.splitRatio" placeholder="请输入分单比例(0~100)" class="info-input"
                                 type="number" />
                         </u-form-item>
                     </u-col>
                 </u-row>
+                <!-- 业绩 -->
+                <u-row class="info-row" justify="space-between">
+                    <u-col span="3.8">
+                        <u-form-item label="成本合计">
+                            <u--input :disabled="true" :value="computedTotalCost" placeholder="成本合计自动计算"
+                                class="info-input" type="number" />
+                        </u-form-item>
+                    </u-col>
+                    <u-col span="3.8">
+                        <u-form-item label="业绩">
+                            <u--input :disabled="true" :value="computedPerformance" placeholder="业绩自动计算"
+                                class="info-input" type="number" />
+                        </u-form-item>
+                    </u-col>
+                    <u-col span="3.8">
+                        <u-form-item label="毛业绩">
+                            <u--input :disabled="true" :value="computedGrossPerformance" placeholder="毛业绩自动计算"
+                                class="info-input" type="number" />
+                        </u-form-item>
+                    </u-col>
+                </u-row>
 
                 <!-- 收单备注 -->
                 <u-row class="info-row">
@@ -198,7 +265,7 @@
 
         <!-- 确认入库按钮 -->
         <div class="confirm-button-container">
-            <u-button type="success" @click="confirmWarehouseEntry" style="border-radius: 11px;">
+            <u-button class='next-btn' type="success" @click="confirmWarehouseEntry" style="border-radius: 11px;">
                 <u-icon name="checkmark-circle-fill" size="28rpx" color="#fff"></u-icon>
                 <text style="margin-left: 8rpx;">确认入库</text>
             </u-button>
@@ -206,7 +273,7 @@
 
         <!-- 组织选择 -->
         <u-picker :show="showOrgPicker" title="请选择组织" :columns="columnsOrgList" keyName="label"
-            @confirm="handleOrgConfirmOrg" @cancel='showOrgPicker = false'></u-picker>
+            @confirm="handleOrgConfirmOrg" @cancel=' showOrgPicker = false'></u-picker>
 
 
         <!-- 人员选择 -->
@@ -215,6 +282,9 @@
 
         <u-toast ref="uToast"></u-toast>
 
+
+
+
     </view>
 </template>
 
@@ -288,13 +358,49 @@ export default {
                         freight: data.freight || '',//运费
                         repairAmount: data.repairAmount || '',//维修金额
                         grossPerformance: data.grossPerformance || '',//毛业绩
+                        performance: data.performance || '',//业绩
                         remarks: data.receiptRemark?.split(';')[0] || '',//收单备注  截取备注第一部分
+                        splitRatio: data.splitRatio || '',//分单比例
+                        customerServiceName: data.customerServiceName || '',//收单类型，1收单类，2维修类，3销售类
+                        customerServiceNameLabel: this.customerServiceColumns[0].filter(item => item.value == data.customerServiceName)[0].label || '',//收单类型，1收单类，2维修类，3销售类
+                        category: data.category || '',//类别
+                        categoryLabel: this.categoryColumns[0].filter(item => item.value == data.category)[0].label || '',//类别
+                        needCheckCode: data.needCheckCode || '',//是否需要查码
+                        needCheckCodeLabel: this.needCheckCodeColumns[0].filter(item => item.value == data.needCheckCode)[0].label || '',//是否需要查码
                     }
                     this.getShareList()
                 }
             },
         }
     },
+    computed: {
+
+        computedTotalCost() {
+            //成本  合计 = 运费 + 好处费+ 查码费 + 表款(支付总额)+ 维修费。
+            const freight = this.warehouseInfo.freight || 0
+            const benefitFee = this.warehouseInfo.benefitFee || 0
+            const checkCodeFee = this.warehouseInfo.checkCodeFee || 0
+            const watchPrice = this.warehouseInfo.watchPrice || 0
+            const repairAmount = this.warehouseInfo.repairAmount || 0
+            return Number(freight) + Number(benefitFee) + Number(checkCodeFee) + Number(watchPrice) + Number(repairAmount)
+        },
+        computedPerformance() {
+            //业绩   //sellingPrice - (totalCost// 成本合计 =   运费1 + 好处费1 + 查码费1 + 表款(支付总额)1+ 维修费1。)
+            const sellingPrice = this.currentReceipt.sellingPrice || 0
+            const totalCost = Number(this.warehouseInfo.watchPrice) + Number(this.warehouseInfo.freight) + Number(this.warehouseInfo.benefitFee) + Number(this.warehouseInfo.checkCodeFee) + Number(this.warehouseInfo.repairAmount)
+
+            return sellingPrice - totalCost
+        },
+
+        computedGrossPerformance() {
+            // 毛业绩  //毛利 performance*splitRatio，分单比例
+            const performance = Number(this.computedPerformance) || 0
+            //保留小数点后两位
+            const p = performance * (Number(this.warehouseInfo.splitRatio) / 100 || 0)
+            return p.toFixed(2)
+        },
+
+    },
     data() {
         return {
             // 入库信息相关的数据
@@ -309,7 +415,12 @@ export default {
                 freight: '',//运费
                 repairAmount: '',//维修金额
                 grossPerformance: '',//毛业绩
+                performance: '',//业绩
+                splitRatio: '',//分单比例
                 remarks: '',//收单备注
+                customerServiceNameLabel: '',//收单类型，1收单类，2维修类，3销售类
+                customerServiceName: '',//收单类型，1收单类，2维修类，3销售类
+
             },
             // 分成信息相关的数据
             profitSharingList: [
@@ -326,6 +437,25 @@ export default {
             columnsOrgList: [],
             //传入的分成人名单
             columnsPersonList: [],
+            showCustomerServicePicker: false,//显示选择收单类型的弹窗
+            customerServiceColumns: [[
+                { label: '收单类', value: '1' },
+                { label: '维修类', value: '2' },
+                { label: '销售类', value: '3' }
+            ]],
+            showCategoryPicker: false,//显示选择类别弹窗
+            categoryColumns: [[
+                { label: '腕表', value: '1' },
+                { label: '包包', value: '2' },
+                { label: '首饰', value: '4' },
+                { label: '其他', value: '3' }
+            ]],
+            showNeedCheckCodePicker: false,//显示选择是否需要查码弹窗
+            needCheckCodeColumns: [[
+                { label: '是', value: '1' },
+                { label: '否', value: '2' }
+            ]],
+            currentEditItem: '',
 
         };
     },
@@ -446,15 +576,24 @@ export default {
                             benefitFee: this.warehouseInfo.benefitFee || '',//好处费
                             freight: this.warehouseInfo.freight || '',//运费
                             repairAmount: this.warehouseInfo.repairAmount || '',//维修金额
-                            grossPerformance: this.warehouseInfo.grossPerformance || '',//毛业绩
+                            grossPerformance: this.computedGrossPerformance || '',//毛业绩
+                            performance: this.computedPerformance || '',//毛业绩
+                            splitRatio: this.warehouseInfo.splitRatio || '',//分单比例
                             receiptRemark: this.warehouseInfo.remarks + ';' + this.warehouseInfo.uploadedImage || '',//收单备注
+                            customerServiceName: this.warehouseInfo.customerServiceName || '',//收单类型，1收单类，2维修类，3销售类
+                            category: this.warehouseInfo.category || '',//类别
+                            needCheckCode: this.warehouseInfo.needCheckCode || '',//是否需要查码
+                            totalCost: this.computedTotalCost || '',//成本合计
                         });
 
+                        //废弃
                         //上传物流表单数据
                         // this.$emit('confirmInterStore', {
                         //     warehouseInfo: this.warehouseInfo,
                         // })
                         //保存入库信息
+                        //废弃
+
 
 
                         //上传分成数据
@@ -465,8 +604,14 @@ export default {
                             message: "入库成功",
                             iconUrl: "https://uviewui.com/demo/toast/success.png",
                             complete() {
-                                uni.navigateTo({
-                                    url: '/pages/pagereceivecenter/pagereceivecenter',
+                                // uni.navigateTo({
+                                //     url: '/pages/pagereceivecenter/pagereceivecenter',
+                                // })
+
+                                //退回上一页
+                                uni.navigateBack({
+                                    delta: 1,
+                                    animationType: 'pop-out'
                                 })
                             },
                         });
@@ -570,6 +715,7 @@ export default {
         handleSelectOrg(item) {
             console.log(item.uuid, '当前选择的行的uuid')
             this.currentEditItem = item.uuid
+            console.log(this.currentEditItem, '当前选择的行')
             // this.showOrgPicker = true
             this.showPersonPicker = true
             //把当前的组织赋值给当前的组件
@@ -661,8 +807,56 @@ export default {
         handleCancelPerson() {
             this.columnsPersonList = []
             this.showPersonPicker = false
-        }
+        },
+        //点击选择收单类型
+        selectCustomerServiceName() {
+            console.log('点击了选择收单类型')
 
+            //打开选择收单类型的弹窗
+            this.showCustomerServicePicker = true
+        },
+        handleConfirmCustomerService({ value }) {
+            //选择了收单类型
+            console.log(value[0].label, '选择的收单类型')
+            console.log(value[0].value, '选择的收单类型')
+            //把值赋值给当前行
+            this.warehouseInfo.customerServiceNameLabel = value[0].label
+            this.warehouseInfo.customerServiceName = value[0].value
+            //关闭弹窗
+            this.showCustomerServicePicker = false
+        },
+        //点击选择类别
+        selectCategory() {
+            console.log('点击了选择类别')
+            //打开选择类别弹窗
+            this.showCategoryPicker = true
+        },
+        handleConfirmCategory({ value }) {
+            //选择了类别
+            console.log(value[0].label, '选择的类别')
+            console.log(value[0].value, '选择的类别')
+            //把值赋值给当前行
+            this.warehouseInfo.categoryLabel = value[0].label
+            this.warehouseInfo.category = value[0].value
+            //关闭弹窗
+            this.showCategoryPicker = false
+        },
+        //点击选择是否需要查码
+        selectNeedCheckCode() {
+            console.log('点击了选择是否需要查码')
+            //打开选择是否需要查码弹窗
+            this.showNeedCheckCodePicker = true
+        },
+        handleConfirmNeedCheckCode({ value }) {
+            //选择了是否需要查码
+            console.log(value[0].label, '选择的是否需要查码')
+            console.log(value[0].value, '选择的是否需要查码')
+            //把值赋值给当前行
+            this.warehouseInfo.needCheckCodeLabel = value[0].label
+            this.warehouseInfo.needCheckCode = value[0].value
+            //关闭弹窗
+            this.showNeedCheckCodePicker = false
+        },
     }
 };
 </script>
@@ -736,9 +930,12 @@ export default {
     white-space: nowrap;
 }
 
-
+::v-deep .u-form-item__body {
+    padding: 0;
+}
 
 // 图片上传样式
+
 .image-uploader {
     width: 100%;
     height: 65rpx;
@@ -1055,4 +1252,18 @@ export default {
 .delectBtn ::v-deep .u-button--mini {
     min-width: 20rpx !important;
 }
+
+
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
+}
 </style>

pages/orderDetailNew/components/pageOne.vue

@@ -16,7 +16,7 @@
             <view class="image-upload-container">
                 <view class="image-list">
                     <view class="image-item" v-for="(item, index) in trueUploadList" :key="'truePic-' + index">
-                        <pic-comp :src="item.fileUrl"></pic-comp>
+                        <pic-comp @needPreviewPic='previewImageTrue' :src="item.fileUrl"></pic-comp>
                         <view class="delete-btn" @click="deleteImage(item)">×</view>
                     </view>
                     <view class="upload-btn" @click="uploadImage('truePic', currentReceipt.id)">
@@ -28,12 +28,17 @@
 
         <!-- 聊天记录卡片 -->
         <view class="card_wrap">
-            <view class="card-title">聊天记录</view>
-            <view class="image-upload-container">
+            <view class="card-title">
+                <text @click="chatRecordOrCallRecord = 'chatRecords'">聊天记录</text>
+                <text style="margin: 0 10rpx;">|</text>
+                <text @click="chatRecordOrCallRecord = 'callRecords'">通话记录</text>
+            </view>
+            <!-- 聊天记录卡片 -->
+            <view class="image-upload-container" v-if="chatRecordOrCallRecord === 'chatRecords'">
                 <view class="image-list">
                     <view class="image-item" v-for="(item, index) in chatRecordsUploadList"
                         :key="'chatRecords-' + index">
-                        <pic-comp :src="item.fileUrl"></pic-comp>
+                        <pic-comp @needPreviewPic='previewImageChat' :src="item.fileUrl"></pic-comp>
                         <view class="delete-btn" @click="deleteImage(item)">×</view>
                     </view>
                     <view class="upload-btn" @click="uploadImage('chatRecords', currentReceipt.id)">
@@ -41,6 +46,15 @@
                     </view>
                 </view>
             </view>
+            <!-- 通话录音卡片 -->
+            <view class="image-upload-container" v-if="chatRecordOrCallRecord === 'callRecords'">
+                <view>
+
+                    <sound-recorder v-for="item in soundRecordList" :key="item.fileName" :data="item"></sound-recorder>
+
+                </view>
+
+            </view>
         </view>
 
         <!-- 基本信息卡片 -->
@@ -84,13 +98,20 @@
             </view>
         </view>
 
-        <u-button @click="handleNextClick" type="primary" size="middle" style="border-radius: 20rpx;">下一步</u-button>
+        <view class="space-block">
+
+        </view>
+
+        <u-button class='next-btn' @click="handleNextClick" type="primary" size="middle"
+            style="border-radius: 20rpx;">下一步</u-button>
 
     </view>
 </template>
 <script>
 import picComp from './picComp.vue'
 import imgUploadAndDownLoad from '../mixin/imgUploadAndDownLoad.js'
+import soundRecorder from '@/components/soundRecorder/soundRecorder.vue'
+
 export default {
     mixins: [imgUploadAndDownLoad],
     props: {
@@ -108,7 +129,7 @@ export default {
         },
     },
     components: {
-        picComp
+        picComp, soundRecorder
     },
     data() {
         return {
@@ -117,6 +138,8 @@ export default {
             chatRecordsUploadList: [],
             // 待绑定的图片列表
             bindList: [],
+            chatRecordOrCallRecord: 'chatRecords',
+            soundRecordList: [],//录音记录
         }
     },
     watch: {
@@ -136,32 +159,41 @@ export default {
                     setTimeout(() => {
                         this.getList('2', '1', newVal.id, this.orderDetail.itemBrand);
                         this.getList('2', '2', newVal.id, this.orderDetail.itemBrand);
+                        this.getCallRecords();
                     }, 100)
 
                 }
             }
         },
     },
+
     methods: {
 
         // 电话卡片点击事件
         handlePhoneClick() {
             console.log('电话卡片被点击', '电话号码:', this.orderDetail.phone)
             if (this.orderDetail.phone) {
-                //拨打电话，需要设置权限
-                // uni.makePhoneCall({
-                //     phoneNumber: this.orderDetail.phone
-                // });
-                //先暂时复制电话号码
-                uni.setClipboardData({
-                    data: this.orderDetail.phone,
+                uni.makePhoneCall({
+                    phoneNumber: this.orderDetail.phone,
                     success: () => {
-                        uni.showToast({
-                            title: '电话号码已复制',
-                            icon: 'none'
-                        })
-                    }
-                })
+                        this.$store.commit("call/SET_FORM", {
+                            clueId: this.orderDetail.clueId,
+                            type: "3",
+                            callee: this.orderDetail.phone,
+                        });
+                        console.log('this.currentReceipt333', this.$store.state.call.form.callee)
+                    },
+                });
+                //先暂时复制电话号码
+                // uni.setClipboardData({
+                //     data: this.orderDetail.phone,
+                //     success: () => {
+                //         uni.showToast({
+                //             title: '电话号码已复制',
+                //             icon: 'none'
+                //         })
+                //     }
+                // })
             } else {
                 uni.showToast({
                     title: '该订单暂时没有电话号码',
@@ -364,6 +396,31 @@ export default {
                 }
             })
         },
+        // 预览真实图片
+        previewImageTrue(src) {
+            const urlList = this.trueUploadList.map(item => item.fileUrl);
+
+            uni.previewImage({
+                urls: urlList,
+                current: src
+            })
+        },
+        previewImageChat(src) {
+            const urlList = this.chatRecordsUploadList.map(item => item.fileUrl);
+
+            uni.previewImage({
+                urls: urlList,
+                current: src
+            })
+        },
+        //获取通话记录
+        async getCallRecords() {
+            console.log('这里是参数', this.currentReceipt.clueId);
+            const { data } = await uni.$u.api.getCallClueFileByClueId({ clueId: this.currentReceipt.clueId });
+            // const { data } = await uni.$u.api.getCallClueFileByClueId({ clueId: '1998278069905854466' });
+            console.log('通话记录:', data);
+            this.soundRecordList = data;
+        },
 
     },
 
@@ -476,7 +533,7 @@ export default {
 .connect-card {
     flex: 1;
     @include card;
-    padding: 30rpx;
+    padding: 10rpx;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -508,4 +565,22 @@ export default {
     border-radius: 50%;
     box-shadow: 0 0 4rpx rgba(255, 77, 79, 0.3);
 }
+
+
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
+}
+
+.space-block {
+    height: 80rpx;
+}
 </style>

pages/orderDetailNew/components/pageThree.vue

@@ -11,7 +11,9 @@
                 </u-col>
                 <u-col span="5.8">
                     <view class="info-label">银行名称</view>
-                    <u-input v-model="paymentInfo.bankName" placeholder="请输入银行名称" class="info-input" />
+                    <u-input v-model="paymentInfo.bankName" placeholder="请输入银行名称" class="info-input"
+                        @blur="handleBankNameInput" />
+
                 </u-col>
             </u-row>
             <!-- 银行账号单独一行 -->
@@ -28,6 +30,26 @@
                     <u-input v-model="paymentInfo.idNumber" placeholder="请输入身份证号" class="info-input" />
                 </u-col>
             </u-row>
+            <!-- 支付方式 -->
+            <u-row class="info-row">
+                <u-col span="12">
+                    <view class="info-label">支付方式选择</view>
+                    <u-radio-group iconPlacement="left" v-model="paymentMethodRadio" placement="row"
+                        @change='handlePaymentMethodRadioChange'>
+                        <u-radio shape="circle" label="小葫芦线上支付" name="online"></u-radio>
+                        <u-radio shape="circle" label="线下支付" name="offline"></u-radio>
+                    </u-radio-group>
+                </u-col>
+            </u-row>
+
+            <u-row class="info-row">
+                <u-col span="12">
+                    <view class="info-label">支付方式</view>
+                    <u-input :disabled="paymentMethodRadio == 'online'" v-model="paymentMethod" placeholder="请输入支付方式"
+                        class="info-input" />
+                </u-col>
+            </u-row>
+
         </view>
 
         <view class="card_wrap">
@@ -50,7 +72,7 @@
                                 'can-drop': canDropIndex === index
                             }" @touchstart.stop="onTouchStart($event, index)" @touchmove.stop="onTouchMove($event)"
                             @touchend.stop="onTouchEnd" @touchcancel.stop="onTouchEnd">
-                            <pic-comp :src="item.fileUrl"></pic-comp>
+                            <pic-comp @needPreviewPic='previewImageDetail' :src="item.fileUrl"></pic-comp>
                             <view class="image-type-tag">{{ getImageType(index) }}</view>
                             <view class="detail-delete-btn" @click.stop="handleYinCang(item, index)">×</view>
                         </view>
@@ -69,8 +91,7 @@
             <view class="payment-section">
                 <view class="payment-total-container">
                     <text class="payment-label">支付总额</text>
-                    <u-input v-model="paymentAmount" placeholder="0.00" class="payment-amount" type="number" decimal="2"
-                        prefix="￥" />
+                    <u-input v-model="paymentAmount" class="payment-amount" type="number" decimal="2" prefix="￥" />
                 </view>
 
                 <view class="payment-buttons-row">
@@ -89,20 +110,23 @@
                 </view>
             </view>
         </view>
-        <u-button @click="handleNextClick" type="primary" size="middle" style="border-radius: 20rpx;">下一步</u-button>
+        <u-button class='next-btn' @click="handleNextClick" type="primary" size="middle"
+            style="border-radius: 20rpx;">下一步</u-button>
 
-        <u-modal :show="unpaidModelShow" :title="'未收评级'" :showConfirmButton="false">
+        <u-modal showCancelButton showConfirmButton @confirm="confirmUnpaid" @cancel="unpaidModelShow = false"
+            :show="unpaidModelShow" :title="'未收评级'">
             <view class="modal-content">
                 <u-rate v-model="unpaidRating" :count="5" :size="50" active-color="#ff9500"></u-rate>
-                <u-button type="primary" size="large" @click="confirmUnpaid" style="margin-top: 40rpx;">确认未收</u-button>
+                <!-- <u-button type="primary" size="large" @click="confirmUnpaid" style="margin-top: 40rpx;">确认未收</u-button> -->
             </view>
         </u-modal>
 
-        <u-modal :show="followUpModelShow" :title="'填写跟进细节'" :showConfirmButton="false">
+        <u-modal showCancelButton showConfirmButton @confirm="confirmFollowUp" @cancel="followUpModelShow = false"
+            :show="followUpModelShow" :title="'填写跟进细节'">
             <view class="modal-content">
                 <u--textarea v-model="followUpNotes" placeholder="请输入情况" confirm-type="done"
                     style="width: 100%; margin-bottom: 30rpx;"></u--textarea>
-                <u-button type="primary" size="large" @click="confirmFollowUp">确认</u-button>
+                <!-- <u-button type="primary" size="large" @click="confirmFollowUp">确认</u-button> -->
             </view>
         </u-modal>
 
@@ -115,7 +139,7 @@
                 <view class="payment-info-section">
                     <view class="info-item">
                         <text class="info-label">收款姓名：</text>
-                        <text class="info-value">{{ paymentInfo.accountHolder || '未填写' }}</text>
+                        <text class="info-value">{{ paymentInfo.customName || '未填写' }}</text>
                     </view>
                     <view class="info-item">
                         <text class="info-label">开户银行：</text>
@@ -125,6 +149,10 @@
                         <text class="info-label">银行卡号：</text>
                         <text class="info-value">{{ paymentInfo.bankAccount || '未填写' }}</text>
                     </view>
+                    <view class="info-item">
+                        <text class="info-label">支付方式：</text>
+                        <text class="info-value">{{ paymentMethod || '未填写' }}</text>
+                    </view>
                 </view>
 
                 <!-- 确认转账按钮 -->
@@ -162,11 +190,14 @@ export default {
         orderDetail: {
             handler(newVal) {
                 if (newVal) {
+                    // console.log('这里是page3的orderDetail', newVal)
                     this.paymentInfo.customName = newVal.customName || ''
                     this.paymentInfo.bankName = newVal.bankName || ''
                     this.paymentInfo.bankAccount = newVal.bankCardNumber || ''
                     this.paymentInfo.idNumber = newVal.idCard || ''
                     // this.paymentAmount = newVal.tableFee || '0.00'
+                    //支付方式初始化
+                    this.initPaymentMethod(newVal.paymentMethod)
                 }
             },
             deep: true,
@@ -174,7 +205,7 @@ export default {
         currentReceipt: {
             handler(newVal) {
                 if (newVal) {
-                    console.log('这里是page3的', newVal.tableFee)
+                    // console.log('这里是page3的currentReceipt', newVal)
                     this.paymentAmount = newVal.tableFee || '0.00'
                     setTimeout(() => {
                         this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
@@ -220,12 +251,22 @@ export default {
 
             detailImages: [],// 高清细节图数组
             // 绑定订单相关
-            bindList: [] // 待绑定的图片列表
+            bindList: [], // 待绑定的图片列表
+
+            paymentMethodRadio: 'offline', // 支付方式
+            paymentMethod: '',//支付方式输入框
         };
     },
 
     methods: {
 
+        // 银行名称输入处理 - 只允许中文和英文
+        handleBankNameInput(value) {
+            const strValue = String(value || '');
+            const reg = /[0-9]/g;
+            // 用replace + 全局正则替代replaceAll
+            this.paymentInfo.bankName = strValue.replace(reg, '');
+        },
 
 
 
@@ -355,6 +396,8 @@ export default {
 
         // 立即支付按钮点击事件
         async handlePayNowClick() {
+
+
             //保存
             await uni.$u.api.updateReceiptForm({
                 id: this.currentReceipt.id,
@@ -369,8 +412,19 @@ export default {
                 bankName: this.paymentInfo.bankName || '',
                 bankCardNumber: this.paymentInfo.bankAccount || '',
                 idCard: this.paymentInfo.idNumber || '',
+                paymentMethod: this.paymentMethod || '',
             });
 
+            // 判断是否填写了支付信息
+            if (!this.paymentInfo.customName || !this.paymentInfo.bankName || !this.paymentInfo.bankAccount || !this.paymentInfo.idNumber || !this.paymentMethod) {
+                uni.$u.toast('请填写完整的支付信息');
+                return;
+            }
+            if (this.paymentAmount <= 0) {
+                uni.$u.toast('请填写正确的支付总额');
+                return;
+            }
+
             console.log('点击了立即支付按钮');
             this.payNowModelShow = true;
 
@@ -412,12 +466,13 @@ export default {
             });
 
             console.log('page3点击了下一步按钮', this.detailImages);
-            // this.$emit('handleNextClick', {
-            //     nowPage: 'formThree',
-            //     form: {
-            //         ...this.paymentInfo
-            //     }
-            // });
+
+            this.$emit('handleNextClick', {
+                nowPage: 'formThree',
+                form: {
+                    ...this.paymentInfo
+                }
+            });
         },
 
         // 确认未收按钮点击事件
@@ -462,6 +517,34 @@ export default {
                 this.detailImages.splice(itemIndex, 1);
                 uni.$u.toast('图片已隐藏');
             }
+        },
+        previewImageDetail(src) {
+            const urlList = this.detailImages.map(item => item.fileUrl);
+
+            uni.previewImage({
+                urls: urlList,
+                current: src
+            })
+        },
+        //页面开始初始化支付方式
+        initPaymentMethod(newvalue) {
+            console.log('这里是初始化的支付方式', newvalue)
+            if (newvalue == '小葫芦线上支付') {
+                this.paymentMethod = '小葫芦线上支付'
+                this.paymentMethodRadio = 'online'
+            } else {
+                this.paymentMethod = newvalue
+                this.paymentMethodRadio = 'offline'
+            }
+        },
+        //支付方式选择改变触发回调
+        handlePaymentMethodRadioChange(value) {
+            console.log('支付方式选择改变：', value)
+            if (value == 'online') {
+                this.paymentMethod = '小葫芦线上支付'
+            } else {
+                this.paymentMethod = ''
+            }
         }
     }
 }
@@ -683,7 +766,7 @@ export default {
     background-color: #f5f7fa;
     border: 2rpx solid #e5e7eb;
     border-radius: 12rpx;
-    padding: 24rpx 30rpx;
+    padding: 0rpx 30rpx;
     box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
     display: flex;
     align-items: center;
@@ -730,7 +813,7 @@ export default {
 .payment-button {
     flex: 1;
     border-radius: 12rpx;
-    padding: 24rpx 0;
+    padding: 5rpx 0;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -828,6 +911,18 @@ export default {
 .info-value {
     font-size: 28rpx;
     color: #333;
+}
 
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
 }
 </style>

pages/orderDetailNew/components/pageTwo.vue

@@ -111,7 +111,7 @@
                 <div class="detail-image-upload-container">
                     <view class="detail-image-list">
                         <view class="detail-image-item" v-for="(item, index) in detailImages" :key="'detail-' + index">
-                            <pic-comp :src="item.fileUrl"></pic-comp>
+                            <pic-comp @needPreviewPic='previewImageDetail' :src="item.fileUrl"></pic-comp>
                             <view class="detail-delete-btn" @click="deleteImage(item)">×</view>
                         </view>
                         <view class="detail-upload-btn" @click="uploadImage('detailImages', currentReceipt.id)">
@@ -122,7 +122,8 @@
             </view>
         </view>
 
-        <u-button @click="handleNextClick" type="primary" size="middle" style="border-radius: 20rpx;">下一步</u-button>
+        <u-button class='next-btn' @click="handleNextClick" type="primary" size="middle"
+            style="border-radius: 20rpx;">下一步</u-button>
     </view>
 </template>
 
@@ -276,7 +277,7 @@ export default {
                         console.error(`保存图片失败: ${url}`, error);
                         failedImages.push(url);
                     }
-                    
+
                     // 更新进度
                     uni.showLoading({
                         title: `正在保存图片... (${i + 1}/${imageUrls.length})`,
@@ -517,6 +518,15 @@ export default {
             })
         },
 
+        previewImageDetail(src) {
+            const urlList = this.detailImages.map(item => item.fileUrl);
+
+            uni.previewImage({
+                urls: urlList,
+                current: src
+            })
+        }
+
 
 
 
@@ -914,7 +924,7 @@ u-checkbox {
     display: flex;
     justify-content: center;
     gap: 16rpx;
-    margin: 16rpx 0;
+    margin: 5rpx 0;
     width: 100%;
     max-width: 800rpx;
 }
@@ -923,7 +933,7 @@ u-checkbox {
     flex: 1;
     border-radius: 12rpx;
     font-size: 36rpx;
-    padding: 20rpx 0;
+    padding: 10rpx 0;
     min-width: 0;
     text-align: center;
     color: #ffffff;
@@ -967,7 +977,7 @@ u-checkbox {
     background-color: #f5f7fa;
     border: 2rpx solid #e5e7eb;
     border-radius: 12rpx;
-    padding: 20rpx 24rpx;
+    padding: 0rpx 24rpx;
     box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
     display: flex;
     align-items: center;
@@ -991,7 +1001,7 @@ u-checkbox {
 // 价格输入框样式
 .price-input {
     width: 100%;
-    height: auto;
+    // height: auto;
     border: none;
     outline: none;
     background-color: transparent;
@@ -1017,4 +1027,18 @@ u-checkbox {
 .price-input:focus {
     background-color: transparent;
 }
+
+
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
+}
 </style>

pages/orderDetailNew/components/picComp.vue

@@ -13,10 +13,7 @@ export default {
     },
     methods: {
         click() {
-            uni.previewImage({
-                urls: [this.src],
-                current: this.src
-            })
+            this.$emit('needPreviewPic', this.src)
         }
     }
 }

pages/orderDetailNew/index.vue

@@ -31,9 +31,12 @@
         <!-- 加一单选择模态窗 -->
         <u-modal :show="addOneModelShow" :title="'加一单'" showCancelButton @cancel="addOneModelShow = false"
             @confirm="handleAddOneConfirm">
+            <!-- 品牌选择按钮 -->
             <u-button type="primary" plain @click="showBrandSelector = true;"
                 :text="currentAddBrand.dictLabel || '点击请选择品牌'"></u-button>
+            <!-- 物品选择按钮 -->
         </u-modal>
+
         <!-- 加一单品牌选择器 -->
         <u-picker :show="showBrandSelector" @confirm="handleBrandConfirm" :columns="brandColumns"
             @cancel='showBrandSelector = false' keyName="dictLabel"></u-picker>

pages/orderForm/index.vue

@@ -8,8 +8,8 @@
 			<u--form labelPosition="top" labelWidth="100" :model="form" :rules="rules" ref="form" class="form_wrap"
 				:errorType="'toast'">
 				<u-form-item label="品牌" prop="brand" class="brand_wrap">
-					<ld-select :list="brandDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择物品品牌"
-						v-model="form.brand" :border="false" border></ld-select>
+					<BrandSelect :list="brandDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择物品品牌"
+						v-model="form.brand" :border="false" border></BrandSelect>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 
@@ -19,11 +19,11 @@
 							<u--input v-model="form.model" placeholder="例如:CF小号" border="surround"></u--input>
 						</u-form-item>
 					</u-col>
-					 <u-col span="6">
-                        <u-form-item label="实价" prop="price">
+					<u-col span="6">
+						<u-form-item label="实价" prop="price">
 							<u--input v-model="form.price" placeholder="0.00" border="surround"></u--input>
-					</u-form-item>
-                    </u-col>
+						</u-form-item>
+					</u-col>
 				</u-row>
 
 				<u-row gutter="5" justify="space-between">
@@ -32,7 +32,7 @@
 							<u--input v-model="form.phone" placeholder="电话号" border="surround"></u--input>
 						</u-form-item>
 					</u-col>
-					 <u-col span="6">
+					<u-col span="6">
 						<u-form-item label="客户微信" prop="wechat">
 							<u--input v-model="form.wechat" placeholder="微信号" border="surround"></u--input>
 						</u-form-item>
@@ -44,11 +44,13 @@
 						<view>地址信息</view>
 					</view>
 					<u-form-item label="详细地址" prop="address" class='form_card'>
-						<pick-regions :defaultRegion="defaultRegion" @getRegion="handleGetRegion" clearable class="region-picker">
+						<pick-regions :defaultRegion="defaultRegion" @getRegion="handleGetRegion" clearable
+							class="region-picker">
 							<view>
 								<template v-if="form.province">
-									<u--input :value="form.province + '/' + form.city + '/' + form.area" placeholder="点击选择"
-										readonly suffixIcon="arrow-right" suffixIconStyle="color : #c0c4cc"></u--input>
+									<u--input :value="form.province + '/' + form.city + '/' + form.area"
+										placeholder="点击选择" readonly suffixIcon="arrow-right"
+										suffixIconStyle="color : #c0c4cc"></u--input>
 								</template>
 								<template v-else>
 									<u--input placeholder="点击选择" readonly suffixIcon="arrow-right"
@@ -57,19 +59,21 @@
 							</view>
 						</pick-regions>
 					</u-form-item>
-					<u--textarea v-model="form.address" placeholder="粘贴地址自动识别(例如：浙江省杭州市...)" confirmType="done" @blur="handleAddressBlur"></u--textarea>
+					<u--textarea v-model="form.address" placeholder="粘贴地址自动识别(例如：浙江省杭州市...)" confirmType="done"
+						@blur="handleAddressBlur"></u--textarea>
 				</view>
 				<u-form-item label="上门时间" prop="visitTime" class="visit_time_wrap">
 					<date-time-picker v-model="form.visitTime" :value-format="'YYYY-MM-DD HH:mm:ss'" :type="'datetime'">
 					</date-time-picker>
 				</u-form-item>
 
-				<u-form-item label="类型" prop="category" class="category_wrap">
-					<view class="category_select_wrap">
-						<ld-select :list="categoryDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择类型"
-							v-model="form.category" :border="false"></ld-select>
-						<u-icon slot="right" name="arrow-right"></u-icon>
-					</view>
+				<!-- <u-form-item label="类型" prop="category" class="category_wrap"> -->
+				<u-form-item label="类型" prop="category" class="brand_wrap">
+					<!-- <view class="category_select_wrap"> -->
+					<ld-select :list="categoryDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择类型"
+						v-model="form.category" :border="false"></ld-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+					<!-- </view> -->
 				</u-form-item>
 
 				<u-form-item label="价格范围" prop="priceRange">
@@ -86,7 +90,8 @@
 				</u-form-item>
 
 				<u-form-item label="备注信息" prop="remarks" class="remarks_wrap">
-					<u--textarea v-model="form.remarks" placeholder="填写线索来源、客户特殊要求等..." count confirmType="done"></u--textarea>
+					<u--textarea v-model="form.remarks" placeholder="填写线索来源、客户特殊要求等..." count
+						confirmType="done"></u--textarea>
 				</u-form-item>
 
 			</u--form>
@@ -120,11 +125,13 @@
 import orderFileUpload from '@/components/order-file-upload/order-file-upload.vue'
 import dateTimePicker from "@/components/dateTimePicker/dateTimePicker.vue"
 import ldSelect from "@/components/ld-select/ld-select.vue"
+import BrandSelect from "@/components/brand-select/brand-select.vue"
 export default {
 	components: {
 		orderFileUpload,
 		dateTimePicker,
-		ldSelect
+		ldSelect,
+		BrandSelect
 	},
 	data() {
 		return {
@@ -145,7 +152,7 @@ export default {
 				address: '',
 				visitTime: '',
 				remarks: '',
-				category: '',
+				category: '1',
 				brand: '',
 				model: '',
 				price: '',
@@ -194,13 +201,13 @@ export default {
 				},
 				wechat: {
 					type: 'string',
-					required: true,
+					required: false,
 					message: '请输入客户微信',
 					trigger: ['blur', 'change']
 				},
 				phone: {
 					type: 'string',
-					required: true,
+					required: false,
 					message: '请输入联系电话',
 					trigger: ['blur', 'change']
 				},
@@ -260,17 +267,17 @@ export default {
 			this.form.province = provinceData.name;
 			this.form.city = cityData.name;
 			this.form.area = areaData.name;
-			
+
 			// 构建完整的地区信息
 			const regionText = this.form.province + this.form.city + this.form.area;
-			
+
 			// 检查当前地址内容是否为纯地区信息（没有具体街道等）
-			const isPureRegion = !this.form.address || 
-								this.form.address.trim() === '' ||
-								this.form.address.trim().includes(this.form.province) ||
-								this.form.address.trim().includes(this.form.city) ||
-								this.form.address.trim().includes(this.form.area);
-			
+			const isPureRegion = !this.form.address ||
+				this.form.address.trim() === '' ||
+				this.form.address.trim().includes(this.form.province) ||
+				this.form.address.trim().includes(this.form.city) ||
+				this.form.address.trim().includes(this.form.area);
+
 			// 如果是纯地区信息或者是空地址，则更新为选择的地区
 			if (isPureRegion) {
 				this.form.address = regionText;
@@ -435,90 +442,106 @@ export default {
 	padding: 10rpx;
 	/* 确保内容不会溢出 */
 	overflow: hidden;
-	.u-input--square{
+
+	.u-input--square {
 		border-radius: 20rpx;
 	}
+
 	.u-input--square:focus-within,
 	.u-input--square.u-input--focus {
 		border: 2rpx solid #2563eb !important;
 		background-color: #fff !important;
 	}
 }
-.brand_wrap{
-	::v-deep .u-form-item__body__right__content{
-		border:1px solid #dadbde;
-		padding:10rpx;
+
+.brand_wrap {
+	::v-deep .u-form-item__body__right__content {
+		border: 1px solid #dadbde;
+		padding: 10rpx;
 		border-radius: 20rpx;
-		.inputWrap{
-			border:none;
+
+		.inputWrap {
+			border: none;
 		}
 	}
 }
+
 .address_wrap {
 	border-radius: 20rpx;
-	padding:24rpx;
+	padding: 24rpx;
 	display: flex;
 	flex-direction: column;
 	background-color: #fff;
 	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
 	margin: 0 10rpx;
+
 	.address_title {
 		display: flex;
 		align-items: center;
 		background-color: #fff;
 		padding-bottom: 12rpx;
-		gap:16rpx;
-		font-size:26rpx;
+		gap: 16rpx;
+		font-size: 26rpx;
 		color: #6b7280;
 		font-weight: 600;
 	}
-	::v-deep .u-form-item{
-		margin-bottom:0 !important;
-		padding:0;
-		.u-input--square{
+
+	::v-deep .u-form-item {
+		margin-bottom: 0 !important;
+		padding: 0;
+
+		.u-input--square {
 			background-color: #f9fafb;
 		}
 	}
-	::v-deep .u-textarea--radius{
+
+	::v-deep .u-textarea--radius {
 		border-radius: 20rpx;
 	}
+
 	.region-picker {
 		width: 100%;
 	}
-	::v-deep .u-textarea{
+
+	::v-deep .u-textarea {
 		background-color: #f9fafb;
 	}
 }
 
-.visit_time_wrap{
-	::v-deep .uni-date-x{
+.visit_time_wrap {
+	::v-deep .uni-date-x {
 		border-radius: 10px;
 		padding: 8rpx 10rpx;
-		border:1px solid #dadbde;
+		border: 1px solid #dadbde;
 		background-color: #f8f9fa;
 	}
 }
-.category_wrap{
-	.category_select_wrap{
+
+.category_wrap {
+	.category_select_wrap {
 		border-radius: 20rpx;
-		border:1px solid #dadbde;
-		padding:6rpx;
-		width:100%;
-		::v-deep .ldSelectInput{
+		border: 1px solid #dadbde;
+		padding: 6rpx;
+		width: 100%;
+
+		::v-deep .ldSelectInput {
 			font-size: 28rpx !important;
 		}
 	}
+
 	.category_select_wrap:focus-within,
 	.category_select_wrap:focus {
 		border: 2rpx solid #2563eb !important;
 		background-color: #fff !important;
 	}
 }
-.remarks_wrap{
-	.u-textarea{
+
+.remarks_wrap {
+	.u-textarea {
 		background-color: #fff;
 	}
-	::v-deep .u-textarea--radius{
+
+	::v-deep .u-textarea--radius {
 		border-radius: 20rpx;
 	}
 }
@@ -536,9 +559,9 @@ export default {
 
 .u-button {
 	border-radius: 40rpx;
-	background-color:#2563eb;
-	border:none;
-	color:#fff;
+	background-color: #2563eb;
+	border: none;
+	color: #fff;
 	font-weight: 700;
 	font-size: 40rpx;
 	height: 100rpx;
@@ -596,8 +619,7 @@ export default {
 	opacity: 1;
 }
 
-.u-textarea{
+.u-textarea {
 	background-color: #f5f5f5;
 }
-
 </style>

pages/pagereceivecenter/pagereceivecenter.vue

@@ -1,6 +1,7 @@
 <script>
 // import orderCard from "./compounts/orderCard.vue";
 
+// status 状态 1 发单（刚发出来） 2 接单（处理中） 3 收单（入库了） 4 未收（没有收到）
 export default {
     components: {
         // orderCard,
@@ -20,12 +21,27 @@ export default {
             followUpModelShow: false,
             followUpNotes: '',
             countdown: 300,
-            countdownIntervals: null
+            countdownIntervals: null,
+
+            //筛选条件
+            filterList: [
+                { name: '全部列表', type: 1 },
+                { name: '我的接发单', type: 2 }
+            ],
+
+            statisticsSendStatus: [],//中间统计数据
+            activeType: 1,//当前选择的筛选类型,顶部tab的类型
+            activeStatus: '',//当前选择的状态,统计数据的类型
+
+            currentFollowUp: [],//当前订单的跟进记录
+            showMoreFollowUp: false
         }
     },
     onLoad() {
         //初始调用
         this.getOrderList();
+        this.getStatisticsSendStatus();
+
         this.countdownInterval()
         // uni.navigateTo({
         //     url: `/pages/orderDetailNew/index?orderId=5464&item=测试发单&type=undefined&clueId=1973381744953516033`,
@@ -43,6 +59,7 @@ export default {
                             this.handleBtnClick('isBusy', order)
                         }
                     })
+                    clearInterval(this.countdownInterval);
                 }
             },
             immediate: true
@@ -60,12 +77,16 @@ export default {
                 const result = await uni.$u.api.selectClueOrderFormList({
                     pageSize: this.page.pageSize,
                     pageNum: this.page.pageNum,
+                }, {
+                    type: this.activeType,
+                    status: this.activeStatus,
                 });
 
                 console.log('接单列表', result);
                 // 把数组按照status的大小排序，从小到大
                 result.rows.sort((a, b) => {
                     return a.status - b.status;
+                    // return b.status - a.status;
                 })
 
 
@@ -78,9 +99,15 @@ export default {
                 uni.$u.toast('获取订单列表失败，请稍后重试');
             }
         },
+        //获取统计数据
+        async getStatisticsSendStatus() {
+            const { data } = await uni.$u.api.statisticsSendStatus({ type: this.activeType });
+            // console.log('统计数据是', data)
 
+            this.statisticsSendStatus = data;
+        },
         // 处理按钮点击事件
-        handleBtnClick(btnType, order) {
+        async handleBtnClick(btnType, order) {
 
             if (btnType == 'acceptOrder') {
                 //去接单
@@ -120,6 +147,8 @@ export default {
                 //打开模态窗
                 this.followUpModelShow = true;
                 this.currentOrder = order
+
+
             } else if (btnType == 'tag') {
                 //打标签
                 console.log('打标签', order)
@@ -136,6 +165,9 @@ export default {
                 console.log('待跟进', order)
                 this.followUpModelShow = true;
                 this.currentOrder = order
+
+
+
             }
         },
         // 跳转订单详情
@@ -155,12 +187,13 @@ export default {
 
         //滑动加载
         scrolltolower() {
-            console.log('到底了');
-            // if (this.orderList.length >= this.page.total) {
-            //     return uni.$u.toast('没有更多了');
-            // }
-            this.page.pageNum++;
-            this.getOrderList();
+            // console.log('到底了');
+            if (this.orderList.length >= this.page.total) {
+                //到底了，没有更多
+            } else {
+                this.page.pageNum++;
+                this.getOrderList();
+            }
         },
 
         //获取全部标签
@@ -202,6 +235,60 @@ export default {
             }
             this.followUpNotes = '';
         },
+
+        // 切换筛选条件
+        async changeFilter(param) {
+            this.activeType = param.type;
+
+            this.page.pageNum = 1;
+            this.orderList = [];
+
+            this.getOrderList();
+            this.getStatisticsSendStatus()
+        },
+        //切换统计数据的类型
+        changeStatus(param) {
+            if (param == this.activeStatus) {
+                //如果当前点击的状态和当前选中的状态相同，则取消选中
+                this.activeStatus = '';
+                this.page.pageNum = 1;
+                this.orderList = [];
+                this.getOrderList();
+            } else {
+                //如果当前点击的状态和当前选中的状态不同，则切换选中状态
+                this.activeStatus = param;
+                this.page.pageNum = 1;
+                this.orderList = [];
+                this.getOrderList();
+            }
+        },
+        //点击查看更多的跟进
+        async handleShowMoreFollowUp() {
+            //当前的order是
+            console.log()
+            const { data } = await uni.$u.api.getDuplicateOrderFollowListByClueId({
+                clueId: this.currentOrder.clueId
+            });
+            console.log('这里是跟进', data)
+
+            const allData = []
+
+            for (const key in data) {
+                allData.push(...data[key])
+            }
+            const filterData = allData.filter(item => {
+                console.log('过滤', item)
+                //过滤出来tem.content不包括联系师傅、师傅拍图技巧、到达客户面对面、未收评分、待跟进_
+                return item.content.indexOf('联系师傅') == -1 && item.content.indexOf('师傅拍图技巧') == -1 && item.content.indexOf('到达客户面对面') == -1 && item.content.indexOf('未收评分') == -1 && item.content.indexOf('待跟进_') == -1
+            })
+
+            console.log('筛选后的跟进', filterData)
+
+            this.currentFollowUp = filterData || [];
+            this.showMoreFollowUp = true
+
+
+        }
     }
 }
 </script>
@@ -210,6 +297,21 @@ export default {
     <view class="container">
         <u-navbar title="接单中心" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 
+        <!-- 筛选条件 -->
+        <u-tabs :list="filterList" @click="changeFilter"></u-tabs>
+
+        <!-- 统计数据 -->
+        <scroll-view scroll-x class="statusScrollView" style="width: 100%;">
+            <view class="statisticsContainer">
+                <view v-for="item in statisticsSendStatus" :key="item.status" @click="changeStatus(item.status)"
+                    class="statisticsItem" :class="{ 'activeStatusClass': item.status == activeStatus }">
+                    <view>{{ item.statusName }}</view>
+                    <view>({{ item.count || 0 }})</view>
+                </view>
+            </view>
+        </scroll-view>
+
+
         <view class="scrollViewContainer">
             <scroll-view class="scrollView" scroll-y @scrolltolower="scrolltolower">
                 <transition-group name="order-move" tag="div">
@@ -265,11 +367,18 @@ export default {
                         </view>
 
                         <view class="Btns">
+                            <!-- status 状态 1 发单（刚发出来） 2 接单（处理中） 3 收单（入库了） 4 未收（没有收到） -->
 
                             <view class="btnGroup" v-if="item && (item.status == '1')">
                                 <view class="card-button" @click.stop="handleBtnClick('acceptOrder', item)">立即接单</view>
                                 <view class=" card-button isBusy" @click.stop="handleBtnClick('isBusy', item)">
-                                    在忙（{{ countdown }}s）</view>
+                                    <view>
+                                        在忙
+                                    </view>
+                                    <view v-if="countdown > 0">
+                                        （{{ countdown }} s）
+                                    </view>
+                                </view>
                             </view>
 
                             <view class="btnGroup" v-if="item && (item.status == '2')">
@@ -292,7 +401,7 @@ export default {
                     </view>
                 </transition-group>
                 <view class="hasMore">
-                    <!-- {{ orderList.length >= page.total ? '没有更多了~' : '向下滑动加载更多~' }} -->
+                    {{ orderList.length >= page.total ? '没有更多了~' : '向下滑动加载更多~' }}
                 </view>
             </scroll-view>
         </view>
@@ -313,11 +422,31 @@ export default {
 
         <u-modal showCancelButton :show="followUpModelShow" :title="'填写跟进细节'" @confirm="confirmFollowUp"
             @cancel="followUpModelShow = false">
+
             <view class="modal-content">
                 <u--textarea v-model="followUpNotes" placeholder="请输入情况" confirm-type="done"
-                    style="width: 400rpx; margin-bottom: 30rpx;"></u--textarea>
+                    style="width: 400rpx;margin-bottom: 10rpx; "></u--textarea>
+                <u-button type="primary" @click="handleShowMoreFollowUp">点击查看更多跟进</u-button>
+
             </view>
         </u-modal>
+
+        <!-- 更多跟进 -->
+        <u-modal :show="showMoreFollowUp" title="详细跟进记录" @confirm="showMoreFollowUp = false">
+            <!-- <view class="followUpBox"> -->
+            <scroll-view class="followUpBox" scroll-y>
+                <view v-for="value in currentFollowUp" :key="value.id" class="followUpItem">
+                    <view class="followUpInfo">
+                        <view class="followUpNickname">
+                            账号：{{ value.createNickname }}
+                        </view>
+                        <view class="followUpOrgName">{{ value.orgName }}</view>
+                    </view>
+                    <view class="followUpContent">{{ value.content }}</view>
+                </view>
+            </scroll-view>
+            <!-- </view> -->
+        </u-modal>
     </view>
 </template>
 
@@ -330,7 +459,11 @@ export default {
 }
 
 .scrollViewContainer {
-    height: calc(100vh - 44px);
+    height: calc(100vh - 44px - 44px - 27px - 10rpx);
+}
+
+.followUpScroll {
+    height: 600rpx;
 }
 
 .scrollView {
@@ -491,6 +624,8 @@ export default {
     background-color: #fff;
     color: #6B7280;
     border-color: #6B7280;
+    display: flex;
+    justify-content: center;
 }
 
 /* 待跟进状态按钮 */
@@ -520,4 +655,81 @@ export default {
     display: grid;
     grid-template-columns: repeat(2, 1fr);
 }
+
+
+
+
+
+
+.statisticsContainer {
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+    white-space: nowrap;
+    padding: 0 0rpx;
+}
+
+.statisticsItem {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: #fff;
+    padding: 10rpx 20rpx;
+    border-radius: 15rpx;
+    font-size: 24rpx;
+    font-weight: 700;
+    margin: 0 10rpx;
+    white-space: nowrap;
+    flex-shrink: 0;
+}
+
+.activeStatusClass {
+    background-color: #2563EB;
+    color: #fff;
+
+}
+
+::v-deep .u-tabs__wrapper__nav__line {
+    top: 7px;
+}
+
+
+
+.followUpItem {
+    background-color: #F7FBFE;
+    width: 540rpx;
+    margin: 20rpx;
+    padding: 20rpx;
+    box-sizing: border-box;
+
+    .followUpInfo {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .followUpNickname {
+        font-size: 24rpx;
+        font-weight: 700;
+        color: #2563EB;
+    }
+
+    .followUpOrgName {
+        font-size: 24rpx;
+        font-weight: 700;
+        color: #6B7280;
+    }
+
+    .followUpContent {
+        font-size: 24rpx;
+        font-weight: 700;
+        color: #374751;
+    }
+}
+
+.followUpBox {
+    height: 600rpx;
+}
 </style>