From 927e7cc69a1be219bc43b2def985b1e819f91f4c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 22 Jan 2024 15:48:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=BD=B4=E5=A5=97=E7=AE=A1=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                 |  4 ++--
 components/NavBar.vue                   |  2 +-
 pages/ProductManage/SlittingFeeding.vue | 11 +++++++++++
 pages/ProductManage/ZjCasing.vue        | 22 ++++++++++++++++++++--
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index e76759c..4598eb5 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -110,7 +110,7 @@ uni-button:after {
 	top: calc(var(--status-bar-height) + 72rpx);
 	width: 100%;
 	height: auto;
-	padding: 20rpx 14rpx 128rpx 14rpx;
+	padding: 0rpx 14rpx 108rpx 14rpx;
 	background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%)
 }
 .zd_wrapper {
@@ -280,7 +280,7 @@ uni-button:after {
 	width: 100%;
 	z-index: 200;
 	background-color: #fff;
-	padding: 20rpx;
+	padding: 10rpx;
 	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
 }
 .submit-button {
diff --git a/components/NavBar.vue b/components/NavBar.vue
index e45ed5f..0bb37e2 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -56,7 +56,7 @@
 	_wh(100%, calc(var(--status-bar-height) + 72rpx))
 	background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
 	z-index 200
-	padding 0 20rpx
+	padding var(--status-bar-height) 20rpx 0 
 .page_name
 	_font(32rpx, 32rpx, #fff,700,center)
 </style>
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index 21c4730..be69f90 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -82,6 +82,17 @@
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">{{$t('button.call')}}</button>
 			<button class="submit-button" @tap="searchList">{{$t('button.search')}}</button>
 		</view> -->
+		<!-- <view class="submit-bar_new">
+			<button class="submit-more" @tap="btn_active = true">···<br>more</button>
+			
+		</view>
+		<view class="more_btns_wraper" :class="btn_active ? 'popshow' : 'pophide'">
+			<view class="more_btns_items">
+				
+			</view>
+			<view class="more_btns_cancle" @tap="btn_active = false">取消</view>
+		</view>
+		<view v-if="btn_active" class="msg_mask"></view> -->
 		<view class="submit-bar_new">
 			<button class="submit-more" @tap="btn_active = true">···<br>more</button>
 			<button class="submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">{{$t('button.call')}}</button>
diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index 83bf010..a4c16e1 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -94,12 +94,25 @@
 			</view>
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
-		<view class="submit-bar">
+		<!-- <view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled2" @tap="_casingWearConfirm">{{$t('button.through-shaft-confirm')}}</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled1" @tap="_casingOutConfirm">{{$t('button.pull-shaft-confirm')}}</button>
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">{{$t('button.overlap-shaft-confirm')}}</button>
 			<button class="submit-button" @tap="searchList">{{$t('button.search')}}</button>
+		</view> -->
+		<view class="submit-bar_new">
+			<button class="submit-more" @tap="btn_active = true">···<br>more</button>
+			<button class="submit-button_new" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">{{$t('button.overlap-shaft-confirm')}}</button>
+			<button class="submit-button_new" @tap="searchList">{{$t('button.search')}}</button>
 		</view>
+		<view class="more_btns_wraper" :class="btn_active ? 'popshow' : 'pophide'">
+			<view class="more_btns_items">
+				<button class="more-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled2" @tap="_casingWearConfirm">{{$t('button.through-shaft-confirm')}}</button>
+				<button class="more-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled1" @tap="_casingOutConfirm">{{$t('button.pull-shaft-confirm')}}</button>
+			</view>
+			<view class="more_btns_cancle" @tap="btn_active = false">取消</view>
+		</view>
+		<view v-if="btn_active" class="msg_mask"></view>
 	</view>
 </template>
 
@@ -136,7 +149,8 @@
 				pageNum: 1,
 				pageSize: 10,
 				disabled1: false,
-				disabled2: false
+				disabled2: false,
+				btn_active: false
 			};
 		},
 		created () {
@@ -229,6 +243,7 @@
 				this.disabled1 = true
 				if (!this.val1 || !this.val2) {
 					this.disabled1 = false
+					this.btn_active = false
 					return
 				}
 				try {
@@ -238,6 +253,7 @@
 					this.val1 = ''
 					this.val2 = ''
 					this.val4 = ''
+					this.btn_active = false
 					this.searchList()
 					uni.showToast({
 						title: res.message,
@@ -252,6 +268,7 @@
 				this.disabled2 = true
 				if (!this.val1 || !this.val2) {
 					this.disabled2 = false
+					this.btn_active = false
 					return
 				}
 				try {
@@ -261,6 +278,7 @@
 					this.val1 = ''
 					this.val2 = ''
 					this.val4 = ''
+					this.btn_active = false
 					this.searchList()
 					uni.showToast({
 						title: res.message,