发单新增图片增删接口

main.js

@@ -4,14 +4,17 @@ import store from './store'
 // main.js，注意要在use方法之后执行
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
+
+
+
 // 如此配置即可
 // uni.$u.config.unit = 'rpx'
 
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-	store,
-    ...App
+  store,
+  ...App
 })
 
 // http 拦截器，将此部分放在 new Vue() 和 app.$mount() 之间，才能 App.vue 中正常使用
@@ -24,10 +27,10 @@ import { showLoading } from './utils/loading'
 Vue.use(httpApi, app);
 
 import hideNav from "@/utils/hideNav.js";
-Vue.use(hideNav,app);
+Vue.use(hideNav, app);
 
-Vue.prototype.$getDicts = function (dictType,customFlag = true) {
-  return store.dispatch('dict/getDicts', {dictType,customFlag})
+Vue.prototype.$getDicts = function (dictType, customFlag = true) {
+  return store.dispatch('dict/getDicts', { dictType, customFlag })
 }
 
 // 引入共用的方法

manifest.json

@@ -1,17 +1,14 @@
 {
     "name" : "时与",
-    "appid" : "__UNI__0C0EF72",
+    "appid" : "__UNI__DDAE2E0",
     "description" : "",
     "versionName" : "1.2.3",
     "versionCode" : 123,
     "transformPx" : false,
-    /* 5+App特有相关 */
     "app-plus" : {
         "webView" : {
-            // 3.5.0 + 仅Android支持
             "x5" : {
-                // 此属性需要勾选 Android X5 Webview 模块，详细参见下面的说明
-                "allowDownloadWithoutWiFi" : true // 是否允许用户在非WiFi网络时进行x5内核的下载。默认值false（如果为true，就不会显示用户确认的弹窗。）
+                "allowDownloadWithoutWiFi" : true
             }
         },
         "usingComponents" : true,
@@ -19,7 +16,7 @@
         "compilerVersion" : 3,
         "runmode" : "liberate",
         "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
+            "ignoreVersion" : true
         },
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
@@ -27,9 +24,8 @@
             "autoclose" : true,
             "delay" : 0
         },
-        /* 模块配置 */
         "modules" : {
-            "Canvas" : "nvue canvas", //使用Canvas模块
+            "Canvas" : "nvue canvas",
             "Maps" : {},
             "Bluetooth" : {},
             "Geolocation" : {},
@@ -37,62 +33,33 @@
             "VideoPlayer" : {},
             "Webview-x5" : {}
         },
-        /* 应用发布信息 */
         "distribute" : {
-            /* android打包配置 */
             "android" : {
                 "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", "x86" ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
                 "minSdkVersion" : 21,
                 "autoSdkPermissions" : true,
-                "targetSdkVersion" : ""
+                "targetSdkVersion" : 33
             },
-            /* ios打包配置 */
             "ios" : {
                 "dSYMs" : false,
-                "UIBackgroundModes" : "audio,location"
+                "UIBackgroundModes" : [ "audio", "location" ]
             },
-            /* SDK配置 */
             "sdkConfigs" : {
                 "maps" : {
                     "amap" : {
@@ -104,7 +71,6 @@
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "android" ],
-                        "appkey_ios" : "15e6c1873cf33749320d97869450cdae",
                         "appkey_android" : "402948be5a1d4d5572c5002b86bd2a23"
                     },
                     "system" : {
@@ -173,16 +139,14 @@
                         "appid_android" : {
                             "des" : "请填写你当前应用的包名，必需填写，否则可能无法使用。（在菜单中->发行->原生App-云打包中可以查看包名信息）",
                             "key" : "",
-                            "value" : ""
+                            "value" : "com.shiyu.app"
                         }
                     }
                 }
             }
         }
     },
-    /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "",
         "setting" : {

mixins/upload.js

@@ -19,6 +19,7 @@ export default {
         },
         // H5 平台文件上传
         handleH5Upload() {
+            console.log("H5 平台文件上传")
             uni.chooseFile({
                 count: 100, // 最多可以选择100个文件
                 type: 'all', // 选择所有类型文件
@@ -41,6 +42,7 @@ export default {
                     }
 
                     try {
+                        console.log("上传文件成功:1", validFiles)
                         await Promise.all(validFiles.map(filePath => this.uploadFile(filePath)));
                         this.handleUploadSuccess();
                     } catch (error) {

pages.json

@@ -249,6 +249,15 @@
 				"navigationBarBackgroundColor": "#108cff",
 				"navigationStyle": "custom"
 			}
+		},
+			{
+			"path": "pages/pagereceivecenter/pagereceivecenter",
+			"style": {
+				"navigationBarTitleText": "接单中心",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#108cff",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {

pages/acceptOrderOrder/compounts/orderCard.vue

@@ -1,11 +1,13 @@
 <template>
-    <view class="order-card" :class="{ 'order-card-overTime': order.isDelay }" @click.stop="handleClick(order)">
+    <view class="order-card" :class="{ 'order-card-overTime': order && order.isDelay }"
+        @click.stop="handleClick(order)">
         <view class="order-card-header">
             <view class="order-card-header-left">
-                <view class="order-card-header-left-band" style="backgroundColor: #007AFF;" v-show="order.itemBrand">
+                <view class="order-card-header-left-band" style="backgroundColor: #007AFF;"
+                    v-show="order && order.itemBrand">
                     {{ order.itemBrand }}
                 </view>
-                <view class="order-card-header-left-band" v-for="value in order.tags" :key="value.id"
+                <view class="order-card-header-left-band" v-for="value in (order && order.tags || [])" :key="value.id"
                     :style="{ backgroundColor: value.color }">
                     {{ value.name }}
                 </view>
@@ -15,23 +17,25 @@
             </view>
             <view class="order-card-header-right">
                 <view class="order-card-header-right-price">
-                    ￥{{ order.priceRange ? order.priceRange : '暂无价格' }}
+                    ￥{{ order && order.priceRange ? order.priceRange : '暂无价格' }}
                 </view>
             </view>
         </view>
         <view class="order-card-content">
             <view class="order-card-content-left">
-                <image :src="order.image ? order.image : '/static/acceptOrder/orderCardPic.jpg'" mode="scaleToFill" />
+                <image :src="(order && order.image) ? order.image : '/static/acceptOrder/orderCardPic.jpg'"
+                    mode="scaleToFill" />
             </view>
             <view class="order-card-content-right">
-                <view>{{ order.item }}</view>
-                <view>发单人：{{ order.createNickName }}</view>
-                <view>{{ order.sendDate }}</view>
+                <view>{{ order && order.item || '暂无项目' }}</view>
+                <view>发单人：{{ order && order.createNickName || '未知' }}</view>
+                <view>{{ order && order.sendDate || '暂无时间' }}</view>
             </view>
         </view>
 
         <view class="order-card-bottom">
-            <u-row justify="between" v-if="order.status == '1' || order.status == null">
+            <u-row justify="between"
+                v-if="order && (order.status == '1' || order.status == null || order.status === undefined)">
                 <u-col span="5.5">
                     <view @click.stop="handleAcceptOrder(order)">
                         <u-button type="primary" size="medium">立即接单</u-button>
@@ -44,7 +48,7 @@
                     </view>
                 </u-col>
             </u-row>
-            <u-row justify="between" v-if="order.status == '2'">
+            <u-row justify="between" v-if="order && order.status == '2'">
                 <u-col span="5.5">
                     <view @click.stop="handleWillFollow(order)">
                         <u-button type="primary" size="medium">待跟进</u-button>
@@ -58,14 +62,14 @@
                     </view>
                 </u-col>
             </u-row>
-            <u-row justify="between" v-if="order.status == '3'">
+            <u-row justify="between" v-if="order && order.status == '3'">
                 <u-col span="12">
                     <view @click.stop="handleShare(order)">
                         <u-button type="primary" size="medium">一键分享</u-button>
                     </view>
                 </u-col>
             </u-row>
-            <u-row justify="between" v-if="order.status == '4'">
+            <u-row justify="between" v-if="order && order.status == '4'">
                 <u-col span="12">
                     <view @click.stop="handleShare(order)">
                         <u-button type="primary" size="medium">待跟进</u-button>
@@ -109,8 +113,7 @@ export default {
         buzyTime: {
             handler(newVal) {
                 // console.log('newVal', newVal);
-                if (newVal == 0) {
-
+                if (newVal == 0 && this.order) {
                     // 移动到最后
                     this.handleBusy(this.order)
                 }
@@ -120,8 +123,11 @@ export default {
     },
 
     mounted() {
-        this.openTimer()
-        console.log('order', this.order);
+        // 只有当order对象存在时才启动定时器
+        if (this.order) {
+            this.openTimer()
+            console.log('order', this.order);
+        }
 
     },
     beforeDestroy() {

pages/acceptOrderOrder/index.vue

@@ -37,14 +37,25 @@ export default {
 	methods: {
 		async getOrderList() {
 
-			const { rows, total } = await uni.$u.api.selectClueOrderFormList({
-				pageSize: this.page.pageSize,
-				pageNum: this.page.pageNum,
+			try {
+				const result = await uni.$u.api.selectClueOrderFormList({
+					pageSize: this.page.pageSize,
+					pageNum: this.page.pageNum,
+				});
+				// 检查result是否有值，以及是否包含rows和total
+				if (result && Array.isArray(result.rows)) {
+					console.log('接单列表', result.rows);
+					this.ordersList.push(...result.rows);
+					// 只有当total存在且为数字时才更新
+					if (typeof result.total === 'number') {
+						this.page.total = result.total;
+					}
+				}
+			} catch (error) {
+				console.error('接单列表接口调用失败:', error);
+				// 添加用户友好的错误提示
+				uni.$u.toast('获取订单列表失败，请稍后重试');
 			}
-			);
-			console.log('接单列表', rows);
-			this.ordersList.push(...rows);
-			this.page.total = total;
 		},
 		scrolltolower() {
 			if (this.ordersList.length >= this.page.total) {

pages/clueDetail/tabs/callRecord/index.vue

@@ -18,10 +18,10 @@
 							<uni-icons type="trash" size="20" color="#ff6666"></uni-icons>
 						</view>
 					</view>
-					<view class="file_name" v-if="data.type === '3'">{{data.fileName}}</view>
+					<view class="file_name" v-if="data.type === '3'">{{ data.fileName }}</view>
 					<view class="call_file">
 						<view class="audio-container">
-							<audio :src="data.fileUrl" controls ></audio>
+							<audio :src="data.fileUrl" controls></audio>
 						</view>
 					</view>
 				</view>
@@ -34,171 +34,172 @@
 	</view>
 </template>
 <script>
-	export default {
-		props: {
-			clueId: {
-				type: [String, Number],
-				required: true
-			},
-			clueDetail: {
-				type: Object,
-				default: () => ({})
-			}
+export default {
+	props: {
+		clueId: {
+			type: [String, Number],
+			required: true
 		},
-		data() {
-			return {
-				dataList: []
-			}
+		clueDetail: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			dataList: []
+		}
+	},
+	methods: {
+		titleText(data) {
+			return `${data.createTime} 号码(${data.caller}) ${(data.type === 1 ? data.hangupCauseName : '上传录音')}`
 		},
-		methods: {
-			titleText(data) {
-				return `${data.createTime} 号码(${data.caller}) ${(data.type === 1 ?  data.hangupCauseName: '上传录音')}`
-			},
-			handleDelete({
-				id
-			}) {
-				uni.showModal({
-					title: '提示',
-					content: '是否确定删除?',
-					confirmColor: '#6cc040',
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								await uni.$u.api.deleteClueFile([id])
-								uni.showToast({
-									title: '删除成功',
-									icon: 'success',
-									duration: 2000
-								})
-								this.getData()
-							} catch (error) {
-								uni.showToast({
-									title: '删除失败',
-									icon: 'error',
-									duration: 2000
-								})
-							}
+		handleDelete({
+			id
+		}) {
+			uni.showModal({
+				title: '提示',
+				content: '是否确定删除?',
+				confirmColor: '#6cc040',
+				success: async (res) => {
+					if (res.confirm) {
+						try {
+							await uni.$u.api.deleteClueFile([id])
+							uni.showToast({
+								title: '删除成功',
+								icon: 'success',
+								duration: 2000
+							})
+							this.getData()
+						} catch (error) {
+							uni.showToast({
+								title: '删除失败',
+								icon: 'error',
+								duration: 2000
+							})
 						}
 					}
-				})
-			},
-			async getData() {
-				const {
-					data
-				} = await uni.$u.api.getCallClueFileByClueId({
-					clueId: this.clueId
-				});
-				this.dataList = data;
-			},
-		},
-		mounted() {
-			this.getData();
-		},
-		beforeDestroy(){
-			uni.$off('uploadRecordSuccess');  
+				}
+			})
 		},
-		created() {
-			uni.$on('uploadRecordSuccess',()=>{
-				this.getData();
+		async getData() {
+			const {
+				data
+			} = await uni.$u.api.getCallClueFileByClueId({
+				clueId: this.clueId
 			});
-		}
+			this.dataList = data;
+		},
+	},
+	mounted() {
+		this.getData();
+	},
+	beforeDestroy() {
+		uni.$off('uploadRecordSuccess');
+	},
+	created() {
+		uni.$on('uploadRecordSuccess', () => {
+			this.getData();
+		});
 	}
+}
 </script>
 <style lang="scss" scoped>
-	.callRecord_wrap {
-		position: relative;
-		padding: 20rpx;
-		min-height: 400px;
-		box-sizing: border-box;
+.callRecord_wrap {
+	position: relative;
+	padding: 20rpx;
+	min-height: 400px;
+	box-sizing: border-box;
 
-		.loading-mask {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			background-color: rgba(255, 255, 255, 0.8);
+	.loading-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(255, 255, 255, 0.8);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 999;
+	}
+
+	.timeline-list {
+		.timeline-item {
 			display: flex;
-			justify-content: center;
-			align-items: center;
-			z-index: 999;
-		}
+			margin-bottom: 30rpx;
 
-		.timeline-list {
-			.timeline-item {
+			.timeline-icon {
+				width: 60rpx;
+				height: 60rpx;
+				border-radius: 50%;
+				background-color: #f1f3f4;
 				display: flex;
-				margin-bottom: 30rpx;
-
-				.timeline-icon {
-					width: 60rpx;
-					height: 60rpx;
-					border-radius: 50%;
-					background-color: #f1f3f4;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					margin-right: 20rpx;
-					flex-shrink: 0;
-				}
-
-				.timeline-content {
-					width:690rpx;
+				justify-content: center;
+				align-items: center;
+				margin-right: 20rpx;
+				flex-shrink: 0;
+			}
 
-					.timestamp {
-						font-size: 24rpx;
-						color: #999;
-						margin-bottom: 10rpx;
-					}
+			.timeline-content {
+				width: 690rpx;
 
-					.info_top {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						margin-bottom: 20rpx;
+				.timestamp {
+					font-size: 24rpx;
+					color: #999;
+					margin-bottom: 10rpx;
+				}
 
-						.info_left {
-							.name_text {
-								font-size: 28rpx;
-								font-weight: 500;
-							}
-						}
+				.info_top {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 20rpx;
 
-						.info_right {
-							color: #6cc040;
-							font-size: 26rpx;
+					.info_left {
+						.name_text {
+							font-size: 28rpx;
+							font-weight: 500;
 						}
 					}
-					.file_name{
-						color: #999;
+
+					.info_right {
+						color: #6cc040;
 						font-size: 26rpx;
 					}
+				}
 
-					.call_file {
-						width: 100%;
-						border-radius: 12rpx;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						box-sizing: border-box;
+				.file_name {
+					color: #999;
+					font-size: 26rpx;
+				}
 
-						.audio-container {
-							width: 100%;
-						}
+				.call_file {
+					width: 100%;
+					border-radius: 12rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					box-sizing: border-box;
+
+					.audio-container {
+						width: 100%;
 					}
 				}
 			}
 		}
+	}
 
-		.empty_wrap {
-			text-align: center;
-			padding: 100rpx 0;
+	.empty_wrap {
+		text-align: center;
+		padding: 100rpx 0;
 
-			.empty-text {
-				display: block;
-				margin-top: 30rpx;
-				color: #999;
-				font-size: 28rpx;
-			}
+		.empty-text {
+			display: block;
+			margin-top: 30rpx;
+			color: #999;
+			font-size: 28rpx;
 		}
 	}
+}
 </style>

pages/order/components/orderCenter/orderCenter.vue

@@ -11,14 +11,14 @@
 				<u-icon name="arrow-down-fill" color="#aaa" size="10"></u-icon>
 			</view>
 		</view>
-		
+
 		<view class="send_status_wrap">
 			<scroll-view scroll-x="true">
 				<view class="clue_state_list">
-					<view @click="handleSendStatusClick(item)" v-for="(item, index) in clueSendStatusCountList " :key="index"
-						class="clue_state_item" :class="{ active : queryParams.status === item.status }">
-						<text>{{item.statusName}}</text>
-						<text>({{item.count}})</text>
+					<view @click="handleSendStatusClick(item)" v-for="(item, index) in clueSendStatusCountList"
+						:key="index" class="clue_state_item" :class="{ active: queryParams.status === item.status }">
+						<text>{{ item.statusName }}</text>
+						<text>({{ item.count }})</text>
 					</view>
 				</view>
 			</scroll-view>
@@ -40,181 +40,182 @@
 </template>
 
 <script>
-	import pullUpRefresh from "@/utils/pullUpRefresh";
-	import filterQuery from "./filterQuery.vue";
-	import orderItem from "./orderItem.vue";
-	export default {
-		mixins: [pullUpRefresh],
-		props: {
-			type: {
-				type: String,
-				default: '2'
+import pullUpRefresh from "@/utils/pullUpRefresh";
+import filterQuery from "./filterQuery.vue";
+import orderItem from "./orderItem.vue";
+export default {
+	mixins: [pullUpRefresh],
+	props: {
+		type: {
+			type: String,
+			default: '2'
+		},
+		dicts: {
+			type: Object,
+			required: true
+		}
+	},
+	components: {
+		filterQuery,
+		orderItem
+	},
+	data() {
+		return {
+			// 可以添加特定于接单中心的参数
+			queryParams: {
+				sendDateStart: '',
+				sendDateEnd: '',
+				type: '2',
+				item: undefined,
+				phone: undefined,
+				deptId: undefined,
+				state: undefined,
+				status: undefined,
+				allTagList: [],
+				identification: undefined,
+				createBy: undefined,
+				pageNum: 1,
+				pageSize: 10,
 			},
-			dicts: {
-				type: Object,
-				required: true
-			}
+
+			clueSendStatusCountList: [],
+
+			mapHeight: "0px"
+		}
+	},
+	methods: {
+		getOtherData() {
+			this.statisticsSendStatus();
 		},
-		components: {
-			filterQuery,
-			orderItem
+		async statisticsSendStatus() {
+			const {
+				data
+			} = await uni.$u.api.statisticsSendStatus(this.queryParams);
+			this.clueSendStatusCountList = data;
 		},
-		data() {
-			return {
-				// 可以添加特定于接单中心的参数
-				queryParams: {
-					sendDateStart: '',
-					sendDateEnd: '',
-					type: '2',
-					item: undefined,
-					phone: undefined,
-					deptId: undefined,
-					state: undefined,
-					status: undefined,
-					allTagList: [],
-					identification: undefined,
-					createBy: undefined,
-					pageNum: 1,
-					pageSize: 10,
-				},
-				
-				clueSendStatusCountList : [],
-
-				mapHeight: "0px"
-			}
+		handleSendStatusClick(item) {
+			this.queryParams.status = item.status;
+			this.resetData();
 		},
-		methods: {
-			getOtherData() {
-				this.statisticsSendStatus();
-			},
-			async statisticsSendStatus() {
-				const {
-					data
-				} = await uni.$u.api.statisticsSendStatus(this.queryParams);
-				this.clueSendStatusCountList = data;
-			},
-			handleSendStatusClick(item) {
-				this.queryParams.status = item.status;
-				this.resetData();
-			},
-			handleKeyword() {
-				this.resetData();
-			},
-			handleKeywordClear() {
-				// 组件有bug 清空后的值还是存在
-				this.queryParams.phone = "";
-				this.resetData();
-			},
-			handleshowFilter() {
-				this.$refs.filter.show();
-			},
-			async getList() {
-				const {
-					pageNum,
-					pageSize,
-				} = this.queryParams;
-				this.queryParams.type = this.type;
-				// 调用接单中心的接口
-				const {
-					rows,
-					total
-				} = await uni.$u.api.selectClueOrderFormList({
-						pageSize,
-						pageNum
-					},
-					this.queryParams
-				);
-				return rows;
-			},
-			handleOnReachBottom() {
-				this.handleReachBottom();
-			}
+		handleKeyword() {
+			this.resetData();
 		},
-		mounted() {
+		handleKeywordClear() {
+			// 组件有bug 清空后的值还是存在
+			this.queryParams.phone = "";
 			this.resetData();
-			// 根据路由名称设置类型
+		},
+		handleshowFilter() {
+			this.$refs.filter.show();
+		},
+		async getList() {
+			const {
+				pageNum,
+				pageSize,
+			} = this.queryParams;
 			this.queryParams.type = this.type;
-			uni.getSystemInfo({
-				success: (e) => {
-					const {
-						windowTop,
-						windowBottom,
-						windowHeight
-					} = e;
-					this.mapHeight = (windowHeight - 70) + 'px';
-				}
-			});
+			// 调用接单中心的接口
+			const {
+				rows,
+				total
+			} = await uni.$u.api.selectClueOrderFormList({
+				pageSize,
+				pageNum
+			},
+				this.queryParams
+			);
+			return rows;
 		},
-	}
+		handleOnReachBottom() {
+			this.handleReachBottom();
+		}
+	},
+	mounted() {
+		this.resetData();
+		// 根据路由名称设置类型
+		this.queryParams.type = this.type;
+		uni.getSystemInfo({
+			success: (e) => {
+				const {
+					windowTop,
+					windowBottom,
+					windowHeight
+				} = e;
+				this.mapHeight = (windowHeight - 70) + 'px';
+			}
+		});
+	},
+}
 </script>
 
 <style lang="scss" scoped>
-	.send_status_wrap {
-		width: 690rpx;
-		padding: 0 30rpx;
-		margin-top: 20rpx;
+.send_status_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;
-	
-				&.active {
-					color: #fff;
-					background: #4c8afe;
-				}
+
+		.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;
 			}
 		}
 	}
-	.order_center_wrap {
-		box-sizing: border-box;
-		min-height: 100vh;
+}
 
-		.queryParams_wrap {
-			display: flex;
-			background: #fff;
-			padding: 14px 0;
+.order_center_wrap {
+	box-sizing: border-box;
+	min-height: 100vh;
 
+	.queryParams_wrap {
+		display: flex;
+		background: #fff;
+		padding: 14px 0;
 
-			.query,
-			.search {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 16px;
-				font-weight: 700;
-				color: #202020;
-			}
 
-			.query {
-				flex: 1;
-			}
+		.query,
+		.search {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 16px;
+			font-weight: 700;
+			color: #202020;
+		}
 
-			.search {
-				flex: 2;
-				padding-left: 20px;
-			}
+		.query {
+			flex: 1;
 		}
-	}
 
-	.order_item_wrap {
-		padding: 10px 20px;
+		.search {
+			flex: 2;
+			padding-left: 20px;
+		}
 	}
+}
 
-	.empty_wrap {
-		margin-top: 100px;
-	}
+.order_item_wrap {
+	padding: 10px 20px;
+}
+
+.empty_wrap {
+	margin-top: 100px;
+}
 </style>

pages/order/index.vue

@@ -11,104 +11,104 @@
 				<orderCenter ref="myOrder" type="2" :dicts="dicts"></orderCenter>
 			</template>
 			<template #myCommission>
-				<myCommission ref="myCommission" type="2" :showStats="true" ></myCommission>
+				<myCommission ref="myCommission" type="2" :showStats="true"></myCommission>
 			</template>
 		</yui-tabs>
 	</view>
 </template>
 
 <script>
-	import orderCenter from "./components/orderCenter/orderCenter.vue";
-	import myCommission from "./components/commission/myCommission.vue";
+import orderCenter from "./components/orderCenter/orderCenter.vue";
+import myCommission from "./components/commission/myCommission.vue";
 
-	export default {
-		components: {
-			orderCenter,
-			myCommission
+export default {
+	components: {
+		orderCenter,
+		myCommission
+	},
+	onPullDownRefresh() {
+		uni.stopPullDownRefresh();
+		this.$refs[this.activeTel].resetData();
+	},
+	onReachBottom() {
+		this.$refs[this.activeTel].handleOnReachBottom();
+	},
+	computed: {
+		activeTel() {
+			return this.tabs.find(v => v.activeIndex === this.activeIndex).slot;
 		},
-		onPullDownRefresh() {
-			uni.stopPullDownRefresh();
-			this.$refs[this.activeTel].resetData();
-		},
-		onReachBottom() {
-			this.$refs[this.activeTel].handleOnReachBottom();
-		},
-		computed: {
-			activeTel() {
-				return this.tabs.find(v => v.activeIndex === this.activeIndex).slot;
-			},
-		},
-		data() {
-			return {
+	},
+	data() {
+		return {
+			activeIndex: 0,
+			offsetTop: 0,
+			tabs: [{
+				label: '接单中心',
+				slot: 'orderCenter',
 				activeIndex: 0,
-				offsetTop: 0,
-				tabs: [{
-						label: '接单中心',
-						slot: 'orderCenter',
-						activeIndex: 0,
-					}, {
-						label: '我的接发单',
-						slot: 'myOrder',
-						activeIndex: 1,
-					},
-					{
-						label: '我的分成',
-						slot: 'myCommission',
-						activeIndex: 2,
-					}
-				],
-				dicts : {
-					crmFormStatusDict : [],
-					crmFormCategoryDict : [],
-					crmFormStateDict : [],
-					crmFormTacticDict : [],
-				}
+			}, {
+				label: '我的接发单',
+				slot: 'myOrder',
+				activeIndex: 1,
+			},
+			{
+				label: '我的分成',
+				slot: 'myCommission',
+				activeIndex: 2,
 			}
-		},
-		mounted() {
-			// 页面初始化后的逻辑
-			uni.getSystemInfo({
-				success: (e) => {
-					let offsetTop = 0
-					// #ifdef H5
-					offsetTop = 43
-					// #endif
-					this.offsetTop = offsetTop;
-				}
-			});
-			this.$getDicts('crm_form_status').then(res => {
-				this.dicts.crmFormStatusDict = res;
-			});
-			this.$getDicts('crm_form_category').then(res => {
-				this.dicts.crmFormCategoryDict = res;
-			});
-			this.$getDicts('crm_form_state').then(res => {
-				this.dicts.crmFormStateDict = res;
-			});
-			this.$getDicts('crm_form_tactic').then(res => {
-				this.dicts.crmFormTacticDict = res;
-			});
-		},
-		methods: {
-			// tab切换事件处理
-			handleTabChange(index) {
-				this.activeIndex = index;
+			],
+			dicts: {
+				crmFormStatusDict: [],
+				crmFormCategoryDict: [],
+				crmFormStateDict: [],
+				crmFormTacticDict: [],
 			}
-		},
-		// 页面滚动触发事件
-		onPageScroll(e) {
-			//页面滚动事件
-			uni.$emit('onPageScroll', e)
-		},
-	}
+		}
+	},
+	mounted() {
+		// 页面初始化后的逻辑
+		uni.getSystemInfo({
+			success: (e) => {
+				let offsetTop = 0
+				// #ifdef H5
+				offsetTop = 43
+				// #endif
+				this.offsetTop = offsetTop;
+			}
+		});
+		this.$getDicts('crm_form_status').then(res => {
+			this.dicts.crmFormStatusDict = res;
+		});
+		this.$getDicts('crm_form_category').then(res => {
+			this.dicts.crmFormCategoryDict = res;
+		});
+		this.$getDicts('crm_form_state').then(res => {
+			this.dicts.crmFormStateDict = res;
+		});
+		this.$getDicts('crm_form_tactic').then(res => {
+			this.dicts.crmFormTacticDict = res;
+		});
+	},
+	methods: {
+		// tab切换事件处理
+		handleTabChange(index) {
+			this.activeIndex = index;
+		}
+	},
+	// 页面滚动触发事件
+	onPageScroll(e) {
+		//页面滚动事件
+		uni.$emit('onPageScroll', e)
+	},
+}
 </script>
 
 <style lang="scss" scoped>
-	::v-deep .yui-tabs__content {
-		background-color: transparent;
+::v-deep .yui-tabs__content {
+	background-color: transparent;
 
-		.yui-tabs__track {
-			background-color: transparent;
-		}
+	.yui-tabs__track {
+		background-color: transparent;
 	}
+}
 </style>

pages/orderDetail/index.vue

@@ -3,7 +3,7 @@
 		<u-navbar placeholder :autoBack="true" v-hideNav>
 			<template slot="center">
 				<view class="navbar_center_wrap">
-					<text class="name">{{item}}</text>
+					<text class="name">{{ item }}</text>
 				</view>
 			</template>
 		</u-navbar>
@@ -12,52 +12,53 @@
 </template>
 
 <script>
-	import detail from "./page/detail.vue";
-	import qs from 'qs';
-	export default {
-		components: {
-			detail
-		},
-		onPullDownRefresh() {
-			uni.stopPullDownRefresh();
-			// 刷新
-			uni.redirectTo({
-				url : `/pages/orderDetail/index?` + qs.stringify(this.params),
-			})
-		},
-		onLoad(option) {
-			const {	item , orderId , type , clueId } = option;
-			this.item = item;
-			this.orderId = orderId;
-			this.params = option;
-			this.clueId = clueId;
-			uni.setNavigationBarTitle({
-				title: item
-			});
-		},
-		data() {
-			return {
-				item: "", 
-				orderId: "",
-				clueId: "",
-				params : {},
-			}
-		},
-		mounted(){
+import detail from "./page/detail.vue";
+import qs from 'qs';
+export default {
+	components: {
+		detail
+	},
+	onPullDownRefresh() {
+		uni.stopPullDownRefresh();
+		// 刷新
+		uni.redirectTo({
+			url: `/pages/orderDetail/index?` + qs.stringify(this.params),
+		})
+	},
+	onLoad(option) {
+		const { item, orderId, type, clueId } = option;
+		this.item = item;
+		this.orderId = orderId;
+		this.params = option;
+		this.clueId = clueId;
+		uni.setNavigationBarTitle({
+			title: item
+		});
+	},
+	data() {
+		return {
+			item: "",
+			orderId: "",
+			clueId: "",
+			params: {},
 		}
+	},
+	mounted() {
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.navbar_center_wrap{
-		text-align: center;
-		width: 200rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		.pinyin{
-			font-size: 22rpx;
-			color: #b3b3c6;
-		}
+.navbar_center_wrap {
+	text-align: center;
+	width: 200rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+
+	.pinyin {
+		font-size: 22rpx;
+		color: #b3b3c6;
 	}
+}
 </style>

pages/orderDetail/page/detail.vue

@@ -145,497 +145,497 @@
 </template>
 
 <script>
-	import {
-		cloneDeep
-	} from "lodash";
-	import {
-		selectDictLabel
-	} from "@/utils/util";
-	import uploadFile from "../tabs/uploadFile/index.vue";
-	import clueFollow from "../tabs/followRecord/index.vue";
-	import receiptFormList from "../tabs/receiptFormList/receiptFormList.vue";
-	import commissionFormList from "../tabs/commissionFormList/commissionFormList.vue";
-	import sendInfo from "../tabs/sendInfo/index.vue";
-	export default {
-		components: {
-			uploadFile,
-			clueFollow,
-			receiptFormList,
-			commissionFormList,
-			sendInfo
+import {
+	cloneDeep
+} from "lodash";
+import {
+	selectDictLabel
+} from "@/utils/util";
+import uploadFile from "../tabs/uploadFile/index.vue";
+import clueFollow from "../tabs/followRecord/index.vue";
+import receiptFormList from "../tabs/receiptFormList/receiptFormList.vue";
+import commissionFormList from "../tabs/commissionFormList/commissionFormList.vue";
+import sendInfo from "../tabs/sendInfo/index.vue";
+export default {
+	components: {
+		uploadFile,
+		clueFollow,
+		receiptFormList,
+		commissionFormList,
+		sendInfo
+	},
+	props: {
+		orderId: {
+			type: [String, Number],
+			required: true,
 		},
-		props: {
-			orderId: {
-				type: [String, Number],
-				required: true,
-			},
-			clueId: {
-				type: [String, Number],
-				required: true,
-			},
-			params: {
-				type: Object,
-				required: true,
-			},
+		clueId: {
+			type: [String, Number],
+			required: true,
 		},
-		data() {
-			return {
-				showModal: false,
-				showStateSelect: false,
-				receiptDetail: {},
-				checkTags: [],
-				clueTagGroupVoList: [],
-				crmFormCategoryDict: [],
-				crmFormTacticDict: [],
-				crmFormStateDict: [],
-				crmHandelStatusDict: [],
-				tabs: [{
-						label: "发单信息",
-						slot: "sendInfo",
-					},
-					{
-						label: "聊天附件",
-						slot: "chatFile",
-					},
-					{
-						label: "报价附件",
-						slot: "quoteFile",
-					},
-					{
-						label: "高清图附件",
-						slot: "hdImageFile",
-					},
-					{
-						label: "其他附件",
-						slot: "otherFile",
-					},
-					{
-						label: "前端附件",
-						slot: "frontendFile",
-					},
-					{
-						label: "前端跟进",
-						slot: "frontendFollow",
-					},
-					{
-						label: "跟进记录",
-						slot: "followRecord",
-					},
-					{
-						label: "收单信息",
-						slot: "receiptInfo",
-					},
-					{
-						label: "收单分成",
-						slot: "commissionInfo",
-					},
-				],
-				activeIndex: 0,
-			};
+		params: {
+			type: Object,
+			required: true,
 		},
-		methods: {
-			async hanldeTagClose(tag) {
-				const {
-					id,
-					tags
-				} = this.receiptDetail;
-				const copyTags = cloneDeep(tags);
-				if (id == null) {
-					uni.$u.toast("修改异常");
-					return;
-				}
-				const index = copyTags.findIndex((v) => v.id === tag.id);
-				if (index !== -1) {
-					copyTags.splice(index, 1);
-					const allTags = copyTags.map((v) => v.id).join(",");
-					await uni.$u.api.updateTags({
-						id: id,
-						allTags,
-					});
-					this.receiptDetail.tags = copyTags;
-					this.checkTags = this.receiptDetail.tags.map((v) => v.id);
-				}
-			},
-			async handleClueTagConfirm() {
-				const allTags = this.checkTags.join(",");
-				await uni.$u.api.updateTags({
-					id: this.receiptDetail.id,
-					allTags,
-				});
-				this.getDetail();
-			},
-			handleAddClueTag() {
-				this.$refs.clueTag.showModal();
+	},
+	data() {
+		return {
+			showModal: false,
+			showStateSelect: false,
+			receiptDetail: {},
+			checkTags: [],
+			clueTagGroupVoList: [],
+			crmFormCategoryDict: [],
+			crmFormTacticDict: [],
+			crmFormStateDict: [],
+			crmHandelStatusDict: [],
+			tabs: [{
+				label: "发单信息",
+				slot: "sendInfo",
 			},
-			async handleStateConfirm(e) {
-				const state = e.dictValue;
-				await uni.$u.api.updateOrderState({
-					id: this.receiptDetail.id,
-					state,
-				});
-				uni.$u.toast("操作成功");
+			{
+				label: "聊天附件",
+				slot: "chatFile",
 			},
-			defaultText(text) {
-				return text ? text : "-";
+			{
+				label: "报价附件",
+				slot: "quoteFile",
 			},
-			crmFormCategoryFormat(v) {
-				return v ? selectDictLabel(this.crmFormCategoryDict, v) : "-";
+			{
+				label: "高清图附件",
+				slot: "hdImageFile",
 			},
-			crmFormTacticFormat(v) {
-				return v ? selectDictLabel(this.crmFormTacticDict, v) : "-";
+			{
+				label: "其他附件",
+				slot: "otherFile",
 			},
-			crmFollowStatusFormat(v) {
-				return selectDictLabel(this.crmHandelStatusDict, v);
+			{
+				label: "前端附件",
+				slot: "frontendFile",
 			},
-			selectDictLabel,
-			handleCopy(item) {
-				uni.setClipboardData({
-					data: item.phone,
-					success: function() {
-						uni.$u.toast("复制成功");
-					},
-				});
+			{
+				label: "前端跟进",
+				slot: "frontendFollow",
 			},
-			// 添加联系人
-			handleCallPhone() {
-				uni.makePhoneCall({
-					phoneNumber: this.receiptDetail.phone,
-					success: () => {
-						this.$store.commit("call/SET_FORM", {
-							clueId: this.receiptDetail.clueId,
-							type: "3",
-							callee: this.receiptDetail.phone,
-						});
-					},
-				});
-			},
-			// 添加跟进记录
-			handleAddFollow() {
-				uni.navigateTo({
-					url: `/pages/addFollow/index?orderId=${this.orderId}`,
-				});
+			{
+				label: "跟进记录",
+				slot: "followRecord",
 			},
-			// 跳转到收单表单页面
-			handleAddReceiptForm() {
-				uni.navigateTo({
-					url: `/pages/receiptForm/index?orderId=${this.orderId}&clueId=${this.clueId}`,
-				});
+			{
+				label: "收单信息",
+				slot: "receiptInfo",
 			},
-			// 跳转到新增分成页面
-			handleAddCommission() {
-				if(this.receiptDetail.status != "3"){
-					uni.$u.toast("未收单不可添加分成");
-					return;
-				}
-				uni.navigateTo({
-					url: `/pages/commissionForm/index?sendFormId=${this.orderId}&clueId=${this.clueId}`,
-				});
+			{
+				label: "收单分成",
+				slot: "commissionInfo",
 			},
-			handleUploadRecord() {
-				uni.navigateTo({
-					url: `/pages/uploadRecord/index?clueId=${this.orderId}`,
+			],
+			activeIndex: 0,
+		};
+	},
+	methods: {
+		async hanldeTagClose(tag) {
+			const {
+				id,
+				tags
+			} = this.receiptDetail;
+			const copyTags = cloneDeep(tags);
+			if (id == null) {
+				uni.$u.toast("修改异常");
+				return;
+			}
+			const index = copyTags.findIndex((v) => v.id === tag.id);
+			if (index !== -1) {
+				copyTags.splice(index, 1);
+				const allTags = copyTags.map((v) => v.id).join(",");
+				await uni.$u.api.updateTags({
+					id: id,
+					allTags,
 				});
-			},
-			// 接单操作
-			async handleOrderForm() {
-				if (this.receiptDetail.status === "2") {
-					uni.$u.toast("当前订单已经被接单");
-					return;
-				}
-				uni.showModal({
-					title: "提示",
-					content: "确定要接单吗？",
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								await uni.$u.api.oderForm({
-									status: "2",
-									id: this.receiptDetail.id,
-								});
-								uni.$u.toast("接单成功");
-								this.getDetail(); // 刷新详情
-							} catch (error) {
-								uni.$u.toast("接单失败");
-							}
+				this.receiptDetail.tags = copyTags;
+				this.checkTags = this.receiptDetail.tags.map((v) => v.id);
+			}
+		},
+		async handleClueTagConfirm() {
+			const allTags = this.checkTags.join(",");
+			await uni.$u.api.updateTags({
+				id: this.receiptDetail.id,
+				allTags,
+			});
+			this.getDetail();
+		},
+		handleAddClueTag() {
+			this.$refs.clueTag.showModal();
+		},
+		async handleStateConfirm(e) {
+			const state = e.dictValue;
+			await uni.$u.api.updateOrderState({
+				id: this.receiptDetail.id,
+				state,
+			});
+			uni.$u.toast("操作成功");
+		},
+		defaultText(text) {
+			return text ? text : "-";
+		},
+		crmFormCategoryFormat(v) {
+			return v ? selectDictLabel(this.crmFormCategoryDict, v) : "-";
+		},
+		crmFormTacticFormat(v) {
+			return v ? selectDictLabel(this.crmFormTacticDict, v) : "-";
+		},
+		crmFollowStatusFormat(v) {
+			return selectDictLabel(this.crmHandelStatusDict, v);
+		},
+		selectDictLabel,
+		handleCopy(item) {
+			uni.setClipboardData({
+				data: item.phone,
+				success: function () {
+					uni.$u.toast("复制成功");
+				},
+			});
+		},
+		// 添加联系人
+		handleCallPhone() {
+			uni.makePhoneCall({
+				phoneNumber: this.receiptDetail.phone,
+				success: () => {
+					this.$store.commit("call/SET_FORM", {
+						clueId: this.receiptDetail.clueId,
+						type: "3",
+						callee: this.receiptDetail.phone,
+					});
+				},
+			});
+		},
+		// 添加跟进记录
+		handleAddFollow() {
+			uni.navigateTo({
+				url: `/pages/addFollow/index?orderId=${this.orderId}`,
+			});
+		},
+		// 跳转到收单表单页面
+		handleAddReceiptForm() {
+			uni.navigateTo({
+				url: `/pages/receiptForm/index?orderId=${this.orderId}&clueId=${this.clueId}`,
+			});
+		},
+		// 跳转到新增分成页面
+		handleAddCommission() {
+			if (this.receiptDetail.status != "3") {
+				uni.$u.toast("未收单不可添加分成");
+				return;
+			}
+			uni.navigateTo({
+				url: `/pages/commissionForm/index?sendFormId=${this.orderId}&clueId=${this.clueId}`,
+			});
+		},
+		handleUploadRecord() {
+			uni.navigateTo({
+				url: `/pages/uploadRecord/index?clueId=${this.orderId}`,
+			});
+		},
+		// 接单操作
+		async handleOrderForm() {
+			if (this.receiptDetail.status === "2") {
+				uni.$u.toast("当前订单已经被接单");
+				return;
+			}
+			uni.showModal({
+				title: "提示",
+				content: "确定要接单吗？",
+				success: async (res) => {
+					if (res.confirm) {
+						try {
+							await uni.$u.api.oderForm({
+								status: "2",
+								id: this.receiptDetail.id,
+							});
+							uni.$u.toast("接单成功");
+							this.getDetail(); // 刷新详情
+						} catch (error) {
+							uni.$u.toast("接单失败");
 						}
-					},
-				});
-			},
-			// 收单操作
-			async handleReceiptForm() {
-				if (
-					this.receiptDetail.status === "3" ||
-					this.receiptDetail.status === "4"
-				) {
-					uni.$u.toast("当前订单已经被收单或未收");
-					return;
-				}
-				uni.showModal({
-					title: "提示",
-					content: "确定要收单吗？",
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								await uni.$u.api.oderForm({
-									status: "3",
-									id: this.receiptDetail.id,
-								});
-								uni.$u.toast("收单成功");
-								this.getDetail(); // 刷新详情
-							} catch (error) {
-								uni.$u.toast("收单失败");
-							}
+					}
+				},
+			});
+		},
+		// 收单操作
+		async handleReceiptForm() {
+			if (
+				this.receiptDetail.status === "3" ||
+				this.receiptDetail.status === "4"
+			) {
+				uni.$u.toast("当前订单已经被收单或未收");
+				return;
+			}
+			uni.showModal({
+				title: "提示",
+				content: "确定要收单吗？",
+				success: async (res) => {
+					if (res.confirm) {
+						try {
+							await uni.$u.api.oderForm({
+								status: "3",
+								id: this.receiptDetail.id,
+							});
+							uni.$u.toast("收单成功");
+							this.getDetail(); // 刷新详情
+						} catch (error) {
+							uni.$u.toast("收单失败");
 						}
-					},
-				});
-			},
-			// 未收操作
-			async handleDenialForm() {
-				if (
-					this.receiptDetail.status === "3" ||
-					this.receiptDetail.status === "4"
-				) {
-					uni.$u.toast("当前订单已经被收单或未收");
-					return;
-				}
-				uni.showModal({
-					title: "提示",
-					content: "确定要标记为未收吗？",
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								await uni.$u.api.oderForm({
-									status: "4",
-									id: this.receiptDetail.id,
-								});
-								uni.$u.toast("标记未收成功");
-								this.getDetail(); // 刷新详情
-							} catch (error) {
-								uni.$u.toast("操作失败");
-							}
+					}
+				},
+			});
+		},
+		// 未收操作
+		async handleDenialForm() {
+			if (
+				this.receiptDetail.status === "3" ||
+				this.receiptDetail.status === "4"
+			) {
+				uni.$u.toast("当前订单已经被收单或未收");
+				return;
+			}
+			uni.showModal({
+				title: "提示",
+				content: "确定要标记为未收吗？",
+				success: async (res) => {
+					if (res.confirm) {
+						try {
+							await uni.$u.api.oderForm({
+								status: "4",
+								id: this.receiptDetail.id,
+							});
+							uni.$u.toast("标记未收成功");
+							this.getDetail(); // 刷新详情
+						} catch (error) {
+							uni.$u.toast("操作失败");
 						}
-					},
-				});
-			},
-			// 撤销操作
-			async handleDelete() {
-				uni.showModal({
-					title: "提示",
-					content: "是否确定撤销?",
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								await uni.$u.api.deleteOrder([this.receiptDetail.id]);
-								uni.$u.toast("撤销成功");
-								// 撤销后返回上一页
-								setTimeout(() => {
-									uni.navigateBack();
-								}, 1500);
-							} catch (error) {
-								uni.$u.toast("撤销失败");
-							}
+					}
+				},
+			});
+		},
+		// 撤销操作
+		async handleDelete() {
+			uni.showModal({
+				title: "提示",
+				content: "是否确定撤销?",
+				success: async (res) => {
+					if (res.confirm) {
+						try {
+							await uni.$u.api.deleteOrder([this.receiptDetail.id]);
+							uni.$u.toast("撤销成功");
+							// 撤销后返回上一页
+							setTimeout(() => {
+								uni.navigateBack();
+							}, 1500);
+						} catch (error) {
+							uni.$u.toast("撤销失败");
 						}
-					},
-				});
-			},
-			// 初始化详情页
-			async handleInit() {
-				this.getDetail();
-				this.$getDicts("crm_form_category").then((res) => {
-					this.crmFormCategoryDict = res;
-				});
-				this.$getDicts("crm_form_tactic").then((res) => {
-					this.crmFormTacticDict = res;
-				});
-				this.$getDicts("crm_form_state").then((res) => {
-					this.crmFormStateDict = res;
-				});
-				this.$getDicts("crm_form_status").then((res) => {
-					this.crmHandelStatusDict = res;
-				});
-				uni.$u.api
-					.getClueTagGroupVoList({
-						tagGroupApplication: "2",
-					})
-					.then(({
-						data
-					}) => {
-						this.clueTagGroupVoList = data;
-					});
-			},
-			getDetail() {
-				uni.$u.api
-					.getClueSendFormVoByOrderId({
-						id: this.orderId,
-					})
-					.then((res) => {
-						this.receiptDetail = res.data;
-						this.checkTags = this.receiptDetail.tags ?
-							this.receiptDetail.tags.map((v) => v.id) :
-							[];
-					});
-			},
+					}
+				},
+			});
 		},
-		created() {
-			this.handleInit();
-			uni.$on('updateSendFormSuccess', () => {
-				this.getDetail();
+		// 初始化详情页
+		async handleInit() {
+			this.getDetail();
+			this.$getDicts("crm_form_category").then((res) => {
+				this.crmFormCategoryDict = res;
+			});
+			this.$getDicts("crm_form_tactic").then((res) => {
+				this.crmFormTacticDict = res;
+			});
+			this.$getDicts("crm_form_state").then((res) => {
+				this.crmFormStateDict = res;
 			});
+			this.$getDicts("crm_form_status").then((res) => {
+				this.crmHandelStatusDict = res;
+			});
+			uni.$u.api
+				.getClueTagGroupVoList({
+					tagGroupApplication: "2",
+				})
+				.then(({
+					data
+				}) => {
+					this.clueTagGroupVoList = data;
+				});
 		},
-		beforeDestroy() {
-			uni.$off('updateSendFormSuccess');
-		}
-	};
+		getDetail() {
+			uni.$u.api
+				.getClueSendFormVoByOrderId({
+					id: this.orderId,
+				})
+				.then((res) => {
+					this.receiptDetail = res.data;
+					this.checkTags = this.receiptDetail.tags ?
+						this.receiptDetail.tags.map((v) => v.id) :
+						[];
+				});
+		},
+	},
+	created() {
+		this.handleInit();
+		uni.$on('updateSendFormSuccess', () => {
+			this.getDetail();
+		});
+	},
+	beforeDestroy() {
+		uni.$off('updateSendFormSuccess');
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.clueTagsSelect {
-		height: 0;
-		overflow: hidden;
-	}
+.clueTagsSelect {
+	height: 0;
+	overflow: hidden;
+}
 
-	.clue_tag_wrap {
-		display: flex;
-		align-items: center;
-		background-color: #fff;
-		padding: 0 10px;
-		margin: 20px 0;
-		flex-wrap: wrap;
-		min-height: 50px;
+.clue_tag_wrap {
+	display: flex;
+	align-items: center;
+	background-color: #fff;
+	padding: 0 10px;
+	margin: 20px 0;
+	flex-wrap: wrap;
+	min-height: 50px;
 
-		.clue_tag_add_btn {
-			font-size: 14px;
-			color: #108cff;
-		}
+	.clue_tag_add_btn {
+		font-size: 14px;
+		color: #108cff;
 	}
+}
 
-	.clue_state_wrap {
-		background-color: #fff;
-		padding: 10px;
-		margin-bottom: 20px;
-		display: flex;
-		align-items: center;
+.clue_state_wrap {
+	background-color: #fff;
+	padding: 10px;
+	margin-bottom: 20px;
+	display: flex;
+	align-items: center;
 
-		.top_left {
-			font-size: 16px;
-			flex: 0 0 50px;
-		}
+	.top_left {
+		font-size: 16px;
+		flex: 0 0 50px;
+	}
 
-		.steps_wrap {
-			flex: 1;
-		}
+	.steps_wrap {
+		flex: 1;
 	}
+}
 
-	.order_action_wrap {
-		padding: 10px;
-		margin: 15px 0;
-		background: #fff;
-		display: flex;
-		align-items: center;
+.order_action_wrap {
+	padding: 10px;
+	margin: 15px 0;
+	background: #fff;
+	display: flex;
+	align-items: center;
 
-		.action_title {
-			font-size: 16px;
-			flex: 0 0 50px;
-		}
+	.action_title {
+		font-size: 16px;
+		flex: 0 0 50px;
+	}
 
-		.last_status {
-			color: #c0c0c7;
-			font-size: 14px;
-		}
+	.last_status {
+		color: #c0c0c7;
+		font-size: 14px;
+	}
 
-		.action_buttons {
-			display: grid;
-			grid-template-columns: repeat(2, 1fr);
-			gap: 10px;
+	.action_buttons {
+		display: grid;
+		grid-template-columns: repeat(2, 1fr);
+		gap: 10px;
 
-			::v-deep .u-button {
-				height: 30px !important;
-				font-size: 12px !important;
-				border-radius: 8px !important;
-				border: 1px solid #e2e8f0 !important;
-				background: #ffffff !important;
-				color: #2d3748 !important;
-				font-weight: 500 !important;
-				box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1) !important;
-				transition: all 0.3s ease !important;
+		::v-deep .u-button {
+			height: 30px !important;
+			font-size: 12px !important;
+			border-radius: 8px !important;
+			border: 1px solid #e2e8f0 !important;
+			background: #ffffff !important;
+			color: #2d3748 !important;
+			font-weight: 500 !important;
+			box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1) !important;
+			transition: all 0.3s ease !important;
 
-				&.u-button--success {
-					background: #ffd025 !important;
-					color: white !important;
-					border-color: #ffd025 !important;
-				}
+			&.u-button--success {
+				background: #ffd025 !important;
+				color: white !important;
+				border-color: #ffd025 !important;
+			}
 
-				// 特别样式化不同按钮类型
-				&.u-button--primary {
-					background: #35dbd9 !important;
-					color: white !important;
-					border-color: #35dbd9 !important;
-				}
+			// 特别样式化不同按钮类型
+			&.u-button--primary {
+				background: #35dbd9 !important;
+				color: white !important;
+				border-color: #35dbd9 !important;
+			}
 
-				&.u-button--warning {
-					background: #ba9fb0 !important;
-					color: white !important;
-					border-color: #ba9fb0 !important;
-				}
+			&.u-button--warning {
+				background: #ba9fb0 !important;
+				color: white !important;
+				border-color: #ba9fb0 !important;
+			}
 
-				&.u-button--error {
-					background: #e53e3e !important;
-					color: white !important;
-					border-color: #e53e3e !important;
-				}
+			&.u-button--error {
+				background: #e53e3e !important;
+				color: white !important;
+				border-color: #e53e3e !important;
 			}
 		}
 	}
+}
 
-	.clueDetail_tabber {
-		::v-deep .u-tabbar__content {
-			background: #108cff;
-			border-top-right-radius: 10px;
-			border-top-left-radius: 10px;
-		}
+.clueDetail_tabber {
+	::v-deep .u-tabbar__content {
+		background: #108cff;
+		border-top-right-radius: 10px;
+		border-top-left-radius: 10px;
 	}
+}
 
-	.clueDetail_wrap {
-		.telPhone {
-			display: flex;
-			background: #fff;
-			padding: 20px;
-			justify-content: space-between;
+.clueDetail_wrap {
+	.telPhone {
+		display: flex;
+		background: #fff;
+		padding: 20px;
+		justify-content: space-between;
 
-			.left {
-				display: flex;
-			}
+		.left {
+			display: flex;
+		}
 
-			.copy_btn {
-				color: #4fa5fe;
-				margin-left: 10px;
-			}
+		.copy_btn {
+			color: #4fa5fe;
+			margin-left: 10px;
 		}
+	}
 
-		.clueDetail_top_info {
-			display: flex;
-			flex-wrap: wrap;
-			background-color: #ffffff;
-			padding-top: 20px;
-			margin: 18px 0;
+	.clueDetail_top_info {
+		display: flex;
+		flex-wrap: wrap;
+		background-color: #ffffff;
+		padding-top: 20px;
+		margin: 18px 0;
 
-			.top_info_item {
-				width: 33.33%;
-				text-align: center;
-				margin-bottom: 20px;
+		.top_info_item {
+			width: 33.33%;
+			text-align: center;
+			margin-bottom: 20px;
 
-				.top {
-					font-size: 15px;
-					color: #202020;
-					margin-bottom: 5px;
-					font-weight: bold;
-				}
+			.top {
+				font-size: 15px;
+				color: #202020;
+				margin-bottom: 5px;
+				font-weight: bold;
+			}
 
-				.bottom {
-					font-size: 15px;
-					color: #c0c0c7;
-				}
+			.bottom {
+				font-size: 15px;
+				color: #c0c0c7;
 			}
 		}
 	}
+}
 </style>

pages/orderDetail/tabs/receiptFormList/receiptFormList.vue

@@ -7,7 +7,7 @@
 			<u-empty text="暂无收单数据"></u-empty>
 		</view>
 		<view v-else class="card_list">
-			<view class="card_item" v-for="(row) in receiptFormList" :key="row.id" >
+			<view class="card_item" v-for="(row) in receiptFormList" :key="row.id">
 				<view class="card_header">
 					<view class="card_title">{{ row.item || '-' }}</view>
 					<view class="card_actions">
@@ -44,7 +44,7 @@ export default {
 	props: {
 		receiptDetail: {
 			type: Object,
-			default: () => {}
+			default: () => { }
 		},
 		sendFormId: {
 			type: [Number, String],
@@ -102,7 +102,7 @@ export default {
 		/** 修改按钮操作 */
 		async handleUpdate(row) {
 			uni.navigateTo({
-			  url: `/pages/receiptForm/index?orderId=${this.sendFormId}&clueId=${this.clueId}&receiptId=${row.id}`,
+				url: `/pages/receiptForm/index?orderId=${this.sendFormId}&clueId=${this.clueId}&receiptId=${row.id}`,
 			});
 		},
 
@@ -136,12 +136,12 @@ export default {
 	},
 	created() {
 		this.getList();
-		uni.$on('addReceiptFormSuccess',()=>{
+		uni.$on('addReceiptFormSuccess', () => {
 			this.getList();
 		});
 	},
-	beforeDestroy(){
-		uni.$off('addReceiptFormSuccess');  
+	beforeDestroy() {
+		uni.$off('addReceiptFormSuccess');
 	}
 }
 </script>
@@ -206,7 +206,7 @@ export default {
 .info_value {
 	color: #202020;
 	flex: 1;
-	
+
 	&.highlight {
 		color: #f56c6c;
 		font-weight: bold;

pages/orderDetail/tabs/uploadFile/index.vue

@@ -14,43 +14,23 @@
 		<view class="fileList_wrap" v-if="!loading && dataList.length > 0">
 			<view class="file_item_wrap" v-if="imgList.length > 0">
 				<view class="item_title">图片文件:</view>
-				<mk-upload 
-					:imgList="imgList" 
-					@onDelete="handleDelFile" 
-					:controlShow="false" 
-					type="image"
-					@onPreviewTake="handlePreviewImage"
-				></mk-upload>
+				<mk-upload :imgList="imgList" @onDelete="handleDelFile" :controlShow="false" type="image"
+					@onPreviewTake="handlePreviewImage"></mk-upload>
 			</view>
 			<view class="file_item_wrap" v-if="recordList.length > 0">
 				<view class="item_title">录音文件:</view>
-				<mk-upload 
-					:imgList="recordList" 
-					@onDelete="handleDelFile" 
-					:controlShow="false" 
-					type="record" 
-					@onPreviewTake="handlePreviewRecord"
-				></mk-upload>
+				<mk-upload :imgList="recordList" @onDelete="handleDelFile" :controlShow="false" type="record"
+					@onPreviewTake="handlePreviewRecord"></mk-upload>
 			</view>
 			<view class="file_item_wrap" v-if="videoList.length > 0">
 				<view class="item_title">视频文件:</view>
-				<mk-upload 
-					:imgList="videoList" 
-					@onDelete="handleDelFile" 
-					:controlShow="false" 
-					type="video"
-					@onPreviewTake="handlePreviewVideo"
-				></mk-upload>
+				<mk-upload :imgList="videoList" @onDelete="handleDelFile" :controlShow="false" type="video"
+					@onPreviewTake="handlePreviewVideo"></mk-upload>
 			</view>
 			<view class="file_item_wrap" v-if="otherList.length > 0">
 				<view class="item_title">其他文件:</view>
-				<mk-upload 
-					:imgList="otherList" 
-					@onDelete="handleDelFile" 
-					:controlShow="false" 
-					type="file"
-					@onPreviewTake="handlePreviewFile"
-				></mk-upload>
+				<mk-upload :imgList="otherList" @onDelete="handleDelFile" :controlShow="false" type="file"
+					@onPreviewTake="handlePreviewFile"></mk-upload>
 			</view>
 		</view>
 
@@ -65,31 +45,16 @@
 		</view>
 
 		<!-- 图片预览 -->
-		<u-image
-			ref="previewImg"
-			:src="previewImageSrc"
-			mode="widthFix"
-			v-if="previewImageSrc"
-			@click="previewImageSrc = ''"
-		></u-image>
+		<u-image ref="previewImg" :src="previewImageSrc" mode="widthFix" v-if="previewImageSrc"
+			@click="previewImageSrc = ''"></u-image>
 
 		<!-- 文件预览模态框 -->
 		<u-modal :show="showFileModal" :title="currentFile.fileName" @confirm="handleFileConfirm">
 			<view v-if="currentFile && currentFile.fileUrl" class="currentFile_wrap">
-				<audio 
-					style="text-align: left" 
-					:src="currentFile.fileUrl" 
-					:name="'点击播放'" 
-					controls
-					v-if="['wav','mp3','aac','wma'].includes(currentFile.fileSuffix)"
-				></audio>
-				<video 
-					:src="currentFile.fileUrl" 
-					mode="" 
-					class="currentFile_image" 
-					v-else-if="showFileModal" 
-					show-fullscreen-btn
-				></video>
+				<audio style="text-align: left" :src="currentFile.fileUrl" :name="'点击播放'" controls
+					v-if="['wav', 'mp3', 'aac', 'wma'].includes(currentFile.fileSuffix)"></audio>
+				<video :src="currentFile.fileUrl" mode="" class="currentFile_image" v-else-if="showFileModal"
+					show-fullscreen-btn></video>
 			</view>
 			<view v-else>
 				文件异常
@@ -122,7 +87,7 @@ import mkUpload from "@/components/mk-upload/mk-upload.vue"
 import upload from '@/mixins/upload';
 export default {
 	name: 'UploadFile',
-	mixins : [upload],
+	mixins: [upload],
 	components: {
 		mkUpload
 	},
@@ -135,13 +100,13 @@ export default {
 	},
 	computed: {
 		imgList() {
-			return this.dataList.filter(v => ['png','gif','bmp','jpg','jpeg','webp'].includes((v.fileSuffix || '').toLowerCase()));
+			return this.dataList.filter(v => ['png', 'gif', 'bmp', 'jpg', 'jpeg', 'webp'].includes((v.fileSuffix || '').toLowerCase()));
 		},
 		recordList() {
-			return this.dataList.filter(v => ['wav','mp3','aac','wma'].includes((v.fileSuffix || '').toLowerCase()));
+			return this.dataList.filter(v => ['wav', 'mp3', 'aac', 'wma'].includes((v.fileSuffix || '').toLowerCase()));
 		},
 		videoList() {
-			return this.dataList.filter(v => ['avi','mkv','mov','wmv','mp4'].includes((v.fileSuffix || '').toLowerCase()));
+			return this.dataList.filter(v => ['avi', 'mkv', 'mov', 'wmv', 'mp4'].includes((v.fileSuffix || '').toLowerCase()));
 		},
 		otherList() {
 			const list = this.imgList.concat(this.recordList).concat(this.videoList);
@@ -166,13 +131,13 @@ export default {
 		}
 	},
 	methods: {
-		async handleUploadSuccess(){
+		async handleUploadSuccess() {
 			await uni.$u.api.saveClueFile({
-				clueId : this.clueId,
-				list : this.uploadList,
+				clueId: this.clueId,
+				list: this.uploadList,
 				sourceId: this.sourceId,
-				type : this.type,
-				orderFileType : this.orderFileType
+				type: this.type,
+				orderFileType: this.orderFileType
 			});
 			uni.$u.toast("上传成功");
 			// 清空
@@ -356,10 +321,10 @@ export default {
 	padding: 0;
 	color: #666666;
 	font-size: 24rpx;
-	
+
 	.file_item_wrap {
 		margin-bottom: 20px;
-		
+
 		.item_title {
 			margin-bottom: 10px;
 			font-weight: bold;

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -2,7 +2,7 @@
     <view class="orderDetailNewView">
 
         <view class="page-item" v-show="activeIndex === 0">
-            <pageOne @handleNextClick="handleNextClick" :orderDetail="detail" />
+            <pageOne @handleNextClick="handleNextClick" :orderDetail="detail" :orderId="orderId" />
         </view>
         <view class="page-item" v-show="activeIndex === 1">
             <pageTwo @handleNextClick="handleNextClick" :orderDetail="detail" />
@@ -32,6 +32,14 @@ export default {
         detail: {
             type: Object,
             default: () => { },
+        },
+        topInfo: {
+            type: Object,
+            default: () => { },
+        },
+        orderId: {
+            type: String,
+            default: ''
         }
     },
     components: {
@@ -71,7 +79,7 @@ export default {
                 // "remark": ,    //发单备注，先不传
                 "params": this.detail.params,     //看接口文档
                 "id": this.detail.receiptId,
-                // "sendFormId": "25", //接单中心的id
+                "sendFormId": this.orderId, //接单中心的id，就是接单中心列表的id（发单id）
                 "clueId": this.detail.clueId,
                 "item": this.detail.item,
                 "brand": this.detail.brand,
@@ -84,7 +92,7 @@ export default {
                 // "freight": 30,         //运费page4加上
                 // "checkCodeFee": null,  //查码费
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
-                // "sellingPrice": 90002,   //实际价格（售价）顶上tab里面的第三栏
+                "sellingPrice": this.topInfo.price.replace(/,/g, ''),   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
                 // "receiptRemark":     //"收单之后还需再跟进", 先不传
                 // "repairAmount": null, //维修总金额 ，先不传
@@ -107,28 +115,48 @@ export default {
         // 保存实物图数据
         saveDetailImagesData() {
             // 上传二进制文件
-            this.allFroms.formOne.truePic.forEach(async (item) => {
-                await uni.$u.api.uploadFile(item);
-            })
-        },// 保存聊天图数据
-        saveChatPicData() {
-            this.allFroms.formOne.truePic.forEach(async (item) => {
-                await uni.$u.api.uploadFile(item);
-            })
-        },// 保存高清图数据
-        saveHighDefinitionPicData() {
-            this.allFroms.formOne.truePic.forEach(async (item) => {
-                await uni.$u.api.uploadFile(item);
-            })
+            // console.log("上传文件成功:1", this.allFroms.formOne.truePic)
+
+            // this.allFroms.formOne.truePic.forEach(async (item) => {
+            //     const res = await uni.$u.api.uploadFile(item);
+            //     console.log("上传文件成功:", res)
+            // })
         },
+        // // 保存聊天图数据
+        // saveChatPicData() {
+        //     this.allFroms.formOne.truePic.forEach(async (item) => {
+        //         await uni.$u.api.uploadFile(item);
+        //     })
+        // },
+        // // 保存高清图数据
+        // saveHighDefinitionPicData() {
+        //     this.allFroms.formOne.truePic.forEach(async (item) => {
+        //         await uni.$u.api.uploadFile(item);
+        //     })
+        // },
         handleNeedSave({ nowPage, form }) {
-            console.log("nowPage:", nowPage)
-            console.log("pageThreeForm:", form)
             this.pageThreeForm = form;
 
             //调用接口保存收单表单
             this.saveData();
-            this.saveDetailImagesData();
+            // this.saveDetailImagesData();
+
+            //保存数据之后调支付接口
+            this.pay();
+        },
+        //支付
+        async pay() {
+            // 开始支付
+            console.log('开始支付')
+            try {
+                const response = await uni.$u.api.saveOrderFileAndTransfer({
+                    id: this.orderId,
+                    clueId: this.detail.clueId//线索id
+                })
+                uni.$u.toast(response.msg || '支付成功')
+            } catch (error) {
+                uni.$u.toast(`支付失败：${response.msg}`)
+            }
         }
 
     }

pages/orderDetailNew/components/pageOne.vue

@@ -5,7 +5,7 @@
                 <div class="page-itemOne-title">图片资料</div>
             </u-col>
             <u-col span="3.5">
-                <u-button size="small"
+                <u-button size="small" @click="copyAllImages"
                     style="border-radius: 20rpx;border-color: #007AFF;color: #007AFF;">复制全部图片</u-button>
             </u-col>
         </u-row>
@@ -15,9 +15,9 @@
             <view class="card-title">实物图</view>
             <view class="image-upload-container">
                 <view class="image-list">
-                    <view class="image-item" v-for="(item, index) in form.truePic" :key="'truePic-' + index">
-                        <pic-comp :src="item"></pic-comp>
-                        <view class="delete-btn" @click="deleteImage('truePic', index)">×</view>
+                    <view class="image-item" v-for="(item, index) in trueUploadList" :key="'truePic-' + index">
+                        <pic-comp :src="item.fileUrl"></pic-comp>
+                        <view class="delete-btn" @click="deleteImage('truePic', item)">×</view>
                     </view>
                     <view class="upload-btn" @click="uploadImage('truePic')">
                         <u-icon name="plus" size="40" color="#999"></u-icon>
@@ -31,9 +31,10 @@
             <view class="card-title">聊天记录</view>
             <view class="image-upload-container">
                 <view class="image-list">
-                    <view class="image-item" v-for="(item, index) in form.chatRecords" :key="'chatRecords-' + index">
-                        <pic-comp :src="item"></pic-comp>
-                        <view class="delete-btn" @click="deleteImage('chatRecords', index)">×</view>
+                    <view class="image-item" v-for="(item, index) in chatRecordsUploadList"
+                        :key="'chatRecords-' + index">
+                        <pic-comp :src="item.fileUrl"></pic-comp>
+                        <view class="delete-btn" @click="deleteImage('chatRecords', item)">×</view>
                     </view>
                     <view class="upload-btn" @click="uploadImage('chatRecords')">
                         <u-icon name="plus" size="40" color="#999"></u-icon>
@@ -95,6 +96,10 @@ export default {
         orderDetail: {
             type: Object,
             default: () => { },
+        },
+        orderId: {
+            type: String,
+            default: '',
         }
     },
     components: {
@@ -102,30 +107,35 @@ export default {
     },
     data() {
         return {
-            form: {
-                truePic: [],
-                chatRecords: [],
-            },
+            //展示的图片列表
+            trueUploadList: [],
+            chatRecordsUploadList: [],
+            // 待绑定的图片列表
+            bindList: [],
         }
     },
-    beforeMount() {
-        setTimeout(() => {
-            console.log('orderDetail', this.orderDetail);
-        }, 5000)
+    watch: {
+        // 监听 props 变化，触发请求
+        orderDetail: {
+            handler(newVal) {
+                if (newVal) { // 确保 props 有值再执行
+                    this.getList('2', '1');
+                    this.getList('2', '2');
+                }
+            }
+        }
     },
     methods: {
-        // 上传图片
+        // 选择图片
         uploadImage(type) {
             uni.chooseImage({
-                count: 9 - this.form[type].length, // 最多选择9张
+                count: 9, // 最多选择9张
                 sizeType: ['compressed'], // 压缩图片
                 sourceType: ['album', 'camera'], // 从相册选择或拍照
                 success: (res) => {
                     const tempFilePaths = res.tempFilePaths
-                    // 将图片路径添加到对应的数组中
-                    this.form[type] = [...this.form[type], ...tempFilePaths]
-                    // 这里可以添加上传到服务器的逻辑
-                    // this.uploadToServer(tempFilePaths, type)
+                    console.log('上传的图片路径:11', tempFilePaths)
+                    this.uploadToServer(tempFilePaths, type)
                 },
                 fail: (err) => {
                     console.error('选择图片失败:', err)
@@ -133,46 +143,133 @@ export default {
             })
         },
         // 删除图片
-        deleteImage(type, index) {
+        deleteImage(type, item) {
             uni.showModal({
                 title: '提示',
                 content: '确定要删除这张图片吗？',
                 success: (res) => {
                     if (res.confirm) {
-                        this.form[type].splice(index, 1)
+                        // 调接口删除
+                        console.log('现在要删除的文件文件是:', type, item.fileUrl, item.id)
+                        this.deleteImg(item.id)
+                        this.getList('2', '1');
+                        this.getList('2', '2');
                     }
                 }
             })
         },
-        // 上传到服务器（示例）
-        uploadToServer(filePaths, type) {
-            filePaths.forEach((filePath, index) => {
-                uni.uploadFile({
-                    url: 'your-upload-api-url', // 替换为实际的上传接口
-                    filePath: filePath,
-                    name: 'file',
-                    formData: {
-                        type: type
-                    },
-                    success: (uploadRes) => {
-                        const data = JSON.parse(uploadRes.data)
-                        // 上传成功后，将临时路径替换为服务器返回的路径
-                        const tempIndex = this.form[type].indexOf(filePath)
-                        if (tempIndex !== -1) {
-                            this.form[type][tempIndex] = data.url // 假设服务器返回data.url
-                        }
-                    },
-                    fail: (err) => {
-                        console.error('上传图片失败:', err)
-                    }
+        // 删除图片
+        async deleteImg(id) {
+            try {
+                await uni.$u.api.deleteClueFile([id])
+                uni.showToast({
+                    title: '删除成功',
+                    icon: 'success',
+                    duration: 2000
                 })
-            })
+            } catch (error) {
+                uni.showToast({
+                    title: '删除失败',
+                    icon: 'error',
+                    duration: 2000
+                })
+            }
+        },
+        // 上传到服务
+        async uploadToServer(filePaths, type) {
+            // 实际的上传逻辑
+            try {
+                //实物图的话就是2,聊天记录的话就是1
+                let p = type == 'truePic' ? '2' : type == 'chatRecords' ? '1' : ''
+                console.log('当前上传的图片类型是', p)
+                const res = await Promise.all(filePaths.map(filePath => this.uploadFile(filePath, p)));
+
+                // 绑定
+                this.bindOrder(type, p);
+
+                // 实物图的话传2
+                if (type == 'truePic') {
+                    // this.bindOrder('2', '2');
+                    this.getList('2', '2');
+                }
+                // 实物图的话聊天记录的话传1
+                if (type == 'chatRecords') {
+                    // 实物图的话聊天记录的话传1
+                    // this.bindOrder('2', '1');
+                    this.getList('2', '1');
+                }
+
+
+            } catch (error) {
+                console.error('上传失败:', error);
+                uni.$u.toast('上传失败');
+            }
+        },
+        //绑定订单
+        async bindOrder(type, orderFileType) {
+            const res = await uni.$u.api.saveClueFile({
+                clueId: this.orderDetail.clueId,//线索id
+                list: this.bindList,
+                sourceId: this.orderId,//订单id,sendformid
+                type: type,
+                orderFileType: orderFileType
+            });
+            uni.$u.toast("上传成功");
+            uni.hideLoading();
+            // 清空待绑定的图片列表
+            this.bindList = [];
+        },
+        // 上传文件
+        async uploadFile(fileUrl, orderFileType) {
+            try {
+                uni.showLoading({
+                    title: '上传中...',
+                    mask: true
+                });
+
+                console.log(111, fileUrl)
+                // 调用统一的上传接口
+                const { data } = await uni.$u.api.uploadFile(fileUrl);
+
+                const fileObj = {
+                    fileSize: data.fileSize,
+                    fileSuffix: data.fileSuffix,
+                    fileName: data.name,
+                    fileUrl: data.url,
+                    orderFileType: orderFileType
+                };
+
+
+
+                if (orderFileType == '2') {
+                    // this.trueUploadList.push(fileObj);
+                } else if (orderFileType == '1') {
+                    // this.chatRecordsUploadList.push(fileObj);
+                }
+                this.bindList.push(fileObj);
+
+            } catch (error) {
+                uni.hideLoading();
+                console.error('文件上传失败:', error);
+                uni.$u.toast('上传失败，请重试');
+            }
         },
+
         // 电话卡片点击事件
         handlePhoneClick() {
             console.log('电话卡片被点击', '电话号码:', this.orderDetail.phone)
             if (this.orderDetail.phone) {
-                //    稍后调用整个拨打电话的逻辑
+                //拨打电话
+                uni.makePhoneCall({
+                    phoneNumber: this.orderDetail.phone,
+                    success: () => {
+                        this.$store.commit("call/SET_FORM", {
+                            clueId: this.orderDetail.clueId,
+                            type: "3",
+                            callee: this.orderDetail.phone,
+                        });
+                    },
+                });
             } else {
                 uni.showToast({
                     title: '该订单暂时没有电话号码',
@@ -184,7 +281,16 @@ export default {
         handleWechatClick() {
             console.log('微信卡片被点击', '微信号:', this.orderDetail.wechat)
             if (this.orderDetail.wechat) {
-                //    稍后调用打开微信的逻辑
+                //复制微信号
+                uni.setClipboardData({
+                    data: this.orderDetail.wechat,
+                    success: () => {
+                        uni.showToast({
+                            title: '微信号已复制',
+                            icon: 'none'
+                        })
+                    }
+                })
             } else {
                 uni.showToast({
                     title: '该订单暂时没有微信号',
@@ -213,8 +319,63 @@ export default {
                 nowPage: 'formOne',
                 form: this.form,
             })
-        }
-    }
+        },
+        // 获取文件列表
+        async getList(type, orderFileType) {
+            console.log('获取文件列表', type, orderFileType)
+
+            try {
+                const params = {
+                    clueId: this.orderDetail.clueId,
+                    sourceId: this.orderId,
+                    type,
+                    orderFileType,
+                    isDuplicate: '1',//先传1
+                    pageNum: 1,
+                    pageSize: 1000 // 设置一个较大的值以获取所有数据
+                }
+                const response = await uni.$u.api.selectClueFileByDto(params)
+                if (orderFileType == '1') {
+                    this.trueUploadList = response.rows || []
+                } else if (orderFileType == '2') {
+                    this.chatRecordsUploadList = response.rows || []
+                }
+            } catch (error) {
+                uni.$u.toast(`获取列表失败：${error.message}`)
+                this.trueUploadList = []
+                this.chatRecordsUploadList = []
+            }
+        },
+
+        //一键复制
+        copyAllImages() {
+            // 合并所有图片
+            const allImages = [...this.trueUploadList, ...this.chatRecordsUploadList];
+            //取出所有图的url
+            const allUrls = allImages.map(item => item.fileUrl);
+            console.log('所有图片:', allUrls)
+            console.log('合并后的图片列表:', allUrls)
+            if (allUrls.length > 0) {
+                // 复制到剪贴板
+                uni.setClipboardData({
+                    data: JSON.stringify(allUrls),
+                    success: () => {
+                        uni.showToast({
+                            title: '所有图片已复制',
+                            icon: 'none'
+                        })
+                    }
+                })
+            } else {
+                uni.showToast({
+                    title: '没有图片可复制',
+                    icon: 'none'
+                })
+            }
+        },
+
+    },
+
 }
 </script>
 <style scoped lang="scss">

pages/orderDetailNew/components/pageTwo.vue

@@ -197,49 +197,7 @@ export default {
                 }
             });
         },
-        // 图片预览方法
-        previewImageHandler(image, type) {
-            let currentIndex = 0;
-            let imageList = [];
-
-            // 根据类型获取对应的图片数组
-            if (type === 'photoTips') {
-                imageList = this.photoTipsImages;
-                currentIndex = imageList.indexOf(image);
-            } else if (type === 'face2face') {
-                imageList = this.face2faceImages;
-                currentIndex = imageList.indexOf(image);
-            }
 
-            // 使用uni-app的图片预览API
-            uni.previewImage({
-                current: currentIndex, // 当前预览图片的索引
-                urls: imageList, // 需要预览的图片链接列表
-                loop: true, // 是否可循环预览
-                longPressActions: {
-                    itemList: ['保存图片'],
-                    success: function (data) {
-                        // 保存图片到相册
-                        uni.saveImageToPhotosAlbum({
-                            filePath: imageList[data.tapIndex],
-                            success: function () {
-                                uni.showToast({
-                                    title: '保存成功',
-                                    icon: 'success'
-                                });
-                            },
-                            fail: function (err) {
-                                console.error('保存图片失败:', err);
-                                uni.showToast({
-                                    title: '保存失败',
-                                    icon: 'none'
-                                });
-                            }
-                        });
-                    }
-                }
-            });
-        },
 
         // 价格输入回调
         onPriceInput(e) {
@@ -258,66 +216,10 @@ export default {
             this.approvedPrice = newPrice;
         },
 
-        // 上传高清细节图
-        uploadDetailImage() {
-            uni.chooseImage({
-                count: 9 - this.detailImages.length, // 最多选择9张
-                sizeType: ['compressed'], // 压缩图片
-                sourceType: ['album', 'camera'], // 从相册选择或拍照
-                success: (res) => {
-                    const tempFilePaths = res.tempFilePaths;
-                    // 将图片路径添加到数组中
-                    this.detailImages = [...this.detailImages, ...tempFilePaths];
-                },
-                fail: (err) => {
-                    console.error('选择图片失败:', err);
-                    uni.showToast({
-                        title: '选择图片失败',
-                        icon: 'none'
-                    });
-                }
-            });
-        },
-
-        // 删除高清细节图
-        deleteDetailImage(index) {
-            uni.showModal({
-                title: '提示',
-                content: '确定要删除这张图片吗？',
-                success: (res) => {
-                    if (res.confirm) {
-                        this.detailImages.splice(index, 1);
-                    }
-                }
-            });
-        },
 
         // 复制所有高清细节图链接
         copyAllDetailImages() {
-            if (this.detailImages.length === 0) {
-                uni.showToast({
-                    title: '暂无图片可复制',
-                    icon: 'none'
-                });
-                return;
-            }
 
-            const imageUrls = this.detailImages.join('\n');
-            uni.setClipboardData({
-                data: imageUrls,
-                success: () => {
-                    uni.showToast({
-                        title: '复制成功',
-                        icon: 'success'
-                    });
-                },
-                fail: () => {
-                    uni.showToast({
-                        title: '复制失败',
-                        icon: 'none'
-                    });
-                }
-            });
         },
 
         // 下一步按钮点击事件
@@ -354,7 +256,40 @@ export default {
                 nowPage: 'formTwo',
                 form: result,
             })
-        }
+        },
+        //获取文件列表
+        async getList() {
+            console.log('获取文件列表', type, orderFileType)
+
+            try {
+                const params = {
+                    clueId: this.orderDetail.clueId,
+                    sourceId: this.orderId,
+                    type: '2',
+                    orderFileType: '3',
+                    isDuplicate: '1',//先传1
+                    pageNum: 1,
+                    pageSize: 1000 // 设置一个较大的值以获取所有数据
+                }
+                const response = await uni.$u.api.selectClueFileByDto(params)
+                this.detailImages = response.rows || []
+            } catch (error) {
+                uni.$u.toast(`获取列表失败：${error.message}`)
+            }
+        },
+        // 上传高清细节图
+        uploadDetailImage() {
+
+        },
+        // 删除高清细节图
+        deleteDetailImage(index) {
+            uni.showModal({
+                title: '提示',
+                content: '确定要删除这张图片吗？',
+                success: (res) => {
+                }
+            });
+        },
     }
 };
 </script>

pages/orderDetailNew/index.vue

@@ -19,7 +19,7 @@
             </template>
         </u-navbar>
 
-        <orderDetailNewView :detail="receiptDetail" />
+        <orderDetailNewView :detail="receiptDetail" :topInfo="topInfo" :orderId="orderId" />
 
         <!-- 通用模态窗 -->
         <custom-modal :visible="modalVisible" :title="modalConfig.title" :value="modalConfig.value"

pages/pagereceivecenter/compounts/orderCard.vue

@@ -0,0 +1,214 @@
+<script>
+export default {
+    props: {
+        order: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+    methods: {
+        handerBtnClick(btnType, order) {
+            this.$emit('handleBtnClick', btnType, order);
+        }
+    }
+}
+
+</script>
+
+
+
+
+<template>
+    <view class="orderCard">
+        <view class="bandAndPrice">
+            <view class="bandName">{{ order.itemBrand || '暂无品牌' }}</view>
+            <view class="price">￥{{ order.priceRange }}</view>
+        </view>
+
+        <view class="mainLind">
+            <view class="mainLindImg">
+                <image :src="'/static/acceptOrder/orderCardPic.jpg'" alt="" />
+            </view>
+            <view class="mainLindInfo">
+                <view class="itemName">{{ order.item || '暂无项目' }}</view>
+                <view>发单人:{{ order.createNickName || '未知' }}</view>
+                <view>{{ order.sendDate || '暂无时间' }}</view>
+            </view>
+        </view>
+
+        <view class="tags">
+            <view class="tag" v-for="(tag, index) in order.tags" :key="index"
+                :style="{ backgroundColor: tag.color, opacity: 0.8 }">
+                {{ tag.name }}</view>
+
+        </view>
+
+        <view class="Btns">
+
+            <view class="btnGroup"
+                v-if="order && (order.status == '1' || order.status == null || order.status === undefined)">
+                <view class="card-button" @click="handerBtnClick('acceptOrder', order)">立即接单</view>
+                <view class=" card-button isBusy" @click="handerBtnClick('isBusy', order)">在忙</view>
+            </view>
+
+            <view class="btnGroup"
+                v-if="order && (order.status == '2' || order.status == null || order.status === undefined)">
+                <view class="card-button willFollow" @click="handerBtnClick('willFollow', order)">待跟进</view>
+                <view class="card-button isBusy" @click="handerBtnClick('tag', order)">打标签</view>
+            </view>
+
+            <view class="btnGroup"
+                v-if="order && (order.status == '3' || order.status == null || order.status === undefined)">
+                <view class="card-button share" @click="handerBtnClick('share', order)">一键分享</view>
+            </view>
+
+            <view class="btnGroup"
+                v-if="order && (order.status == '4' || order.status == null || order.status === undefined)">
+                <view class="card-button oneFollow" @click="handerBtnClick('oneFollow', order)">待跟进</view>
+            </view>
+
+        </view>
+    </view>
+</template>
+
+
+
+
+<style scoped lang="scss">
+/* 订单卡片主容器 */
+.orderCard {
+    box-sizing: border-box;
+    width: 95%;
+    background-color: #fff;
+    margin: 20rpx auto;
+    border-radius: 20rpx;
+    padding: 20rpx;
+}
+
+/* 品牌和价格区域 */
+.orderCard .bandAndPrice {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+/* 品牌名称 */
+.orderCard .bandAndPrice .bandName {
+    font-size: 20rpx;
+    font-weight: 700;
+    border: 2px solid #2563EB;
+    padding: 6rpx 12rpx;
+    border-radius: 15rpx;
+    background-color: #EFF6FF;
+    color: #2563EB;
+}
+
+/* 价格 */
+.orderCard .bandAndPrice .price {
+    font-size: 30rpx;
+    font-weight: 700;
+}
+
+/* 主要内容行 */
+.orderCard .mainLind {
+    margin-top: 10rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 20rpx;
+}
+
+/* 主要内容行图片容器 */
+.orderCard .mainLind .mainLindImg image {
+    width: 150rpx;
+    height: 150rpx;
+    border-radius: 20rpx;
+}
+
+/* 主要内容行信息容器 */
+.orderCard .mainLind .mainLindInfo {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 10rpx;
+    font-size: 24rpx;
+    color: #6b7280;
+}
+
+/* 商品名称 */
+.orderCard .mainLind .mainLindInfo .itemName {
+    font-size: 30rpx;
+    font-weight: 700;
+    color: #374751;
+}
+
+/* 标签区域 */
+.orderCard .tags {
+    display: flex;
+    gap: 10rpx;
+}
+
+/* 单个标签 */
+.orderCard .tags .tag {
+    font-size: 20rpx;
+    font-weight: 700;
+    padding: 6rpx 12rpx;
+    border-radius: 15rpx;
+    background-color: #EFF6FF;
+    color: #fff;
+}
+
+/* 按钮区域 */
+.orderCard .Btns {
+    margin-top: 10rpx;
+}
+
+/* 按钮组 */
+.orderCard .Btns .btnGroup {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 20rpx;
+}
+
+/* 卡片按钮基础样式 */
+.orderCard .Btns .btnGroup .card-button {
+    font-size: 24rpx;
+    font-weight: 700;
+    border: 2rpx solid #2563EB;
+    padding: 6rpx 12rpx;
+    border-radius: 15rpx;
+    background-color: #2563EB;
+    color: #fff;
+    width: 45%;
+    text-align: center;
+    cursor: pointer;
+    height: 60rpx;
+    line-height: 60rpx;
+}
+
+/* 忙碌状态按钮 */
+.orderCard .Btns .btnGroup .card-button.isBusy {
+    background-color: #fff;
+    color: #6B7280;
+    border-color: #6B7280;
+}
+
+/* 待跟进状态按钮 */
+.orderCard .Btns .btnGroup .card-button.willFollow {
+    background-color: #EFF6FF;
+    color: #2563EB;
+}
+
+/* 分享按钮 */
+.orderCard .Btns .btnGroup .card-button.share {
+    width: 100%;
+}
+
+/* 单独跟进按钮 */
+.orderCard .Btns .btnGroup .card-button.oneFollow {
+    width: 100%;
+    background-color: #EFF6FF;
+    color: #2563EB;
+}
+</style>

pages/pagereceivecenter/pagereceivecenter.vue

@@ -0,0 +1,155 @@
+<script>
+import orderCard from "./compounts/orderCard.vue";
+
+export default {
+    components: {
+        orderCard,
+    },
+    data() {
+        return {
+            orderList: [],
+            page: {
+                pageSize: 10,
+                pageNum: 1,
+                total: 0
+            },
+        }
+    },
+    onLoad() {
+        //初始调用
+        // this.getOrderList();
+        uni.navigateTo({
+            url: `/pages/orderDetailNew/index?orderId=5464&item=测试发单&type=undefined&clueId=1973381744953516033`,
+        })
+    },
+    methods: {
+        //获取列表数据
+        async getOrderList() {
+            try {
+                const result = await uni.$u.api.selectClueOrderFormList({
+                    pageSize: this.page.pageSize,
+                    pageNum: this.page.pageNum,
+                });
+
+                console.log('接单列表', result);
+                // 把数组按照status的大小排序，从小到大
+                result.rows.sort((a, b) => {
+                    return a.status - b.status;
+                })
+
+
+                this.orderList.push(...result.rows);
+                this.page.total = result.total;
+
+            } catch (error) {
+                console.error('接单列表接口调用失败:', error);
+                // 添加用户友好的错误提示
+                uni.$u.toast('获取订单列表失败，请稍后重试');
+            }
+        },
+
+        // 处理按钮点击事件
+        handleBtnClick(btnType, order) {
+
+            if (btnType == 'acceptOrder') {
+                //去接单
+                console.log('去接单', order)
+
+                //跳转接单form
+                uni.navigateTo({
+                    url: `/pages/orderDetailNew/index?orderId=${order.id}&item=${order.item}&type=${this.type}&clueId=${order.clueId}`,
+                })
+            } else if (btnType == 'isBusy') {
+                //在忙
+                console.log('在忙', order)
+
+
+                //当前订单移动到末尾
+                this.orderList.push(this.orderList.splice(this.orderList.indexOf(order), 1)[0]);
+
+
+            } else if (btnType == 'willFollow') {
+                //待跟进
+                console.log('待跟进', order)
+            } else if (btnType == 'tag') {
+                //打标签
+                console.log('打标签', order)
+            } else if (btnType == 'share') {
+                //一键分享
+                console.log('一键分享', order)
+            } else if (btnType == 'oneFollow') {
+                //待跟进
+                console.log('待跟进', order)
+            }
+        },
+
+        //滑动加载
+        scrolltolower() {
+            console.log('到底了');
+            if (this.orderList.length >= this.page.total) {
+                return uni.$u.toast('没有更多了');
+            }
+            this.page.pageNum++;
+            this.getOrderList();
+        },
+
+    }
+}
+</script>
+
+<template>
+    <view class="container">
+        <u-navbar title="接单中心" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
+
+        <view class="scrollViewContainer">
+            <scroll-view class="scrollView" scroll-y @scrolltolower="scrolltolower">
+                <transition-group name="order-move" tag="div">
+                    <orderCard v-for="item in orderList" :key="item.receiptId + item.id" :order="item"
+                        @handleBtnClick="handleBtnClick">
+                    </orderCard>
+                </transition-group>
+                <view class="hasMore">
+                    {{ orderList.length >= page.total ? '没有更多了~' : '向下滑动加载更多~' }}
+                </view>
+            </scroll-view>
+        </view>
+
+
+
+
+
+    </view>
+</template>
+
+<style scoped lang="scss">
+.hasMore {
+    text-align: center;
+    padding: 20rpx 0;
+    font-size: 24rpx;
+    color: #999;
+}
+
+.scrollViewContainer {
+    height: calc(100vh - 44px);
+}
+
+.scrollView {
+    height: 100%;
+}
+
+/* 订单移动动画 */
+.order-move-enter-active,
+.order-move-leave-active {
+    transition: all 0.5s ease;
+}
+
+.order-move-enter-from,
+.order-move-leave-to {
+    opacity: 0;
+    transform: translateY(30px);
+}
+
+.order-move-move {
+    transition: transform 0.5s ease;
+}
+</style>

pages/person/index.vue

@@ -2,7 +2,7 @@
 	<view class="person_wrap">
 		<template v-if="userInfo.userId">
 			<view class="navbar-wrap">
-				<view class="column" :class="{fixed : isFixedTop}" :style="{background: background}" id="navbar">
+				<view class="column" :class="{ fixed: isFixedTop }" :style="{ background: background }" id="navbar">
 					<view class="left"></view>
 					<view style="font-size:36rpx" class="center">我的</view>
 					<view class="right" @click="handleSetting">
@@ -17,22 +17,24 @@
 						<u-avatar @click="handleAvatarClick" :src="$avatar(userInfo.avatar)" size="100rpx"></u-avatar>
 						<view class="info_wrap">
 							<view class="info_top">
-								<text class="follow_name">{{userInfo.userName}}</text>
-								<u-switch v-model="onlineStatus" active-value='0' inactive-value='1' :loading="onlineLoading" @change="changeOnlineStatus"></u-switch>
+								<text class="follow_name">{{ userInfo.userName }}</text>
+								<u-switch v-model="onlineStatus" active-value='0' inactive-value='1'
+									:loading="onlineLoading" @change="changeOnlineStatus"></u-switch>
 								<text class="identity">{{ onlineStatus === '0' ? '上线' : '下线' }}</text>
 							</view>
 							<view class="info_bottom">
-								<text>{{userInfo.phonenumber}}</text>
+								<text>{{ userInfo.phonenumber }}</text>
 							</view>
 						</view>
 					</view>
-					<view class="header_info_right"  @click="toPersonal">
+					<view class="header_info_right" @click="toPersonal">
 						<u-icon name="arrow-right" color="#aaa"></u-icon>
 					</view>
 				</view>
 				<view class="parson_menu_wrap">
 					<view class="parson_menu_list">
-						<navigator url="/pages/publicClue/index" open-type="switchTab" class="menu_item" hover-class="none">
+						<navigator url="/pages/publicClue/index" open-type="switchTab" class="menu_item"
+							hover-class="none">
 							<image src="@/static/parson/icon-wf.png" mode=""></image>
 							<text>销售公海</text>
 						</navigator>
@@ -40,11 +42,13 @@
 							<image src="@/static/parson/icon-myMessage.png" mode=""></image>
 							<text>我的消息</text>
 						</navigator>
-						<navigator url='/pages/acceptOrderOrder/index' open-type="navigate" class="menu_item" hover-class="none">
+						<navigator url='/pages/pagereceivecenter/pagereceivecenter' open-type="navigate"
+							class="menu_item" hover-class="none">
 							<image src="@/static/parson/icon-mycase.png" mode=""></image>
 							<text>接单中心</text>
 						</navigator>
-						<navigator url='/pages/privateClue/index' open-type="switchTab" class="menu_item" hover-class="none">
+						<navigator url='/pages/privateClue/index' open-type="switchTab" class="menu_item"
+							hover-class="none">
 							<image src="@/static/parson/clue.png" mode=""></image>
 							<text>销售线索</text>
 						</navigator>
@@ -60,366 +64,366 @@
 </template>
 
 <script>
-	import optionList from "./option/index.vue"
-	import permision from "@/js_sdk/wa-permission/permission.js";
-	export default {
-		components: {
-			optionList
+import optionList from "./option/index.vue"
+import permision from "@/js_sdk/wa-permission/permission.js";
+export default {
+	components: {
+		optionList
+	},
+	data() {
+		return {
+			onlineLoading: false,
+			switchSystemShow: false,
+			navbarInitTop: 0, //导航栏初始化距顶部的距离
+			isFixedTop: true, //是否固定顶部
+			background: "", // 为了实现渐变背景颜色
+		};
+	},
+	computed: {
+		userInfo() {
+			return this.$store.state.user.userInfo;
 		},
-		data() {
-			return {
-				onlineLoading : false,
-				switchSystemShow: false,
-				navbarInitTop: 0, //导航栏初始化距顶部的距离
-				isFixedTop: true, //是否固定顶部
-				background: "", // 为了实现渐变背景颜色
-			};
-		},
-		computed: {
-			userInfo(){
-				return this.$store.state.user.userInfo;
-			},
-			onlineStatus : {
-			  get(){
-			    return this.$store.state.user.userInfo.onlineStatus;
-			  },
-			  set(val){
-			    this.$store.commit("user/SET_USER_ONLINE_STATUS",val);
-			  },
-			},
-			nickName(){
-				return this.userInfo.nickName;
-			},
-			userName(){
-				return this.userInfo.userName;
+		onlineStatus: {
+			get() {
+				return this.$store.state.user.userInfo.onlineStatus;
 			},
-			deptName(){
-				return this.userInfo.newOrgName;
+			set(val) {
+				this.$store.commit("user/SET_USER_ONLINE_STATUS", val);
 			},
-			time(){
-				return this.$dayjs().format("YYYY-MM-DD HH:mm:ss")
-			},
-			systemList(){
-				return this.$store.state.user.systemList;
-			},
-			filterSystemList() {
-				return this.systemList.filter(v => this.userInfo.subsystemList.some(u => v.value === u.systemCode));
+		},
+		nickName() {
+			return this.userInfo.nickName;
+		},
+		userName() {
+			return this.userInfo.userName;
+		},
+		deptName() {
+			return this.userInfo.newOrgName;
+		},
+		time() {
+			return this.$dayjs().format("YYYY-MM-DD HH:mm:ss")
+		},
+		systemList() {
+			return this.$store.state.user.systemList;
+		},
+		filterSystemList() {
+			return this.systemList.filter(v => this.userInfo.subsystemList.some(u => v.value === u.systemCode));
+		},
+		currentSystem: {
+			get() {
+				return this.$store.getters.system.value
 			},
-			currentSystem: {
-				get() {
-					return this.$store.getters.system.value
-				},
-				set(val) {
-					const system = this.systemList.find(v => v.value === val);
-					// 如果有没保存的催记直接清掉
-					this.$store.commit("follow/SET_FORM", {});
-					this.$store.commit("follow/SET_PARAMS", {});
-
-					this.$store.commit("user/SET_SYSTEM", system);
-					this.$store.commit("user/SET_BELONGSYSTEM", {
-						code: val,
-						callback: (flag) => {
-							if (flag) {
-								setTimeout(() => {
-									// 定时器可加可不加 
-									uni.reLaunch({
-										url: "/pages/person/index",
-										success: () => {
-											uni.$u.toast("切换成功,当前为" + system.text);
-										}
-									})
-								}, 300)
-							} else {
-								this.$store.commit("user/SET_TOKEN", "");
-								this.$store.commit("user/SET_USERINFO", {});
+			set(val) {
+				const system = this.systemList.find(v => v.value === val);
+				// 如果有没保存的催记直接清掉
+				this.$store.commit("follow/SET_FORM", {});
+				this.$store.commit("follow/SET_PARAMS", {});
+
+				this.$store.commit("user/SET_SYSTEM", system);
+				this.$store.commit("user/SET_BELONGSYSTEM", {
+					code: val,
+					callback: (flag) => {
+						if (flag) {
+							setTimeout(() => {
+								// 定时器可加可不加 
 								uni.reLaunch({
-									url: "/pages/login/index",
-									success() {
-										uni.$u.toast("请检查您是否有该系统权限");
+									url: "/pages/person/index",
+									success: () => {
+										uni.$u.toast("切换成功,当前为" + system.text);
 									}
 								})
-							}
+							}, 300)
+						} else {
+							this.$store.commit("user/SET_TOKEN", "");
+							this.$store.commit("user/SET_USERINFO", {});
+							uni.reLaunch({
+								url: "/pages/login/index",
+								success() {
+									uni.$u.toast("请检查您是否有该系统权限");
+								}
+							})
 						}
-					})
-				},
-			},
-		},
-		methods: {
-			changeOnlineStatus(val){
-				this.onlineLoading = true;
-				uni.$u.api.changeOnlineStatus({ userId: this.$store.state.user.userInfo.userId, onlineStatus : val });
-				this.onlineLoading = false;
-			},
-			handleTest(){
-				uni.navigateTo({
-					url: "/pages/demo/demo"
+					}
 				})
 			},
-			// 确认选择系统事件
-			handleSystemConfirm() {
+		},
+	},
+	methods: {
+		changeOnlineStatus(val) {
+			this.onlineLoading = true;
+			uni.$u.api.changeOnlineStatus({ userId: this.$store.state.user.userInfo.userId, onlineStatus: val });
+			this.onlineLoading = false;
+		},
+		handleTest() {
+			uni.navigateTo({
+				url: "/pages/demo/demo"
+			})
+		},
+		// 确认选择系统事件
+		handleSystemConfirm() {
 
-			},
-			// 取消选择系统事件
-			handleSystemCancel() {
+		},
+		// 取消选择系统事件
+		handleSystemCancel() {
 
-			},
-			// 点击打开选择系统
-			handleSwitchSystem() {
-				this.$refs.switch.showModal();
-			},
-			onPullDownRefresh() {
-				uni.stopPullDownRefresh();
-				this.$store.dispatch("user/getUserInfo");
-			},
-			toPersonal() {
-				uni.navigateTo({
-					url: "/pages/profile/index"
-				})
-			},
-			handleSetting() {
-				uni.navigateTo({
-					url: "/pages/setting/index"
-				})
-			},
-			registerFun() {
-				if(!this.$store.state.app.callSystem){
-					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");
-							}
-						})
-					});
-				}
-			},
-			handleAvatarClick(){
-				//跳转个人资料
-				uni.navigateTo({
-					url: "/pages/profile/index"
-				})
-			}
 		},
-		mounted() {
-			if (this.navbarInitTop == 0) {
-				const query = uni.createSelectorQuery().in(this);
-				//获取节点距离顶部的距离
-				query.select("#navbar").boundingClientRect(function(rect) {
-					if (rect && rect.top > 0) {
-						var navbarInitTop = parseInt(rect.top);
-						this.navbarInitTop = navbarInitTop;
-					}
-				}).exec();
-			}
-			if(this.$store.state.user.token){
-				this.$store.dispatch("user/getUserInfo");
-			}else{
-				uni.navigateTo({
-					url: "/pages/login/index"
-				})
-			}
+		// 点击打开选择系统
+		handleSwitchSystem() {
+			this.$refs.switch.showModal();
 		},
-		/**
-		 * 监听页面滑动事件
-		 */
-		onPageScroll: function(e) {
-			var scrollTop = parseInt(e.scrollTop); //滚动条距离顶部高度
-			this.background = `rgba(255, 255, 255,${scrollTop / (scrollTop + 60)})`;
-			//判断'滚动条'滚动的距离 和 '元素在初始时'距顶部的距离进行判断
-			var isSatisfy = scrollTop >= this.navbarInitTop ? true : false;
-			//为了防止不停的setData, 这儿做了一个等式判断。 只有处于吸顶的临界值才会不相等
-			if (this.isFixedTop === isSatisfy) {
-				return false;
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh();
+			this.$store.dispatch("user/getUserInfo");
+		},
+		toPersonal() {
+			uni.navigateTo({
+				url: "/pages/profile/index"
+			})
+		},
+		handleSetting() {
+			uni.navigateTo({
+				url: "/pages/setting/index"
+			})
+		},
+		registerFun() {
+			if (!this.$store.state.app.callSystem) {
+				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");
+						}
+					})
+				});
 			}
-			this.isFixedTop = isSatisfy;
+		},
+		handleAvatarClick() {
+			//跳转个人资料
+			uni.navigateTo({
+				url: "/pages/profile/index"
+			})
 		}
-	};
+	},
+	mounted() {
+		if (this.navbarInitTop == 0) {
+			const query = uni.createSelectorQuery().in(this);
+			//获取节点距离顶部的距离
+			query.select("#navbar").boundingClientRect(function (rect) {
+				if (rect && rect.top > 0) {
+					var navbarInitTop = parseInt(rect.top);
+					this.navbarInitTop = navbarInitTop;
+				}
+			}).exec();
+		}
+		if (this.$store.state.user.token) {
+			this.$store.dispatch("user/getUserInfo");
+		} else {
+			uni.navigateTo({
+				url: "/pages/login/index"
+			})
+		}
+	},
+	/**
+	 * 监听页面滑动事件
+	 */
+	onPageScroll: function (e) {
+		var scrollTop = parseInt(e.scrollTop); //滚动条距离顶部高度
+		this.background = `rgba(255, 255, 255,${scrollTop / (scrollTop + 60)})`;
+		//判断'滚动条'滚动的距离 和 '元素在初始时'距顶部的距离进行判断
+		var isSatisfy = scrollTop >= this.navbarInitTop ? true : false;
+		//为了防止不停的setData, 这儿做了一个等式判断。 只有处于吸顶的临界值才会不相等
+		if (this.isFixedTop === isSatisfy) {
+			return false;
+		}
+		this.isFixedTop = isSatisfy;
+	}
+};
 </script>
 <style>
-	.watermarkCans {
-		width: 250rpx;
-		height: 250rpx;
-		position: absolute;
-		z-index: -1;
-	}
+.watermarkCans {
+	width: 250rpx;
+	height: 250rpx;
+	position: absolute;
+	z-index: -1;
+}
 </style>
 <style lang="scss" scoped>
-	.switchSysytemSelect {
-		height: 0rpx;
-		overflow: hidden;
+.switchSysytemSelect {
+	height: 0rpx;
+	overflow: hidden;
+}
+
+.switchSysytemBtn {
+	width: 630rpx;
+	margin: auto;
+	margin-top: 60rpx;
+
+	::v-deep .u-button {
+		border-radius: 100rpx;
 	}
+}
 
-	.switchSysytemBtn {
-		width: 630rpx;
-		margin: auto;
-		margin-top: 60rpx;
+.person_wrap {
+	background-size: cover;
+	background-repeat: no-repeat;
+	// padding: 0 30rpx;
+	position: relative;
+	height: 100vh;
 
-		::v-deep .u-button {
-			border-radius: 100rpx;
-		}
-	}
-
-	.person_wrap {
+	.header_wrap {
+		box-sizing: border-box;
+		background: url("@/static/parson/parson_background.png");
 		background-size: cover;
-		background-repeat: no-repeat;
-		// padding: 0 30rpx;
-		position: relative;
-		height: 100vh;
-
-		.header_wrap {
-			box-sizing: border-box;
-			background: url("@/static/parson/parson_background.png");
-			background-size: cover;
-			width: 750rpx;
-			// position: absolute;
-			// top: 0;
-			// left: 0;
-			padding: 170rpx 30rpx 0 30rpx;
-
-			.header_top_wrap {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.header_info_left {
-					display: flex;
-					align-items: center;
+		width: 750rpx;
+		// position: absolute;
+		// top: 0;
+		// left: 0;
+		padding: 170rpx 30rpx 0 30rpx;
 
-					// image {
-					// 	width: 100rpx;
-					// 	height: 100rpx;
-					// 	margin-right: 30rpx;
-					// 	border-radius: 50%;
-					// }
-
-					.info_wrap {
-						margin-left: 20rpx;
-
-						.info_top {
-							margin-bottom: 20rpx;
-							display: flex;
-							align-items: center;
-
-							.follow_name {
-								font-size: 32rpx;
-								color: #202020;
-								font-weight: bold;
-								margin-right: 20rpx;
-							}
-
-							.identity {
-								display: inline-block;
-								width: 100rpx;
-								line-height: 36rpx;
-								background: #ffffff;
-								border-radius: 18px;
-								text-align: center;
-								font-size: 22rpx;
-								color: #666666;
-								margin-left: 10px;
-							}
-						}
+		.header_top_wrap {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
 
-						.info_bottom {
-							text {
-								font-size: 28rpx;
-								color: #666666;
-							}
-						}
-					}
-				}
-
-				.header_info_right {
-					::v-deep .u-icon__icon {
-						font-size: 30rpx !important;
-					}
-				}
-			}
+			.header_info_left {
+				display: flex;
+				align-items: center;
 
-			.parson_menu_wrap {
-				background: #ffffff;
-				border-radius: 20px;
-				box-shadow: 0px 4px 20px 0px rgba(16, 140, 255, 0.10);
-				margin-top: 58rpx;
+				// image {
+				// 	width: 100rpx;
+				// 	height: 100rpx;
+				// 	margin-right: 30rpx;
+				// 	border-radius: 50%;
+				// }
 
-				.parson_menu_list {
-					display: flex;
-					padding: 40rpx 0;
+				.info_wrap {
+					margin-left: 20rpx;
 
-					.menu_item {
-						width: 33%;
+					.info_top {
+						margin-bottom: 20rpx;
 						display: flex;
-						flex-direction: column;
 						align-items: center;
 
-						image {
-							width: 48rpx;
-							height: 48rpx;
-							margin-bottom: 24rpx;
+						.follow_name {
+							font-size: 32rpx;
+							color: #202020;
+							font-weight: bold;
+							margin-right: 20rpx;
+						}
+
+						.identity {
+							display: inline-block;
+							width: 100rpx;
+							line-height: 36rpx;
+							background: #ffffff;
+							border-radius: 18px;
+							text-align: center;
+							font-size: 22rpx;
+							color: #666666;
+							margin-left: 10px;
 						}
+					}
 
+					.info_bottom {
 						text {
 							font-size: 28rpx;
-							color: #202020;
+							color: #666666;
 						}
 					}
 				}
 			}
 
+			.header_info_right {
+				::v-deep .u-icon__icon {
+					font-size: 30rpx !important;
+				}
+			}
 		}
 
-		.secondHalf {
-			padding: 0 30rpx;
-		}
-
-		.box {
-			height: 200vh;
-		}
-	}
+		.parson_menu_wrap {
+			background: #ffffff;
+			border-radius: 20px;
+			box-shadow: 0px 4px 20px 0px rgba(16, 140, 255, 0.10);
+			margin-top: 58rpx;
 
-	.navbar-wrap {
-		width: 750rpx;
+			.parson_menu_list {
+				display: flex;
+				padding: 40rpx 0;
 
-		.left {
-			width: 70rpx;
-		}
+				.menu_item {
+					width: 33%;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
 
-		.right {
-			margin-right: 30rpx;
+					image {
+						width: 48rpx;
+						height: 48rpx;
+						margin-bottom: 24rpx;
+					}
 
-			::v-deep .u-icon__icon {
-				font-size: 40rpx !important;
+					text {
+						font-size: 28rpx;
+						color: #202020;
+					}
+				}
 			}
 		}
 
 	}
 
-	.navbar-wrap .column {
-		box-sizing: border-box;
-		padding-top: 60rpx;
-		width: 750rpx;
-		height: 170rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		background: transparent;
-		top: 0;
-		left: 0;
-		z-index: 100;
+	.secondHalf {
+		padding: 0 30rpx;
 	}
 
-	.navbar-wrap .column.fixed {
-		width: 750rpx;
-		position: fixed;
+	.box {
+		height: 200vh;
 	}
+}
 
-	.navbar-wrap .column .center {
-		text-align: center;
-		font-size: 36rpx;
-		color: #333333;
-		letter-spacing: 1px;
-		position: relative;
+.navbar-wrap {
+	width: 750rpx;
+
+	.left {
+		width: 70rpx;
+	}
+
+	.right {
+		margin-right: 30rpx;
+
+		::v-deep .u-icon__icon {
+			font-size: 40rpx !important;
+		}
 	}
+
+}
+
+.navbar-wrap .column {
+	box-sizing: border-box;
+	padding-top: 60rpx;
+	width: 750rpx;
+	height: 170rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	background: transparent;
+	top: 0;
+	left: 0;
+	z-index: 100;
+}
+
+.navbar-wrap .column.fixed {
+	width: 750rpx;
+	position: fixed;
+}
+
+.navbar-wrap .column .center {
+	text-align: center;
+	font-size: 36rpx;
+	color: #333333;
+	letter-spacing: 1px;
+	position: relative;
+}
 </style>

pages/receiptForm/index.vue

@@ -1,296 +1,135 @@
 <template>
   <view class="receipt-form-page">
-    <u-navbar
-      placeholder
-      :autoBack="true"
-      :title="pageTitle"
-      @rightClick="submitForm"
-    >
+    <u-navbar placeholder :autoBack="true" :title="pageTitle" @rightClick="submitForm">
       <view class="u-nav-slot" slot="right"> 保存 </view>
     </u-navbar>
 
     <!-- 表单内容 -->
     <view class="follow_form_wrap">
-      <u--form
-          labelPosition="left"
-          labelWidth="100"
-          :model="form"
-          :rules="rules"
-          ref="receiptFormRef"
-          class="form_wrap"
-          :errorType="'toast'"
-        >
+      <u--form labelPosition="left" labelWidth="100" :model="form" :rules="rules" ref="receiptFormRef" class="form_wrap"
+        :errorType="'toast'">
         <u-form-item label="最后修改时间" prop="updateTime" borderBottom>
-          <u--input
-            v-model="form.updateTime"
-            placeholder="最后修改时间"
-            disabled
-          ></u--input>
+          <u--input v-model="form.updateTime" placeholder="最后修改时间" disabled></u--input>
         </u-form-item>
 
         <u-form-item label="订单类型" prop="customerServiceName" borderBottom>
-          <ld-select
-            :list="sendOrderTypeDict"
-            label-key="dictLabel"
-            value-key="dictValue"
-            placeholder="请选择类别"
-            v-model="form.customerServiceName"
-            :border="false"
-          ></ld-select>
+          <ld-select :list="sendOrderTypeDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择类别"
+            v-model="form.customerServiceName" :border="false"></ld-select>
           <u-icon slot="right" name="arrow-right"></u-icon>
         </u-form-item>
 
-        <u-form-item
-          label="物品名称"
-          prop="item"
-          borderBottom
-          class="form_required"
-        >
-          <u--input
-            v-model="form.item"
-            placeholder="请输入物品名称"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+        <u-form-item label="物品名称" prop="item" borderBottom class="form_required">
+          <u--input v-model="form.item" placeholder="请输入物品名称" border="none" :disabled="!isEdit"></u--input>
         </u-form-item>
 
-        <u-form-item
-          label="类别"
-          prop="category"
-          borderBottom
-          class="form_required"
-        >
-          <ld-select
-            :list="categoryDict"
-            label-key="dictLabel"
-            value-key="dictValue"
-            placeholder="请选择类别"
-            v-model="form.category"
-            :border="false"
-          ></ld-select>
+        <u-form-item label="类别" prop="category" borderBottom class="form_required">
+          <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>
         </u-form-item>
 
         <u-form-item label="品牌" prop="brand" borderBottom>
-          <ld-select
-            :list="brandDict"
-            label-key="dictLabel"
-            value-key="dictValue"
-            placeholder="请选择品牌"
-            v-model="form.brand"
-            :border="false"
-          ></ld-select>
+          <ld-select :list="brandDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择品牌"
+            v-model="form.brand" :border="false"></ld-select>
           <u-icon slot="right" name="arrow-right"></u-icon>
         </u-form-item>
 
-        <u-form-item
-          label="是否需要查码"
-          prop="needCheckCode"
-          borderBottom
-          class="form_required"
-        >
-          <u-radio-group
-            v-model="form.needCheckCode"
-            :disabled="!isEdit"
-            @change="(val) => (form.needCheckCode = val)"
-          >
-            <u-radio
-              v-for="item in needCheckCodeOptions"
-              :key="item.value"
-              :name="item.value"
-              :label="item.label"
-              style="margin-right: 10px"
-            ></u-radio>
+        <u-form-item label="是否需要查码" prop="needCheckCode" borderBottom class="form_required">
+          <u-radio-group v-model="form.needCheckCode" :disabled="!isEdit" @change="(val) => (form.needCheckCode = val)">
+            <u-radio v-for="item in needCheckCodeOptions" :key="item.value" :name="item.value" :label="item.label"
+              style="margin-right: 10px"></u-radio>
           </u-radio-group>
         </u-form-item>
 
         <u-form-item label="编码" prop="code" borderBottom>
-          <u--input
-            v-model="form.code"
-            :disabled="form.needCheckCode !== 1 || !isEdit"
-            placeholder="请输入编码"
-          ></u--input>
+          <u--input v-model="form.code" :disabled="form.needCheckCode !== 1 || !isEdit" placeholder="请输入编码"></u--input>
         </u-form-item>
 
         <u-form-item label="查码费" prop="checkCodeFee" borderBottom>
-          <u--input
-            v-model.number="form.checkCodeFee"
-            type="number"
-            placeholder="请输入查码费"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model.number="form.checkCodeFee" type="number" placeholder="请输入查码费" border="none"
+            :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="表款" prop="tableFee" borderBottom>
-          <u--input
-            v-model.number="form.tableFee"
-            type="number"
-            placeholder="请输入表款"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model.number="form.tableFee" type="number" placeholder="请输入表款" border="none"
+            :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="好处费" prop="benefitFee" borderBottom>
-          <u--input
-            v-model.number="form.benefitFee"
-            type="number"
-            placeholder="请输入好处费"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model.number="form.benefitFee" type="number" placeholder="请输入好处费" border="none"
+            :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="运费" prop="freight" borderBottom>
-          <u--input
-            v-model.number="form.freight"
-            type="number"
-            placeholder="请输入运费"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model.number="form.freight" type="number" placeholder="请输入运费" border="none"
+            :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="维修金额" prop="repairAmount" borderBottom>
-          <u--input
-            v-model.number="form.repairAmount"
-            type="number"
-            placeholder="请输入维修金额"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model.number="form.repairAmount" type="number" placeholder="请输入维修金额" border="none"
+            :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="成本合计" prop="totalCost" borderBottom>
-          <u--input
-            v-model.number="form.totalCost"
-            type="number"
-            placeholder="自动计算成本合计"
-            disabled
-          ></u--input>
+          <u--input v-model.number="form.totalCost" type="number" placeholder="自动计算成本合计" disabled></u--input>
         </u-form-item>
 
         <u-form-item label="卖价" prop="sellingPrice" borderBottom>
-          <u--input
-            v-model.number="form.sellingPrice"
-            type="number"
-            placeholder="请输入卖价"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model.number="form.sellingPrice" type="number" placeholder="请输入卖价" border="none"
+            :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="业绩" prop="performance" borderBottom>
-          <u--input
-            v-model.number="form.performance"
-            type="number"
-            placeholder="自动计算业绩"
-            disabled
-          ></u--input>
+          <u--input v-model.number="form.performance" type="number" placeholder="自动计算业绩" disabled></u--input>
         </u-form-item>
 
         <u-form-item label="分单比例" prop="splitRatio" borderBottom>
-          <u--input
-            v-model="form.splitRatio"
-            type="number"
-            step="0.01"
-            placeholder="0-100"
-            :disabled="!isEdit"
-            @blur="validateSplitRatio"
-          ></u--input>
+          <u--input v-model="form.splitRatio" type="number" step="0.01" placeholder="0-100" :disabled="!isEdit"
+            @blur="validateSplitRatio"></u--input>
         </u-form-item>
 
         <u-form-item label="毛业绩" prop="grossPerformance" borderBottom>
-          <u--input
-            v-model.number="form.grossPerformance"
-            type="number"
-            :placeholder="
-              canEditGrossPerformance ? '请输入毛业绩' : '自动计算毛业绩'
-            "
-            :disabled="!canEditGrossPerformance"
-          ></u--input>
+          <u--input v-model.number="form.grossPerformance" type="number" :placeholder="canEditGrossPerformance ? '请输入毛业绩' : '自动计算毛业绩'
+            " :disabled="!canEditGrossPerformance"></u--input>
         </u-form-item>
 
         <u-form-item label="开户人姓名" prop="customName" borderBottom>
-          <u--input
-            v-model="form.customName"
-            placeholder="请输入开户人姓名"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model="form.customName" placeholder="请输入开户人姓名" border="none" :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="身份证号码" prop="idCard" borderBottom>
-          <u--input
-            v-model="form.idCard"
-            placeholder="请输入客户身份证号码"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model="form.idCard" placeholder="请输入客户身份证号码" border="none" :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="银行卡号" prop="bankCardNumber" borderBottom>
-          <u--input
-            v-model="form.bankCardNumber"
-            placeholder="请输入银行卡号"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model="form.bankCardNumber" placeholder="请输入银行卡号" border="none" :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="银行名称" prop="bankName" borderBottom>
-          <u--input
-            v-model="form.bankName"
-            placeholder="请输入银行名称"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model="form.bankName" placeholder="请输入银行名称" border="none" :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="快递单号" prop="expressOrderNo" borderBottom>
-          <u--input
-            v-model="form.expressOrderNo"
-            placeholder="请输入快递单号"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+          <u--input v-model="form.expressOrderNo" placeholder="请输入快递单号" border="none" :disabled="!isEdit"></u--input>
         </u-form-item>
 
         <u-form-item label="附件" prop="fileIds" borderBottom>
           <view class="file-list">
-            <view
-              v-for="file in fileOptions"
-              :key="file.id"
-              class="file-item"
-              @click="handleFileSelect(file)"
-              :class="{
-                fileSelected: fileIds.includes(file.id.toString()),
-                fileDisabled:
-                  file.receiptFormId !== null && file.receiptFormId !== form.id,
-              }"
-              :disabled="
-                file.receiptFormId !== null && file.receiptFormId !== form.id
-              "
-            >
+            <view v-for="file in fileOptions" :key="file.id" class="file-item" @click="handleFileSelect(file)" :class="{
+              fileSelected: fileIds.includes(file.id.toString()),
+              fileDisabled:
+                file.receiptFormId !== null && file.receiptFormId !== form.id,
+            }" :disabled="file.receiptFormId !== null && file.receiptFormId !== form.id
+              ">
               <view class="file-info">
                 <text class="file-name">{{ handleShowLabel(file) }}</text>
-                <text
-                  v-if="
-                    file.receiptFormId !== null &&
-                    file.receiptFormId !== form.id
-                  "
-                  class="file-bound"
-                  >已绑定</text
-                >
+                <text v-if="
+                  file.receiptFormId !== null &&
+                  file.receiptFormId !== form.id
+                " class="file-bound">已绑定</text>
               </view>
-              <u-icon
-                v-if="fileIds.includes(file.id.toString())"
-                name="checkmark"
-                color="#409eff"
-                size="18"
-                class="fileSelectedIcon"
-              ></u-icon>
+              <u-icon v-if="fileIds.includes(file.id.toString())" name="checkmark" color="#409eff" size="18"
+                class="fileSelectedIcon"></u-icon>
             </view>
           </view>
           <view v-if="fileOptions.length === 0" class="no-files">
@@ -299,13 +138,8 @@
         </u-form-item>
 
         <u-form-item label="收单备注" prop="receiptRemark" borderBottom>
-          <u-textarea
-            confirmType="done"
-            v-model="form.receiptRemark"
-            placeholder="请输入收单备注"
-            :disabled="!isEdit"
-            auto-height
-          ></u-textarea>
+          <u-textarea confirmType="done" v-model="form.receiptRemark" placeholder="请输入收单备注" :disabled="!isEdit"
+            auto-height></u-textarea>
         </u-form-item>
       </u--form>
     </view>
@@ -527,14 +361,14 @@ export default {
     // 获取字典数据
     async getDicts() {
       try {
-        const [categoryRes, brandRes,sendOrderTypeRes] = await Promise.all([
+        const [categoryRes, brandRes, sendOrderTypeRes] = await Promise.all([
           this.$getDicts("crm_form_category"),
           this.$getDicts("crm_form_brand"),
-		  this.$getDicts("crm_sendOrder_type")
+          this.$getDicts("crm_sendOrder_type")
         ]);
         this.categoryDict = categoryRes;
         this.brandDict = brandRes;
-		this.sendOrderTypeDict = sendOrderTypeRes;
+        this.sendOrderTypeDict = sendOrderTypeRes;
       } catch (error) {
         console.error("获取字典数据失败:", error);
       }
@@ -650,7 +484,7 @@ export default {
     // 文件选择
     handleFileSelect(file) {
       if (!this.isEdit) return;
-      
+
       // 如果文件已经被绑定到其他收单，不允许选择
       if (file.receiptFormId !== null && file.receiptFormId !== this.form.id) {
         return;
@@ -667,7 +501,7 @@ export default {
         // 未选中，添加选择
         newFileIds.push(fileId);
       }
-      
+
       // 重新赋值，触发set方法
       this.fileIds = newFileIds;
     },
@@ -717,12 +551,12 @@ export default {
         if (this.form.id) {
           // 修改
           await uni.$u.api.updateReceiptForm(submitData);
-		  uni.$emit('addReceiptFormSuccess');
+          uni.$emit('addReceiptFormSuccess');
           uni.$u.toast("修改成功");
         } else {
           // 新增
           await uni.$u.api.addReceiptForm(submitData);
-		  uni.$emit('addReceiptFormSuccess');
+          uni.$emit('addReceiptFormSuccess');
           uni.$u.toast("新增成功");
         }
 
@@ -745,6 +579,7 @@ export default {
 .receipt-form-page {
   background-color: #fff;
 }
+
 @import "@/static/follow/index.scss";
 
 // 附件列表样式优化
@@ -814,6 +649,7 @@ export default {
   }
 
   .u-icon {
+
     // 为选中图标添加动画效果
     &.fileSelectedIcon {
       animation: fadeInScale 0.3s ease;
@@ -827,6 +663,7 @@ export default {
     opacity: 0;
     transform: scale(0.5);
   }
+
   100% {
     opacity: 1;
     transform: scale(1);

store/modules/user.js

@@ -28,27 +28,27 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			// ip : "https://crm.nanjingshiyu.com/prod-api", // ip
-			ip : "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip
 			// port: "9500", // 端口
-			isCallOff : "2", // 开关
+			isCallOff: "2", // 开关
 			folder: "", // 文件夹
-			webRtcIp : "", // 呼叫中心的ip
-			webRtcPort : "", // 呼叫中心的端口s
+			webRtcIp: "", // 呼叫中心的ip
+			webRtcPort: "", // 呼叫中心的端口s
 		},
 		systemList: [],
-		
-		redirectUrl : null,
+
+		redirectUrl: null,
 	},
 	mutations: {
-		SET_REDIRECTURL(state,data){
+		SET_REDIRECTURL(state, data) {
 			state.redirectUrl = data;
 		},
-		SET_USER_ONLINE_STATUS:(state,data)=>{
-		    state.userInfo.onlineStatus = data;
+		SET_USER_ONLINE_STATUS: (state, data) => {
+			state.userInfo.onlineStatus = data;
 		},
 		SET_USERINFO: (state, data) => {
 			state.userInfo = data;
@@ -150,7 +150,7 @@ export default {
 				dispatch("call/stopPhoneListener", null, { root: true }).catch(error => {
 					console.error('退出登录时停止电话监听失败:', error);
 				});
-				
+
 				commit("SET_TOKEN", "");
 				commit("SET_USERINFO", {});
 				dispatch("app/logoutCloseData", null, {

uni_modules/yao-lister/utssdk/app-android/AndroidManifest.xml

@@ -12,7 +12,7 @@
 
 	<application>
 
-		<receiver android:name="uts.sdk.modules.yaoLister.SmsReceiver">
+		<receiver android:name="uts.sdk.modules.yaoLister.SmsReceiver"  android:exported="true">
 			<intent-filter android:priority="1000">
 				<action android:name="android.provider.Telephony.SMS_RECEIVED" />
 			</intent-filter>

utils/api.js

@@ -111,6 +111,9 @@ const install = (Vue, vm) => {
 		getCustomerManagerAllList: ()=>http.post('/system/user/getCustomerManagerAllList'),
 		getClueSendFormVoByOrderId: (params)=>http.get(store.state.user.path + '/clueSendForm/getClueSendFormVoByOrderId?' + qs.stringify(params)),
 		statisticsSendStatus : (data,config = {})=>http.post(store.state.user.path + '/clueSendForm/statisticsSendStatus',data), // 统计线索阶段
+
+		// 支付相关接口
+		saveOrderFileAndTransfer:(data={})=>http.post(store.state.user.path + '/storeInfo/saveOrderFileAndTransfer',data),
 	}
 }