From 199bc7185e8b374c1eb9cc1c28a8943a34f695e5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 13 May 2024 15:00:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E3=80=81=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E3=80=81=E6=8A=A5=E5=BA=9F=E3=80=81=E6=8B=86=E5=88=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=9C=A8=E7=AE=B1=E6=89=AB=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl                     |  9 +++++++++
 components/SearchBoxMx.vue                   | 15 ++++++++-------
 pages/WarehouseManage/InStoreConfirm.vue     |  2 +-
 pages/WarehouseManage/InStoreSplit.vue       |  2 +-
 pages/WarehouseManage/ReturngoodsInStore.vue |  2 +-
 pages/WarehouseManage/ScrapInStore.vue       |  2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index c88b228..f391051 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -206,6 +206,15 @@ uni-button:after {
 .filter_input_disabled {
 	background-color: #eee;
 }
+.scan_input {
+	width: 100%;
+	height: 80rpx;
+	font-size: 28rpx;
+	line-height: 80rpx;
+	color: #606266;
+	border: 0;
+	background-color: transparent;
+}
 .filter_item-1 {
 	border-bottom: 2rpx solid #dcdfe6;
 }
diff --git a/components/SearchBoxMx.vue b/components/SearchBoxMx.vue
index da907d1..c9698af 100644
--- a/components/SearchBoxMx.vue
+++ b/components/SearchBoxMx.vue
@@ -1,11 +1,8 @@
 <template>
-	<view class="search_wraper">
+	<view class="zd-row scan_wraper">
 		<slot></slot>
-		<view class="buttons_wraper">
-			<view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view>
-			<view class="iconfont icon_scan" :class="{'icon_scan_active': focused === true}" @tap="toScan">&#xe6e2;</view>
-			<view class="iconfont icon_phone" @tap="toPhone">&#xe663;</view>
-		</view>
+		<uni-icons class="mgr20" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
+		<uni-icons type="scan" size="22" :color="focused ? '#D7592F' : '#666'" @tap="toScan"></uni-icons>
 	</view>
 </template>
 
@@ -72,9 +69,13 @@
 
 <style lang="stylus" scoped>
 @import '../common/style/mixin.styl';
-.search_wraper
+.scan_wraper
 	position relative
 	_wh(100%, 80rpx)
+	border: 1px solid #dcdfe6;
+	background-color: #fff;
+	border-radius: 10rpx;
+	padding: 0 10rpx
 .search_input
 	padding-right: 160rpx;
 .buttons_wraper
diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index a8eec4f..a334530 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -9,7 +9,7 @@
 					</view>
 					<view class="filter_input_wraper">
 						<search-box-mx :focused="focused" @inputDel="inputDel" @inputScan="inputScan" @toPhone="toPhone">
-							<input type="text" class="filter_input search_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
+							<input type="text" class="scan_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
 						</search-box-mx>
 					</view>
 				</view>
diff --git a/pages/WarehouseManage/InStoreSplit.vue b/pages/WarehouseManage/InStoreSplit.vue
index 779fcc0..d2e7505 100644
--- a/pages/WarehouseManage/InStoreSplit.vue
+++ b/pages/WarehouseManage/InStoreSplit.vue
@@ -9,7 +9,7 @@
 					</view>
 					<view class="filter_input_wraper">
 						<search-box-mx :focused="focused" @inputDel="inputDel" @inputScan="inputScan" @toPhone="toPhone">
-							<input type="text" class="filter_input search_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
+							<input type="text" class="scan_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
 						</search-box-mx>
 					</view>
 				</view>
diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue
index c115471..c9f4b5c 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -9,7 +9,7 @@
 					</view>
 					<view class="filter_input_wraper">
 						<search-box-mx :focused="focused" @inputDel="inputDel" @inputScan="inputScan" @toPhone="toPhone">
-							<input type="text" class="filter_input search_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
+							<input type="text" class="scan_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
 						</search-box-mx>
 					</view>
 				</view>
diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index f497d5e..4acd763 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -9,7 +9,7 @@
 					</view>
 					<view class="filter_input_wraper">
 						<search-box-mx :focused="focused" @inputDel="inputDel" @inputScan="inputScan" @toPhone="toPhone">
-							<input type="text" class="filter_input search_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
+							<input type="text" class="scan_input" v-model="val1" :focus="focused" @input="onKeyInput" @focus="onFocus" @blur="onBlur">
 						</search-box-mx>
 					</view>
 				</view>