From b4604fa746b17f1fc986484b8055172c373d32f8 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 11 May 2024 16:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=BD=B4=E8=BF=9B=E7=AB=99=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl                 | 12 +++++++-----
 pages/ProductManage/ZjInStore.vue        |  5 +----
 pages/SecondPhase/slitting/ZjInStore.vue | 14 +++++++++-----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index aca6888..0fa64db 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -33,16 +33,18 @@ uni-button:after {
 	color: #D7592F ;
 }
 .icon_unchecked {
+	display: inline-block;
 	color: #fff;
-	width: 32rpx;
-	height: 32rpx;
+	width: 42rpx;
+	height: 42rpx;
 	background-color: #fff;
-	font-size: 24rpx;
-	line-height: 28rpx;
+	font-size: 28rpx;
+	line-height: 38rpx;
 	border: 1rpx solid #bbb;
+	border-radius: 8rpx;
 }
 .icon_checked {
-	color: #D7592F ;
+	background-color: #D7592F ;
 	border: 1rpx solid #D7592F ;
 }
 .icon_back {
diff --git a/pages/ProductManage/ZjInStore.vue b/pages/ProductManage/ZjInStore.vue
index ab6ab73..d8fc015 100644
--- a/pages/ProductManage/ZjInStore.vue
+++ b/pages/ProductManage/ZjInStore.vue
@@ -172,7 +172,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/ZjInStore.vue b/pages/SecondPhase/slitting/ZjInStore.vue
index ab6ab73..c187802 100644
--- a/pages/SecondPhase/slitting/ZjInStore.vue
+++ b/pages/SecondPhase/slitting/ZjInStore.vue
@@ -63,20 +63,24 @@
 			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index1 || !pkId}" :disabled="disabled" @tap="_inConfirm">上空轴</button>
 			<button class="zd-col-6 btn-submit btn-success letter-30" @tap="_queryMaterialInfo">查询</button>
 		</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 {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			UpTop
 		},
 		data() {
 			return {
+				top: 0,
 				options1: [],
 				index1: '',
 				options2: [],
@@ -89,6 +93,9 @@
 				disabled: false
 			};
 		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
 		created () {
 			this._queryProductArea()
 			this._queryMaterialInfo()
@@ -172,7 +179,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-</style>
+</script>
\ No newline at end of file