修复一些bug，增加一些新功能

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>

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/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/orderDetailNew/components/pageOne.vue

@@ -91,6 +91,10 @@
             </view>
         </view>
 
+        <view class="space-block">
+
+        </view>
+
         <u-button class='next-btn' @click="handleNextClick" type="primary" size="middle"
             style="border-radius: 20rpx;">下一步</u-button>
 
@@ -159,20 +163,27 @@ export default {
         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: '该订单暂时没有电话号码',
@@ -557,4 +568,8 @@ export default {
     @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

@@ -12,7 +12,8 @@
                 <u-col span="5.8">
                     <view class="info-label">银行名称</view>
                     <u-input v-model="paymentInfo.bankName" placeholder="请输入银行名称" class="info-input"
-                        @input="handleBankNameInput" />
+                        @blur="handleBankNameInput" />
+
                 </u-col>
             </u-row>
             <!-- 银行账号单独一行 -->
@@ -231,10 +232,10 @@ export default {
 
         // 银行名称输入处理 - 只允许中文和英文
         handleBankNameInput(value) {
-            console.log('银行名称输入处理', value)
-            //如果value包括数字则返回空字符串
-
-
+            const strValue = String(value || '');
+            const reg = /[0-9]/g;
+            // 用replace + 全局正则替代replaceAll
+            this.paymentInfo.bankName = strValue.replace(reg, '');
         },
 
 

pages/pagereceivecenter/pagereceivecenter.vue

@@ -31,6 +31,9 @@ export default {
             statisticsSendStatus: [],//中间统计数据
             activeType: 1,//当前选择的筛选类型,顶部tab的类型
             activeStatus: '',//当前选择的状态,统计数据的类型
+
+            currentFollowUp: [],//当前订单的跟进记录
+            showMoreFollowUp: false
         }
     },
     onLoad() {
@@ -102,7 +105,7 @@ export default {
             this.statisticsSendStatus = data;
         },
         // 处理按钮点击事件
-        handleBtnClick(btnType, order) {
+        async handleBtnClick(btnType, order) {
 
             if (btnType == 'acceptOrder') {
                 //去接单
@@ -142,6 +145,8 @@ export default {
                 //打开模态窗
                 this.followUpModelShow = true;
                 this.currentOrder = order
+
+
             } else if (btnType == 'tag') {
                 //打标签
                 console.log('打标签', order)
@@ -158,6 +163,9 @@ export default {
                 console.log('待跟进', order)
                 this.followUpModelShow = true;
                 this.currentOrder = order
+
+
+
             }
         },
         // 跳转订单详情
@@ -252,6 +260,33 @@ export default {
                 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>
@@ -384,11 +419,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>
 
@@ -404,6 +459,10 @@ export default {
     height: calc(100vh - 44px - 44px - 27px - 10rpx);
 }
 
+.followUpScroll {
+    height: 600rpx;
+}
+
 .scrollView {
     height: 100%;
 }
@@ -630,4 +689,44 @@ export default {
 ::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>