From e309f70266c7f23dd9e67f539d99027b4664662a Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 7 Dec 2023 11:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tpx-search/tpx-search.vue | 27 +++++++++++----------------
 pages/address/edit.vue               |  4 ++--
 pages/address/list.vue               |  3 +--
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/components/tpx-search/tpx-search.vue b/components/tpx-search/tpx-search.vue
index 9075116..f3f09ef 100644
--- a/components/tpx-search/tpx-search.vue
+++ b/components/tpx-search/tpx-search.vue
@@ -1,23 +1,19 @@
 <template>
 	<view class="sch-cont">
 		<view>
-			<u-input shape="circle" :placeholder="placeholder" v-model="keyword" :custom-style="`background-color: ${bgColor};height: ${height}rpx;`" 
+			<u-input shape="circle" :placeholder="placeholder" v-model="keyword" :custom-style="`background-color: ${bgColor};height: ${height}rpx;${true?'padding-right:120rpx;': ''}`" 
 				 @focus="handleSwitchFouce()" @blur="handleSwitchFouce()"  @confirm="triggerChange()" @change="handleChange()">
-				<!-- <template v-slot:prefix>
-					<u-icon name="search" size="32"></u-icon>
-				</template> -->
-				<template v-slot:suffix>
-					<u-row>
-						<view v-if="focused && keyword.length > 0" style="0 20rpx 0 0">
-							<u-icon @click="handleClear()" color="#999"  name="close-circle-fill" size="36"></u-icon>
-						</view>
-						<view>
-							<u-icon @click="triggerChange()"  name="search" size="40" margin="0 0 0 20rpx"></u-icon>
-						</view>
-					</u-row>
-					<!-- <u-button type="primary" shape="circle"  custom-style="margin:0;height: 50rpx;">搜索</u-button> -->
-				</template>
 			</u-input>
+			<u-row justify="end" custom-style="position: absolute;width: 120rpx;top: 0;bottom: 0;right: 20rpx;">
+				<u-row justify="end" customStyle="height: 100%;width:100%;">
+					<u-row v-if="focused && keyword.length > 0"  @click="handleClear()" justify="end" style="0 20rpx 0 0;height: 100%;flex: 1;">
+						<u-icon color="#999"  name="close-circle-fill" size="36"></u-icon>
+					</u-row>
+					<u-row  @click="triggerChange()" justify="end" style="height: 100%;flex: 1;">
+						<u-icon name="search" size="40" margin="0 0 0 20rpx"></u-icon>
+					</u-row>
+				</u-row>
+			</u-row>
 		</view>
 		
 	</view>
@@ -79,7 +75,6 @@
 				}
 			},
 			handleClear( ) {
-				debugger
 				this.keyword = ''
 				this.triggerChange()
 			},
diff --git a/pages/address/edit.vue b/pages/address/edit.vue
index 41473af..9579853 100644
--- a/pages/address/edit.vue
+++ b/pages/address/edit.vue
@@ -78,13 +78,13 @@
 							    <u-checkbox
 									shape="circle"
 									size="28" label="默认地址" active-color="#B12D29" la
-									label-size="24" hange="handleFormChange()"
+									label-size="26" hange="handleFormChange()"
 							    >
 							    </u-checkbox>
 							  </u-checkbox-group>
 						</view>
 						<view>
-							<u-text text="清空" size="24" color="#0E0708"></u-text>
+							<u-text text="清空" size="26" color="#0E0708"></u-text>
 						</view>
 					</u-row>
 				</view>
diff --git a/pages/address/list.vue b/pages/address/list.vue
index aeb2d9d..070bffa 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -7,8 +7,7 @@
 				<view class="pgb-header">
 					<view class="com-jianju">
 						<!-- 关键字搜索框 -->
-						<u-search placeholder="请输入姓名/电话/地址关键字" v-model="searchParam.keyword" height="64" search-icon-size="40"
-							:clearabled="true" @change="(e)=> { handleSearchParamChange() }" :show-action="false"></u-search>
+						<tpx-search placeholder="请输入姓名/电话/地址关键字" v-model:value="searchParam.keyword" @change="handleSearchParamChange()" ></tpx-search>												
 					</view>
 					
 					<view class="com-jianju" style="padding-top: 40rpx;">