From 404d5ad4aa11db119d0bde09bd994a63adf7f5d5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 3 Dec 2022 14:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=8E=B7=E5=8F=96=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                       |  5 +++++
 components/SearchBox.vue                      | 17 +++++++++++++----
 pages/WarehouseManage/CustomerLabelPrint.vue  |  1 +
 pages/WarehouseManage/InStoreConfirm.vue      |  1 +
 pages/WarehouseManage/ProdDeliveryConfirm.vue |  2 +-
 pages/WarehouseManage/ReturngoodsInStore.vue  |  1 +
 pages/WarehouseManage/ScrapInStore.vue        |  1 +
 pages/WarehouseManage/XuniDelivery.vue        |  2 +-
 pages/WarehouseManage/XuniDeliveryConfirm.vue |  2 +-
 9 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 9266117..9bf72a8 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -59,6 +59,11 @@ uni-button:after {
 	line-height: 70rpx;
 	color: #323232;
 }
+.icon_del {
+	font-size: 48rpx;
+	line-height: 70rpx;
+	color: #323232;
+}
 .icon_search {
 	color: #323232;
 	line-height: 70rpx;
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 048d41d..63134f7 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -4,8 +4,10 @@
 		type="text" 
 		class="filter_input search_input" 
 		:value="value"
+		:focus="focused"
 		@input="handleChange($event)">
 		<view class="buttons_wraper">
+			<span class="iconfont icon-del" @tap="toDel">&#xe6dc;</span>
 			<span class="iconfont icon_scan" @tap="toScan">&#xe6e2;</span>
 			<span v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</span>
 		</view>
@@ -27,9 +29,13 @@
 		props: {
 			value: String,
 			seaShow: {
-			      type: Boolean,
-			      default: false
-			    },
+			  type: Boolean,
+			  default: false
+			},
+			focused: {
+				type: Boolean,
+				default: false
+			}
 		},
 		methods: {
 			handleChange ($event) {
@@ -40,6 +46,9 @@
 			toSearch () {
 				this.$emit('toSearch', this.cur)
 			},
+			toDel () {
+				this.$emit('input', '')
+			},
 			async toScan() {
 				// #ifdef APP-PLUS
 				let status = await this.checkPermission();
@@ -92,7 +101,7 @@
 	position relative
 	_wh(100%, 70rpx)
 .search_input
-	padding-right: 140rpx;
+	padding-right: 160rpx;
 .buttons_wraper
 	position absolute
 	top 0
diff --git a/pages/WarehouseManage/CustomerLabelPrint.vue b/pages/WarehouseManage/CustomerLabelPrint.vue
index 88adecb..6b4fa56 100644
--- a/pages/WarehouseManage/CustomerLabelPrint.vue
+++ b/pages/WarehouseManage/CustomerLabelPrint.vue
@@ -10,6 +10,7 @@
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
+						:focused="true"
 						@handleChange="handleChange"
 						/>
 					</view>
diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index 022b7cc..e2b4dee 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -10,6 +10,7 @@
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
+						:focused="true"
 						@handleChange="handleChange"
 						/>
 					</view>
diff --git a/pages/WarehouseManage/ProdDeliveryConfirm.vue b/pages/WarehouseManage/ProdDeliveryConfirm.vue
index 2c03630..c3818b3 100644
--- a/pages/WarehouseManage/ProdDeliveryConfirm.vue
+++ b/pages/WarehouseManage/ProdDeliveryConfirm.vue
@@ -8,7 +8,7 @@
 						<span class="filter_label">木箱</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val1" @handleChange="handleChange1" 
+						<search-box v-model="val1" :focused="true" @handleChange="handleChange1" 
 						/>
 					</view>
 				</view>
diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue
index 6886dcc..7559a5e 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -10,6 +10,7 @@
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
+						:focused="true"
 						@handleChange="handleChange"
 						/>
 					</view>
diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index 91c8d91..32c1187 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -10,6 +10,7 @@
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
+						:focused="true"
 						@handleChange="handleChange"
 						/>
 					</view>
diff --git a/pages/WarehouseManage/XuniDelivery.vue b/pages/WarehouseManage/XuniDelivery.vue
index 6553fdd..83eab8b 100644
--- a/pages/WarehouseManage/XuniDelivery.vue
+++ b/pages/WarehouseManage/XuniDelivery.vue
@@ -8,7 +8,7 @@
 						<span class="filter_label">木箱</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val1" @handleChange="handleChange1" 
+						<search-box v-model="val1" :focused="true" @handleChange="handleChange1" 
 						/>
 					</view>
 				</view>
diff --git a/pages/WarehouseManage/XuniDeliveryConfirm.vue b/pages/WarehouseManage/XuniDeliveryConfirm.vue
index 6997e30..05cffe2 100644
--- a/pages/WarehouseManage/XuniDeliveryConfirm.vue
+++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue
@@ -8,7 +8,7 @@
 						<span class="filter_label">木箱</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val1" 
+						<search-box v-model="val1" :focused="true" 
 						/>
 					</view>
 				</view>