From 221dc8d03367861e6cad279c806b1cef230ac60c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 24 Jan 2024 15:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |  2 +-
 common/style/layout.css                 |  5 ++-
 components/NavBar.vue                   |  3 +-
 components/upTop.vue                    | 49 +++++++++++++++++++++++++
 pages/ProductManage/SlittingFeeding.vue |  9 ++++-
 5 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 components/upTop.vue

diff --git a/App.vue b/App.vue
index f6ef8a2..5ec23a7 100644
--- a/App.vue
+++ b/App.vue
@@ -20,6 +20,6 @@
 <style>
 	/*每个页面公共css */
 	@import '@/common/style/reset.css';
-	@import '@/common/style/uni.css';
+	/* @import '@/common/style/uni.css'; */
 	@import '@/common/style/layout.css';
 </style>
diff --git a/common/style/layout.css b/common/style/layout.css
index 4598eb5..871bfbc 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -110,8 +110,9 @@ uni-button:after {
 	top: calc(var(--status-bar-height) + 72rpx);
 	width: 100%;
 	height: auto;
-	padding: 0rpx 14rpx 108rpx 14rpx;
-	background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%)
+	padding: 20rpx 14rpx 140rpx 14rpx;
+	/* background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%) */
+	background-color: #f6f6f6;
 }
 .zd_wrapper {
 	width: 100%;
diff --git a/components/NavBar.vue b/components/NavBar.vue
index 0bb37e2..f9403e8 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -54,7 +54,8 @@
 	_fj()
 	position fixed
 	_wh(100%, calc(var(--status-bar-height) + 72rpx))
-	background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
+	// background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
+	background-color $red
 	z-index 200
 	padding var(--status-bar-height) 20rpx 0 
 .page_name
diff --git a/components/upTop.vue b/components/upTop.vue
new file mode 100644
index 0000000..7bea536
--- /dev/null
+++ b/components/upTop.vue
@@ -0,0 +1,49 @@
+<template>
+	<view class="back-top" @tap="toTop" v-show="showBtn">
+		<uni-icons class="zd_icon_wraper" type="arrow-up" size="30"></uni-icons>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"upTop",
+		data() {
+			return {
+				showBtn: false
+			};
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0
+			}
+		},
+		methods: {
+			topData(e) {
+				this.showBtn = e > 50
+			},
+			// 返回顶部
+			toTop() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 100
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.back-top
+	position: fixed;
+	z-index: 9999;
+	right: 20rpx;
+	bottom: 150rpx;
+	background-color: #fff;
+	width: 80rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	border-radius: 50%;
+	text-align: center;
+	box-shadow: 0 4rpx 16rpx rgba(28,31,35,.3);
+</style>
\ No newline at end of file
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index be69f90..6f3fe84 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -140,20 +140,24 @@
 			</view>
 		</view>
 		<view v-if="active" 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 {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			UpTop
 		},
 		data() {
 			return {
+				top: 0,
 				val1: '',
 				val2: '',
 				options: [],
@@ -181,6 +185,9 @@
 				btn_active: false
 			};
 		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
 		created () {
 			this._queryProductArea()
 		},