From 6e6b9307b7e59963456f089c97cf8e9b77e63c30 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 11 May 2024 17:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SecondPhase/DeliveryUnbindConfirm.vue | 18 +++++++++++++++---
 utils/mork2.js                              |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pages/SecondPhase/DeliveryUnbindConfirm.vue b/pages/SecondPhase/DeliveryUnbindConfirm.vue
index 7614fdc..e148d76 100644
--- a/pages/SecondPhase/DeliveryUnbindConfirm.vue
+++ b/pages/SecondPhase/DeliveryUnbindConfirm.vue
@@ -54,7 +54,7 @@
 		</view>
 		<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
 			<view class="pop-line"></view>
-			<view class="msg_content">
+			<view class="msg_content pdb110">
 				<view class="zd_wrapper grid-wraper">
 					<view class="slide_new">
 						<table>
@@ -107,21 +107,25 @@
 			</view>
 		</view>
 		<view v-if="show" class="msg_mask"></view>
+		<up-top ref="UT" :scrollTop="top"></up-top>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import UpTop from '@/components/upTop.vue'
 	import {twoPdaIvtDtlQuery, twoPdaIvtbBoxDtlQuery, twoPdaOutConfirm} from '@/utils/getData3.js'
 	// import {twoPdaIvtDtlQuery, twoPdaIvtbBoxDtlQuery} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			UpTop
 		},
 		data() {
 			return {
+				top: 0,
 				val1: '',
 				val2: '',
 				dataList: [],
@@ -133,6 +137,9 @@
 		onLoad (options) {
 			this.val2 = options.code
 		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
 		methods: {
 			handleChange (e) {
 				this._twoPdaIvtDtlQuery(e)
@@ -169,4 +176,9 @@
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<style lang="stylus" scoped>
+.pdb110
+	padding-bottom 110rpx
+</style>
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 1a47a37..b6e6ca2 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -96,13 +96,13 @@ export const twoPdaIvtQuery = (no, code) => {
 }
 export const twoPdaIvtDtlQuery = (no, code) => {
 	let res = {
-		data: [{package_box_sn: '1', point_code: 'ljdjldj'}, {package_box_sn: '2'}]
+		data: [{package_box_sn: '1', point_code: 'ljdjldj'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}]
 	}
 	return res
 }
 export const twoPdaIvtbBoxDtlQuery = (no) => {
 	let res = {
-		data: [{package_box_sn: '1', container_name: 'ljdjldj'}, {package_box_sn: '2'}]
+		data: [{package_box_sn: '1', container_name: 'ljdjldj'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}, {package_box_sn: '2'}]
 	}
 	return res
 }
\ No newline at end of file