From b877a3e8286bdbbabcfb9402e7e92ca3eb670624 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 18 Aug 2025 16:16:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E4=BD=9C=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E5=8F=AF=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/coopMerchant.vue | 28 ++++++++++++++++++++++++++--
 src/pages/tabbar/onlineShop.vue   |  6 +++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/pages/tabbar/coopMerchant.vue b/src/pages/tabbar/coopMerchant.vue
index 01395e0..92d498f 100644
--- a/src/pages/tabbar/coopMerchant.vue
+++ b/src/pages/tabbar/coopMerchant.vue
@@ -11,6 +11,7 @@ const state = reactive<any>({
 	pa: {
 		pagesize: 10,
 		type: "2",
+		name: "",
 		catgoryId: null,
 	},
 	tabs: [{ id: null, name: "全部", disabled: false }],
@@ -40,6 +41,10 @@ onShow(() => {
 	pageRef.value && pageRef.value.reload(false)
 })
 
+const search = () => {
+	pageRef.value && pageRef.value.reload(true)
+}
+
 const doTab = (e: any) => {
 	const target = state.tabs[e]
 	state.pa.catgoryId = target.id
@@ -74,12 +79,31 @@ const toDetail = async (v: any) => {
 		>
 			<template #top>
 				<view class="h-30rpx" />
-				<view class="bg-white rounded-16rpx px-20rpx">
+				<view class="flex w-full">
+					<tm-input
+						class="flex-1"
+						v-model="state.pa.name"
+						type="text"
+						height="66"
+						minHeight="66"
+						fontSize="28"
+						:showClear="true"
+						:focus="false"
+						placeholder="请输入商家名称"
+						style="border: 2rpx solid #0779fd; border-radius: 14rpx"
+						:focus-highlight="false"
+						color="#ECF4F9"
+					>
+						<template v-slot:rightIcon>
+							<tm-button class="mr-1 py-3" size="xs" @click="search">搜索</tm-button>
+						</template>
+					</tm-input>
+				</view>
+				<view class="bg-white rounded-16rpx px-20rpx my-20rpx">
 					<z-tabs :list="state.tabs" @change="doTab" />
 				</view>
 			</template>
 
-			<view class="h-20rpx" />
 			<view class="flex-row card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
 				<image class="w-180rpx h-180rpx rounded-12rpx my-auto" :src="filePath(v.logoPic)" mode="aspectFill" />
 				<view class="flex-1 flex-col m-l-20rpx">
diff --git a/src/pages/tabbar/onlineShop.vue b/src/pages/tabbar/onlineShop.vue
index ccdfa3e..0037727 100644
--- a/src/pages/tabbar/onlineShop.vue
+++ b/src/pages/tabbar/onlineShop.vue
@@ -29,9 +29,9 @@
 						class="flex-1"
 						v-model="state.params.keyword"
 						type="text"
-						:height="66"
-						:minHeight="66"
-						:fontSize="28"
+						height="66"
+						minHeight="66"
+						fontSize="28"
 						:showClear="true"
 						:focus="false"
 						placeholder="请输入商品名称"