Просмотр исходного кода

修改参数,拍照预览保存后返回不显示下一项bug修复

ZhangLeo 1 неделя назад
Родитель
Сommit
2388a69457

+ 7 - 3
pages/work/record/Camera.uvue

@@ -69,25 +69,29 @@
 				intervalId: -1,
 				timeoutStr: '30',
 				recordId: 0,
-				num: 0
+				num: 0,
+				maxcount: 0,
 			}
 		},
 		onLoad(options) {
 			let recordId = options?.['id'] ?? ''
 			let num = options?.['num'] ?? ''
-			console.log(recordId)
+			let maxcount = options?.['maxcount'] ?? ''
 			if(recordId!=''){
 				this.recordId = parseInt(recordId)
 			}
 			if(num!=''){
 				this.num = parseInt(num)
 			}
+			if(maxcount!=''){
+				this.maxcount = parseInt(maxcount)
+			}
 		},
 
 		methods: {
 			handleScanCode() {
 				if(this.imageSrc!=""){
-					let params = "path="+this.imageSrc+"&recordId="+this.recordId+"&num="+this.num
+					let params = "path="+this.imageSrc+"&recordId="+this.recordId+"&num="+this.num+"&maxcount="+this.maxcount
 					uni.navigateTo({
 						url: "/pages/work/record/camera-scan-code?"+params
 					})

+ 3 - 3
pages/work/record/RecordList.uvue

@@ -55,7 +55,7 @@
 				<text class="value">{{ item.num }}</text>
 			</view>
 
-			<button class="cancel-btn" v-if="item.status == 1 || item.status == 2" @click="cancel(item.sxid, item.num)">
+			<button class="cancel-btn" v-if="item.status == 1 || item.status == 2" @click="cancel(item.sxid, item.num, maxcount)">
 				拍照
 			</button>
 
@@ -313,9 +313,9 @@
 		});
 	}
 
-	const cancel = (id : number, num : number) => {
+	const cancel = (id : number, num : number, maxcount : number) => {
 		uni.navigateTo({
-			url: `/pages/work/record/Camera?id=${id}&num=${num}`
+			url: `/pages/work/record/Camera?id=${id}&num=${num}&maxcount=${maxcount}`
 		})
 	}
 	defineExpose({

+ 8 - 3
pages/work/record/camera-scan-code.uvue

@@ -100,6 +100,7 @@
 					invname: ""
 				} as JoinRecord,
 				num: 0,
+				maxcount: 0,
 				dyImgName: '',
 				minAvailableNumber: 1,
 				data: [{
@@ -113,7 +114,7 @@
 			// 覆盖系统默认的返回行为,返回到指定页面
 			//?photoitem=${photoitem}&num=${num}&pid=${pid}
 			uni.navigateTo({
-				url: `/pages/work/record/RecordList?photoitem=${this.joinRecord.photoitem}&num=${this.joinRecord.num}&pid=${this.joinRecord.pid}&senum=${this.joinRecord.senum}`,
+				url: `/pages/work/record/RecordList?photoitem=${this.joinRecord.photoitem}&num=${this.maxcount}&pid=${this.joinRecord.pid}&senum=${this.joinRecord.senum}`,
 				// 修改动画方向为从左到右退回
 				animationType: 'slide-in-left', // 使用从左到右滑出的动画效果
 				animationDuration: 300 // 动画持续时间,单位ms
@@ -125,6 +126,7 @@
 			this.path = options?.['path'] ?? ''
 			let recordId = options?.['recordId'] ?? ''
 			let num = options?.['num'] ?? ''
+			let maxcount = options?.['maxcount'] ?? ''
 			console.log(this.path)
 			if (this.path != '') {
 				this.data = []
@@ -155,6 +157,9 @@
 			if (num != '') {
 				this.num = parseInt(num)
 			}
+			if (maxcount != '') {
+				this.maxcount = parseInt(maxcount)
+			}
 		},
 		methods: {
 			navigateBack() {
@@ -269,9 +274,9 @@
 						});
 						const newPath = `${uni.env.USER_DATA_PATH}/uploadImgs/${newImgName}`
 						this.renameFile(this.path, newPath)
-						
+
 						uni.navigateTo({
-							url: `/pages/work/record/RecordList?photoitem=${this.joinRecord.photoitem}&num=${this.joinRecord.num}&pid=${this.joinRecord.pid}&senum=${this.joinRecord.senum}`,
+							url: `/pages/work/record/RecordList?photoitem=${this.joinRecord.photoitem}&num=${this.maxcount}&pid=${this.joinRecord.pid}&senum=${this.joinRecord.senum}`,
 							// 修改动画方向为从左到右退回
 							animationType: 'slide-in-left', // 使用从左到右滑出的动画效果
 							animationDuration: 300 // 动画持续时间,单位ms