修复部分bug

App.vue

@@ -2,7 +2,8 @@
 	import {
 		onLaunch,
 		onShow,
-		onHide
+		onHide,
+		onUnload
 	} from '@dcloudio/uni-app'
 	import {
 		inject
@@ -10,6 +11,17 @@
 	// 引入水印
 	// import watermark from '@/utils/watermark.js'
 
+	let timer = null
+	let isRefresh = false
+
+	const handleStartRefresh = () => {
+		timer = setInterval(() => {
+			let maxTime = 1000 * 60 * 30 // 最高限度时间, 大于时进行刷新
+
+			if (isRefresh) return
+		}, 1000 * 30)
+	}
+
 	onLaunch(() => {
 		// #ifdef APP
 		const utils = inject('utils')
@@ -23,8 +35,18 @@
 	})
 
 	onShow(() => {
-		console.log('onshow');
+		console.log('AppShow');
+
+	})
+
+	onHide(() => {
+		console.log('AppHide')
+
+		timer && clearInterval(timer)
+	})
 
+	onUnload(() => {
+		console.log('AppUnload')
 	})
 </script>
 

compoment/BasicContainer/BasicContainer.vue

@@ -34,6 +34,7 @@
 
 	import {
 		onLoad,
+		onShow,
 		onUnload,
 		onReachBottom,
 		onPullDownRefresh
@@ -83,6 +84,13 @@
 		// uni.startPullDownRefresh()
 	})
 
+	onShow(() => {
+		let timer = setTimeout(() => {
+			!isRefresh.value && HANDLE_REFRESH(true)
+			clearTimeout(timer)
+		}, 100)
+	})
+
 	onUnload(() => {
 		uni.hideLoading()
 	})

compoment/saomiao2.vue

@@ -8,7 +8,7 @@
 		<u-icon name="scan" :color="details.isShowEditMask? '#fff':'#d3832a'" size="60" />
 	</view>
 
-	<view :class="{mask: true, active:details.isShowEditMask}" id="SetEditScanBtnMask" @touchmove="handleTouchMove">
+	<view :class="{mask: true, active:details.isShowEditMask}" id="SetEditScanBtnMask" @touchmove.stop="handleTouchMove">
 		<scroll-view scroll-y="true" style="height: 100vh;" :enable-back-to-top="false">
 			<!-- 控件 -->
 			<view class="flex-c-sb pd20 mask_row" id="SetEditScanBtnMask_control">
@@ -302,7 +302,7 @@
 		if (totolTimer) return
 
 		totolTimer = setTimeout(() => {
-			console.log('e :>> ', e);
+			// console.log('e :>> ', e);
 
 			const { leftMax, rightMax, topMax, bottomMax } = details.btnPosition
 			const { pageY, pageX } = e.touches[0]
@@ -323,7 +323,7 @@
 
 			clearTimeout(totolTimer)
 			totolTimer = null
-		}, 30)
+		}, 50)
 
 	}
 
@@ -375,6 +375,7 @@
 		align-items: center;
 		justify-content: center;
 		z-index: 100000;
+		transition: all 0.03s;
 
 		&.active {
 			border-color: #fff;

config/host.js

@@ -4,11 +4,11 @@
  * 测试域名
  * */
 //测试域名s
-// const devhost = 'http://test.api.huo5you.com/'
+const devhost = 'http://test.api.huo5you.com/'
 // lmy
 // const devhost = 'http://192.168.10.123:8889/'
 // zhy
-const devhost = 'http://192.168.3.12:13000/'
+// const devhost = 'http://192.168.3.12:13000/'
 // xiaohei
 // const devhost = 'http://192.168.3.18:13000/'
 // tjj

manifest.json

@@ -1,187 +1,186 @@
 {
-    "name" : "货无忧",
+	"name": "货无忧",
-    "appid" : "__UNI__EB22F37",
+	"appid": "__UNI__EB22F37",
-    "description" : "",
+	"description": "",
-    "versionName" : "1.1.43",
+	"versionName": "1.1.43",
-    "versionCode" : 1143,
+	"versionCode": 1143,
-    "transformPx" : false,
+	"transformPx": false,
-    /* 5+App特有相关 */
+	/* 5+App特有相关 */
-    "app-plus" : {
+	"app-plus": {
-        // "custom":false,
+		// "custom":false,
-        "usingComponents" : true,
+		"usingComponents": true,
-        "nvueStyleCompiler" : "uni-app",
+		"nvueStyleCompiler": "uni-app",
-        "compilerVersion" : 3,
+		"compilerVersion": 3,
-        "splashscreen" : {
+		"splashscreen": {
-            "alwaysShowBeforeRender" : true,
+			"alwaysShowBeforeRender": true,
-            "waiting" : true,
+			"waiting": true,
-            "autoclose" : true,
+			"autoclose": true,
-            "delay" : 0
+			"delay": 0
-        },
+		},
-        /* 模块配置 */
+		/* 模块配置 */
-        "modules" : {
+		"modules": {
-            "Bluetooth" : {},
+			"Bluetooth": {},
-            "Barcode" : {},
+			"Barcode": {},
-            "Camera" : {},
+			"Camera": {},
-            "Geolocation" : {}
+			"Geolocation": {}
-        },
+		},
-        /* 应用发布信息 */
+		/* 应用发布信息 */
-        "distribute" : {
+		"distribute": {
-            /* android打包配置 */
+			/* android打包配置 */
-            "android" : {
+			"android": {
-                "permissions" : [
+				"permissions": [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+				]
-            },
+			},
-            /* ios打包配置 */
+			/* ios打包配置 */
-            "ios" : {
+			"ios": {
-                "dSYMs" : false,
+				"dSYMs": false,
-                "idfa" : false
+				"idfa": false
-            },
+			},
-            /* SDK配置 */
+			/* SDK配置 */
-            "sdkConfigs" : {
+			"sdkConfigs": {
-                "geolocation" : {
+				"geolocation": {
-                    "amap" : {
+					"amap": {
-                        "__platform__" : [ "android" ],
+						"__platform__": ["android"],
-                        "appkey_ios" : "f5577fdddf4f68f92bbde932e9e35bd6",
+						"appkey_ios": "f5577fdddf4f68f92bbde932e9e35bd6",
-                        "appkey_android" : "f5577fdddf4f68f92bbde932e9e35bd6"
+						"appkey_android": "f5577fdddf4f68f92bbde932e9e35bd6"
-                    }
+					}
-                },
+				},
-                "ad" : {}
+				"ad": {}
-            },
+			},
-            "splashscreen" : {
+			"splashscreen": {
-                "androidStyle" : "common",
+				"androidStyle": "common",
-                "useOriginalMsgbox" : false,
+				"useOriginalMsgbox": false,
-                "iosStyle" : "common"
+				"iosStyle": "common"
-            },
+			},
-            "icons" : {
+			"icons": {
-                "android" : {
+				"android": {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
+					"hdpi": "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
-                },
+				},
-                "ios" : {
+				"ios": {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+					"appstore": "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
+					"ipad": {
-                        "app" : "unpackage/res/icons/76x76.png",
+						"app": "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
+						"notification": "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
+						"settings": "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
-                    },
+					},
-                    "iphone" : {
+					"iphone": {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
+						"app@2x": "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
-                    }
+					}
-                }
+				}
-            }
+			}
-        },
+		},
-        "nativePlugins" : {
+		"nativePlugins": {
-            "MT-TTS" : {
+			"MT-TTS": {
-                "__plugin_info__" : {
+				"__plugin_info__": {
-                    "name" : "MT-TTS语音合成",
+					"name": "MT-TTS语音合成",
-                    "description" : "安卓tts语音合成",
+					"description": "安卓tts语音合成",
-                    "platforms" : "Android",
+					"platforms": "Android",
-                    "url" : "",
+					"url": "",
-                    "android_package_name" : "",
+					"android_package_name": "",
-                    "ios_bundle_id" : "",
+					"ios_bundle_id": "",
-                    "isCloud" : false,
+					"isCloud": false,
-                    "bought" : -1,
+					"bought": -1,
-                    "pid" : "",
+					"pid": "",
-                    "parameters" : {}
+					"parameters": {}
-                }
+				}
-            },
+			},
-            "Sunmi-Print-Inner" : {
+			"Sunmi-Print-Inner": {
-                "__plugin_info__" : {
+				"__plugin_info__": {
-                    "name" : "Sunmi-Print-Inner",
+					"name": "Sunmi-Print-Inner",
-                    "description" : "商米打印服务uniapp插件",
+					"description": "商米打印服务uniapp插件",
-                    "platforms" : "Android",
+					"platforms": "Android",
-                    "url" : "",
+					"url": "",
-                    "android_package_name" : "",
+					"android_package_name": "",
-                    "ios_bundle_id" : "",
+					"ios_bundle_id": "",
-                    "isCloud" : false,
+					"isCloud": false,
-                    "bought" : -1,
+					"bought": -1,
-                    "pid" : "",
+					"pid": "",
-                    "parameters" : {}
+					"parameters": {}
-                }
+				}
-            },
+			},
-            "LcPrinter" : {
+			"LcPrinter": {
-                "__plugin_info__" : {
+				"__plugin_info__": {
-                    "name" : "LcPrinter",
+					"name": "LcPrinter",
-                    "description" : "打印插件",
+					"description": "打印插件",
-                    "platforms" : "Android",
+					"platforms": "Android",
-                    "url" : "",
+					"url": "",
-                    "android_package_name" : "",
+					"android_package_name": "",
-                    "ios_bundle_id" : "",
+					"ios_bundle_id": "",
-                    "isCloud" : false,
+					"isCloud": false,
-                    "bought" : -1,
+					"bought": -1,
-                    "pid" : "",
+					"pid": "",
-                    "parameters" : {}
+					"parameters": {}
-                }
+				}
-            }
+			}
-        }
+		}
-    },
+	},
-    /* 快应用特有相关 */
+	/* 快应用特有相关 */
-    "quickapp" : {},
+	"quickapp": {},
-    /* 小程序特有相关 */
+	/* 小程序特有相关 */
-    "mp-weixin" : {
+	"mp-weixin": {
-        "appid" : "wxedb0d10ea46a0113",
+		"appid": "wxedb0d10ea46a0113",
-        "setting" : {
+		"setting": {
-            "urlCheck" : false,
+			"urlCheck": false,
-            "es6" : false,
+			"es6": true,
-            "ignoreDevUnusedFiles" : false,
+			"ignoreDevUnusedFiles": false,
-            "lazyCodeLoading" : "requiredComponents",
+			"lazyCodeLoading": "requiredComponents",
-            "minified" : true
+			"minified": true
-        },
+		},
-        "usingComponents" : true,
+		"usingComponents": true,
-        "permission" : {
+		"permission": {
-            "scope.userFuzzyLocation" : {
+			"scope.userFuzzyLocation": {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+				"desc": "你的位置信息将用于小程序位置接口的效果展示"
-            },
+			},
-            "scope.userLocation" : {
+			"scope.userLocation": {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+				"desc": "你的位置信息将用于小程序位置接口的效果展示"
-            }
+			}
-        },
+		},
-        "requiredPrivateInfos" : [ "getLocation" ]
+		"requiredPrivateInfos": ["getLocation"]
-    },
+	},
-    "mp-alipay" : {
+	"mp-alipay": {
-        "usingComponents" : true
+		"usingComponents": true
-    },
+	},
-    "mp-baidu" : {
+	"mp-baidu": {
-        "usingComponents" : true
+		"usingComponents": true
-    },
+	},
-    "mp-toutiao" : {
+	"mp-toutiao": {
-        "usingComponents" : true
+		"usingComponents": true
-    },
+	},
-    "uniStatistics" : {
+	"uniStatistics": {
-        "enable" : false
+		"enable": false
-    },
+	},
-    "vueVersion" : "3"
+	"vueVersion": "3"
 }
 // "custom":false,
-/* 模块配置 */
+/* 模块配置 */
-

pagesHome/pages/ArrivalList/ArrivalList.vue

@@ -292,7 +292,6 @@
 	onShow(async () => {
 		// 初始化关闭监听
 		uni.$off('scancodedate')
-		// init()
 		uni.$on('scancodedate', function (code) {
 			console.log('code :>> ', code);
 			if (code) {
@@ -304,8 +303,7 @@
 
 		await nextTick()
 		console.log('details.notRefresh :>> ', details.notRefresh);
-		if (!details.notRefresh) basicContainer.value.startPullDownRefresh()
+		basicContainer.value.startPullDownRefresh()
-		details.notRefresh = false
 		details.scrollheight = await utils.getViewDistanceFormTop('.scvmabx')
 	})
 	// onHide(() => {
@@ -315,7 +313,28 @@
 	const date = ref<(string | number)[]>([])
 
 	async function scandata() {
-		basicContainer.value.startPullDownRefresh()
+		// 重置页码
+		details.pageNum = 1
+		// 重置渲染列表
+		details.datalist = []
+		// 重置渲染列表数据请求是否结束状态
+		option.isEnd = false
+		// 重置是否有数据
+		option.haveData = true
+		await initpage()
+		if (datalist.value.length === 0) {
+			uni.showToast({
+				title: '暂时没有数据',
+				icon: 'error'
+			})
+			option.haveData = false
+		}
+		if (option.isEnd) {
+			return uni.showToast({
+				icon: 'success',
+				title: '数据已加载完毕'
+			})
+		}
 	}
 
 	const handleScan = () => {

pagesHome/pages/RelayScanList/RelayScanList.vue

@@ -121,7 +121,9 @@
 	} from '@dcloudio/uni-app'
 	import { getTripartiteTransfer } from '@/api/user.js'
 	import { timeType } from '@/interfaces/pagesHome/allType'
-	import { inject, reactive, ref, toRefs, watchEffect } from "vue";
+	import {
+		inject, reactive, ref, toRefs, watchEffect, nextTick,
+	} from "vue";
 	import utils from '@/utils/utils';
 	const option = {
 		title: '三方中转装车',
@@ -169,14 +171,12 @@
 		basicContainer.value.startPullDownRefresh()
 	}
 
-	onShow(() => {
+	onShow(async () => {
 		// #ifdef APP
 		uni.$off('scancodedate')
 		// #endif
-		const timer = setTimeout(() => {
+		await nextTick()
-			basicContainer.value.startPullDownRefresh()
+		basicContainer.value.startPullDownRefresh()
-			clearTimeout(timer)
-		}, 200)
 	})
 	onLoad(() => {
 		date.value[0] = (uni as any).$u.timeFormat((new Date().valueOf() - 1000 * 60 * 60 * 24 * 3), 'yyyy-mm-dd')

pagesHome/pages/StowageList/StowageList.vue

@@ -114,6 +114,7 @@
 	<tips ref="tip"></tips>
 	<l-calendar v-model:value="show" :initStartDate='date[0]' :initEndDate='date[1]' @hide='showCalendar'
 		@change="onConfirm"></l-calendar>
+	<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
 </template>
 
 <script lang="ts" setup>
@@ -129,6 +130,9 @@
 	import functions from '@/utils/functions.js';
 	import { inject, reactive, ref, toRefs, watchEffect, nextTick } from "vue";
 	import utils from '@/utils/utils';
+	import useSystemSettingsStore from '@/store/useSystemSettingsStore';
+	import { storeToRefs } from 'pinia';
+	const { scanState } = storeToRefs(useSystemSettingsStore())
 	const option = {
 		title: '配载装车',
 		haveData: true,
@@ -185,9 +189,16 @@
 	}
 
 	onShow(async () => {
-		// #ifdef APP
+		// 初始化关闭监听
 		uni.$off('scancodedate')
-		// #endif
+		uni.$on('scancodedate', function (code) {
+			console.log('code :>> ', code);
+			if (code) {
+				console.log(code);
+				details.scancode = code
+				scandata()
+			}
+		})
 		await nextTick()
 		if (!details.notRefresh) basicContainer.value.startPullDownRefresh()
 	})

pagesHome/pages/directGoMarket/directGoMarket.vue

@@ -147,7 +147,9 @@
 		/** 滚动区高度 */
 		scrollHeight: '80vh',
 		tabBarCode: 10,
-		imgFileList: []
+		imgFileList: [],
+		/** 是否在上传图片 */
+		isUpload: false
 	})
 
 	onShow(async () => {
@@ -160,7 +162,7 @@
 		details.recordsList = []
 
 		await nextTick()
-		basicContainer.value.startPullDownRefresh()
+		!details.isUpload && basicContainer.value.startPullDownRefresh()
 		details.scrollHeight = await utils.getViewDistanceFormTop('.scvbx')
 	})
 	onHide(() => {
@@ -299,6 +301,8 @@
 			}
 		}
 
+		details.isUpload = true
+
 		UploadImg.value.setDetails({
 			title: '上传图片',
 			showPopUp: true,
@@ -329,18 +333,22 @@
 				const res = await postUploadSignPhoto(submitData)
 
 				const { code } = res
-
 				if (code !== 200) return
 
 				UploadImg.value.details.showPopUp = false
-
+				details.isUpload = false
 				basicContainer.value.startPullDownRefresh()
+			},
+			close() {
+				UploadImg.value.details.showPopUp = false
+				details.isUpload = false
 			}
 		})
 	}
 
 	/** 上传图片 */
 	const handleUploadImg = async (event) => {
+
 		try {
 			uni.showLoading({
 				title: '上传中',
@@ -352,7 +360,10 @@
 
 			for (let i = 0; i < event.file.length; i++) {
 				const item = event.file[i]
-				const type = item.name.split('.').slice(-1)[0]
+				let type = ''
+
+				item.url && (type = item.url.split('.').slice(-1)[0])
+				item.name && (type = item.name.split('.').slice(-1)[0])
 
 				if (writeArr.indexOf(type) === -1) continue
 
@@ -382,7 +393,6 @@
 			uni.hideLoading()
 		}
 
-		console.log('event :>> ', event);
 
 	}
 

pagesHome/pages/signOrderScan/signOrderScan.vue

@@ -83,7 +83,7 @@
 						</view>
 
 						<view class="xialaxz" v-if="listcheckindex==index">
-							<uni-table ref="uniTable1" border emptyText="暂无更多数据" style="max-height: 30vh;" @touchmove.stop>
+							<!-- <uni-table ref="uniTable1" border emptyText="暂无更多数据" style="max-height: 30vh; overflow-x: scroll;">
 								<uni-tr>
 									<uni-th align="left">包条码</uni-th>
 									<uni-th align="left">货物品类</uni-th>
@@ -102,8 +102,47 @@
 									</uni-tr>
 								</block>
 
-							</uni-table>
+							</uni-table> -->
 
+							<view class="main_row main_title">
+								<view class="">
+									包条码
+								</view>
+
+								<view class="">
+									货物品类
+								</view>
+
+								<view class="">
+									签收状态
+								</view>
+
+								<view class="">
+									异常状态
+								</view>
+							</view>
+
+							<view class="jpScorllView">
+								<block v-for="ite in item.distributionAppParcelListVOS" :key="item.orderCode">
+									<view
+										:class="{'main_row': true, 'red': ite.isSignfor === 0, 'green': ite.isSignfor === 1,'active': Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1}">
+										<view class="">
+											{{ite.type === 1? ite.orderPackageCode: ite.orderPackageCode || '未备货'}}
+										</view>
+
+										<view class="">{{ite.Product || '暂无数据'}}
+										</view>
+
+										<view class="">
+											{{ite.isSignfor === 1?'已签':'未签'}}
+										</view>
+
+										<view :class="{'red': ite.isAbnormal === 1}">
+											{{ite.isAbnormal === 1 ? '异常' : '/'}}
+										</view>
+									</view>
+								</block>
+							</view>
 						</view>
 						<view :class="item.signforNub==0?'tip tp2':item.signforNub==item.reservationNum?'tip tp1':'tip tp3'">
 							{{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}
@@ -176,7 +215,7 @@
 
 	<tips ref="tip"></tips>
 	<tiplist ref="tiplists"></tiplist>
-		<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
+	<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
 </template>
 
 <script lang="ts" setup>
@@ -228,7 +267,7 @@
 		orderType: '' as string | number,
 		inputtxt: '',
 		listcheckindex: -1,
-		scrollHeight: '',
+		scrollHeight: '60vh',
 		/** 计划件数 */
 		Plannednub: 0,
 
@@ -259,7 +298,6 @@
 
 	onShow(async () => {
 		try {
-			// #ifdef APP
 			uni.$off('scancodedate')
 			uni.$on('scancodedate', function (code) {
 				if (code) {
@@ -271,7 +309,6 @@
 					scandata()
 				}
 			})
-			// #endif
 
 			// 初始化请求页面数据
 			let data = {
@@ -696,29 +733,9 @@
 
 	.xialaxz {
 		zoom: 0.9;
-		display: flex;
+		overflow-x: scroll;
-		flex-direction: column;
+		word-wrap: break-word;
-
+		word-break: break-all;
-		>view {
-			display: flex;
-			align-items: flex-start;
-			justify-content: space-between;
-			border-top: 2upx solid #00000010;
-			padding: 20upx 0;
-			box-sizing: border-box;
-			font-size: 28upx;
-			color: #092C4D;
-
-			>view {
-				word-wrap: break-word;
-				word-break: break-all;
-				margin-right: 20upx;
-
-				&:nth-last-child(1) {
-					margin-right: 0upx;
-				}
-			}
-		}
 	}
 
 	.tabtip {
@@ -970,6 +987,53 @@
 		background: #ff4344 !important;
 	}
 
+	.main_title {
+		width: 100%;
+
+		>view {
+			background: #eee;
+		}
+	}
+
+	.main_row {
+		display: flex;
+
+		&.green {
+			color: #0a0;
+		}
+
+		&.red {
+			color: #ff5500
+		}
+
+		>view {
+			padding: 10upx 5upx;
+			font-size: 0.9rem;
+			word-break: break-all;
+			text-align: center;
+			border-bottom: 1upx dashed #999;
+			width: 240upx;
+			flex: none;
+
+
+			// &:nth-child(3) {
+			// 	width: 120upx;
+			// 	flex: none;
+			// }
+
+			&:last-child {
+
+
+				&.red {
+					background-color: #ff5500;
+					color: #fff;
+				}
+			}
+
+			.main_tip {}
+		}
+	}
+
 	// 跳转详情按钮
 	.jumpBtn {
 		position: fixed;
@@ -986,4 +1050,9 @@
 	.footer_container {
 		height: 150upx;
 	}
+
+	.jpScorllView {
+		width: 100%;
+		overflow: scroll;
+	}
 </style>

pagesHome/pages/signPackageScan/signPackageScan.vue

@@ -1,4 +1,6 @@
 <template>
+	<page-meta page-style="overflow:hidden"></page-meta>
+
 	<BasicContainer ref="basicContainer" :option="option">
 		<template #head>
 			<view class="hdstop">
@@ -30,9 +32,12 @@
 		</template>
 
 		<template #body>
-			<scroll-view class="main" @touchmove.stop :style="{height: details.scrollHeight}" :scroll-y="true"
+			<!-- <scroll-view class="main" @touchmove.stop
-				:scroll-x="true">
+				:style="{height: details.scrollHeight, width: '100vw', whileSpace: 'nowrap'}" :scroll-y="true"
-				<!-- 表格表头 -->
+				:scroll-x="true"> -->
+			<!-- 表格表头 -->
+			<view class="main" style="width: 100vw; overflow-x: scroll;">
+
 				<view class="main_row main_title">
 					<view class="">
 						包条码
@@ -55,7 +60,8 @@
 					</view>
 				</view>
 
-				<view :style="{height: details.jpScorllViewHeight}" code="id" class="jpScorllView">
+				<scroll-view :style="{height: details.jpScorllViewHeight, overflowY: 'scroll', width: 'fit-content'}"
+					code="id" class="jpScorllView" :scroll-y="true">
 					<block v-for="item in datalist" :key="item.orderCode">
 						<view :class="{'main_row': true, 'red': item.isSignfor === 0, 'green': item.isSignfor === 1}">
 							<view class="">
@@ -79,8 +85,9 @@
 							</view>
 						</view>
 					</block>
-				</view>
+				</scroll-view>
-			</scroll-view>
+			</view>
+			<!-- </scroll-view> -->
 
 		</template>
 	</BasicContainer>
@@ -146,7 +153,7 @@
 		orderType: '' as string | number,
 		inputtxt: '',
 		listcheckindex: -1,
-		scrollHeight: '',
+		scrollHeight: '60vh',
 		/** 计划件数 */
 		Plannednub: 0,
 		/** 滚动区高度 */
@@ -206,6 +213,7 @@
 		await nextTick()
 
 		details.jpScorllViewHeight = await utils.getViewDistanceFormTop('.jpScorllView')
+		details.scrollHeight = await utils.getViewDistanceFormTop('.main')
 	})
 
 	function goorderdetail(item) {
@@ -402,6 +410,10 @@
 		}
 	}
 
+	const handleTostmove = (e) => {
+		e.preventDefault()
+	}
+
 	const { datalist, items } = toRefs(details)
 </script>
 

pagesTask/pages/checkTaskList/checkTaskList.vue

@@ -228,7 +228,6 @@
 
 	// 开启监听扫描
 	onShow(() => {
-		// #ifdef APP
 		uni.$off('scancodedate')
 		uni.$on('scancodedate', function (code) {
 			if (code) {
@@ -238,7 +237,6 @@
 				scandata()
 			}
 		})
-		// #endif
 		// 库位盘点时, 允许扫码
 		if (details.pageType === 1) details.isscan = false
 

pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue

@@ -773,7 +773,6 @@
 	})
 
 	onShow(async () => {
-		// #ifdef APP
 		// 开启监听扫描
 		uni.$off('scancodedate')
 		uni.$on('scancodedate', function (code) {
@@ -789,7 +788,6 @@
 				else if (details.isScan) scandata()
 			}
 		})
-		// #endif
 		// 初始化请求页面数据
 		// initPage()
 	})

unpackage/dist/dev/app-plus/app.css

@@ -2478,6 +2478,7 @@ to {
   align-items: center;
   justify-content: center;
   z-index: 100000;
+  transition: all 0.03s;
 }
 .scan_continer.active[data-v-283679a6] {
   border-color: #fff;

unpackage/dist/dev/app-plus/pagesHome/pages/signOrderScan/signOrderScan.css

@@ -200,402 +200,6 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   font-size: 15px;
   margin-left: 3px;
 }
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.uni-table-th[data-v-bf970acd] {
-  padding: 12px 10px;
-  display: table-cell;
-  box-sizing: border-box;
-  font-size: 14px;
-  font-weight: bold;
-  color: #909399;
-  border-bottom: 1px #ebeef5 solid;
-}
-.uni-table-th-row[data-v-bf970acd] {
-  display: flex;
-  flex-direction: row;
-}
-.table--border[data-v-bf970acd] {
-  border-right: 1px #ebeef5 solid;
-}
-.uni-table-th-content[data-v-bf970acd] {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
-.arrow[data-v-bf970acd] {
-  display: block;
-  position: relative;
-  width: 10px;
-  height: 8px;
-  left: 5px;
-  overflow: hidden;
-  cursor: pointer;
-}
-.down[data-v-bf970acd] {
-  top: 3px;
-}
-.down[data-v-bf970acd] ::after {
-  content: "";
-  width: 8px;
-  height: 8px;
-  position: absolute;
-  left: 2px;
-  top: -5px;
-  transform: rotate(45deg);
-  background-color: #ccc;
-}
-.down.active[data-v-bf970acd] ::after {
-  background-color: #007aff;
-}
-.up[data-v-bf970acd] ::after {
-  content: "";
-  width: 8px;
-  height: 8px;
-  position: absolute;
-  left: 2px;
-  top: 5px;
-  transform: rotate(45deg);
-  background-color: #ccc;
-}
-.up.active[data-v-bf970acd] ::after {
-  background-color: #007aff;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.uni-table-checkbox[data-v-25e435b1] {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  margin: 5px 0;
-  cursor: pointer;
-}
-.uni-table-checkbox .checkbox__inner[data-v-25e435b1] {
-  flex-shrink: 0;
-  box-sizing: border-box;
-  position: relative;
-  width: 16px;
-  height: 16px;
-  border: 1px solid #DCDFE6;
-  border-radius: 2px;
-  background-color: #fff;
-  z-index: 1;
-}
-.uni-table-checkbox .checkbox__inner .checkbox__inner-icon[data-v-25e435b1] {
-  position: absolute;
-  top: 2px;
-  left: 5px;
-  height: 7px;
-  width: 3px;
-  border: 1px solid #fff;
-  border-left: 0;
-  border-top: 0;
-  opacity: 0;
-  transform-origin: center;
-  transform: rotate(45deg);
-  box-sizing: content-box;
-}
-.uni-table-checkbox .checkbox__inner.checkbox--indeterminate[data-v-25e435b1] {
-  border-color: #007aff;
-  background-color: #007aff;
-}
-.uni-table-checkbox .checkbox__inner.checkbox--indeterminate .checkbox__inner-icon[data-v-25e435b1] {
-  position: absolute;
-  opacity: 1;
-  transform: rotate(0deg);
-  height: 2px;
-  top: 0;
-  bottom: 0;
-  margin: auto;
-  left: 0px;
-  right: 0px;
-  bottom: 0;
-  width: auto;
-  border: none;
-  border-radius: 2px;
-  transform: scale(0.5);
-  background-color: #fff;
-}
-.uni-table-checkbox .checkbox__inner[data-v-25e435b1]:hover {
-  border-color: #007aff;
-}
-.uni-table-checkbox .checkbox__inner.is-disable[data-v-25e435b1] {
-  background-color: #F2F6FC;
-  border-color: #DCDFE6;
-}
-.uni-table-checkbox .checkbox__inner.is-checked[data-v-25e435b1] {
-  border-color: #007aff;
-  background-color: #007aff;
-}
-.uni-table-checkbox .checkbox__inner.is-checked .checkbox__inner-icon[data-v-25e435b1] {
-  opacity: 1;
-  transform: rotate(45deg);
-}
-.uni-table-checkbox .checkbox__inner.is-checked.is-disable[data-v-25e435b1] {
-  opacity: 0.4;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.uni-table-tr[data-v-b48b3e32] {
-  display: table-row;
-  transition: all 0.3s;
-  box-sizing: border-box;
-}
-.checkbox[data-v-b48b3e32] {
-  padding: 0 8px;
-  width: 26px;
-  padding-left: 12px;
-  display: table-cell;
-  vertical-align: middle;
-  color: #333;
-  font-weight: 500;
-  border-bottom: 1px #ebeef5 solid;
-  font-size: 14px;
-}
-.tr-table--border[data-v-b48b3e32] {
-  border-right: 1px #ebeef5 solid;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.uni-table-td[data-v-edae4802] {
-  display: table-cell;
-  padding: 8px 10px;
-  font-size: 14px;
-  border-bottom: 1px #EBEEF5 solid;
-  font-weight: 400;
-  color: #606266;
-  line-height: 23px;
-  box-sizing: border-box;
-}
-.table--border[data-v-edae4802] {
-  border-right: 1px #EBEEF5 solid;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.uni-table-scroll[data-v-c1ea9b5d] {
-  width: 100%;
-  overflow-x: auto;
-}
-.uni-table[data-v-c1ea9b5d] {
-  position: relative;
-  width: 100%;
-  border-radius: 5px;
-  background-color: #fff;
-  box-sizing: border-box;
-  display: table;
-  overflow-x: auto;
-}
-.uni-table[data-v-c1ea9b5d] .uni-table-tr:nth-child(n+2):hover {
-  background-color: #f5f7fa;
-}
-.uni-table[data-v-c1ea9b5d] .uni-table-thead .uni-table-tr:hover {
-  background-color: #fafafa;
-}
-.table--border[data-v-c1ea9b5d] {
-  border: 1px #ebeef5 solid;
-  border-right: none;
-}
-.border-none[data-v-c1ea9b5d] {
-  border-bottom: none;
-}
-.table--stripe[data-v-c1ea9b5d] .uni-table-tr:nth-child(2n+3) {
-  background-color: #fafafa;
-}
-
-/* 表格加载、无数据样式 */
-.uni-table-loading[data-v-c1ea9b5d] {
-  position: relative;
-  display: table-row;
-  height: 50px;
-  line-height: 50px;
-  overflow: hidden;
-  box-sizing: border-box;
-}
-.empty-border[data-v-c1ea9b5d] {
-  border-right: 1px #ebeef5 solid;
-}
-.uni-table-text[data-v-c1ea9b5d] {
-  position: absolute;
-  right: 0;
-  left: 0;
-  text-align: center;
-  font-size: 14px;
-  color: #999;
-}
-.uni-table-mask[data-v-c1ea9b5d] {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: rgba(255, 255, 255, 0.8);
-  z-index: 99;
-  display: flex;
-  margin: auto;
-  transition: all 0.5s;
-  justify-content: center;
-  align-items: center;
-}
-.uni-table--loader[data-v-c1ea9b5d] {
-  width: 30px;
-  height: 30px;
-  border: 2px solid #aaa;
-  border-radius: 50%;
-  animation: 2s uni-table--loader-c1ea9b5d linear infinite;
-  position: relative;
-}
-@keyframes uni-table--loader-c1ea9b5d {
-0% {
-    transform: rotate(360deg);
-}
-10% {
-    border-left-color: transparent;
-}
-20% {
-    border-bottom-color: transparent;
-}
-30% {
-    border-right-color: transparent;
-}
-40% {
-    border-top-color: transparent;
-}
-50% {
-    transform: rotate(0deg);
-}
-60% {
-    border-top-color: transparent;
-}
-70% {
-    border-left-color: transparent;
-}
-80% {
-    border-bottom-color: transparent;
-}
-90% {
-    border-right-color: transparent;
-}
-100% {
-    transform: rotate(-360deg);
-}
-}
 .select_wrap[data-v-7a3666ce] {
   width: 7.5rem;
   height: 2rem;
@@ -934,26 +538,9 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 }
 .xialaxz[data-v-fb393026] {
   zoom: 0.9;
-  display: flex;
+  overflow-x: scroll;
-  flex-direction: column;
-}
-.xialaxz > uni-view[data-v-fb393026] {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  border-top: 0.0625rem solid #00000010;
-  padding: 0.625rem 0;
-  box-sizing: border-box;
-  font-size: 0.875rem;
-  color: #092C4D;
-}
-.xialaxz > uni-view > uni-view[data-v-fb393026] {
   word-wrap: break-word;
   word-break: break-all;
-  margin-right: 0.625rem;
-}
-.xialaxz > uni-view > uni-view[data-v-fb393026]:nth-last-child(1) {
-  margin-right: 0;
 }
 .tabtip[data-v-fb393026] {
   display: flex;
@@ -1154,6 +741,34 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 .uni-table .active[data-v-fb393026]:hover {
   background: #ff4344 !important;
 }
+.main_title[data-v-fb393026] {
+  width: 100%;
+}
+.main_title > uni-view[data-v-fb393026] {
+  background: #eee;
+}
+.main_row[data-v-fb393026] {
+  display: flex;
+}
+.main_row.green[data-v-fb393026] {
+  color: #0a0;
+}
+.main_row.red[data-v-fb393026] {
+  color: #ff5500;
+}
+.main_row > uni-view[data-v-fb393026] {
+  padding: 0.3125rem 0.15625rem;
+  font-size: 0.9rem;
+  word-break: break-all;
+  text-align: center;
+  border-bottom: 0.03125rem dashed #999;
+  width: 7.5rem;
+  flex: none;
+}
+.main_row > uni-view:last-child.red[data-v-fb393026] {
+  background-color: #ff5500;
+  color: #fff;
+}
 .jumpBtn[data-v-fb393026] {
   position: fixed;
   bottom: 0.3125rem;
@@ -1166,4 +781,8 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 }
 .footer_container[data-v-fb393026] {
   height: 4.6875rem;
+}
+.jpScorllView[data-v-fb393026] {
+  width: 100%;
+  overflow: scroll;
 }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -17,8 +17,7 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    },
+    }
-    "enhance": true
   },
   "compileType": "miniprogram",
   "libVersion": "3.1.2",