From 5e5e5cb1d54a23e6b187204470baad6585ca6123 Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Fri, 29 May 2026 14:32:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(merch/detail):=20=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E6=B3=A8=E9=87=8A=E5=B9=B6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E5=B8=83=E5=B1=80=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 移除搜索区域和筛选区域的冗余注释代码
2. 调整商品信息区域的DOM结构，新增merch-info-wrap容器统一布局
3. 修复筛选区域的点击事件绑定，将点击逻辑移到外层容器
---
 pages_promotion/merch/detail.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
index 4f5d148..ecd7842 100644
--- a/pages_promotion/merch/detail.vue
+++ b/pages_promotion/merch/detail.vue
@@ -3,14 +3,14 @@
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row" style="margin-bottom: 20rpx;">
-
-
-				<!-- 	<view class="flex-item input-wrap">
+				<view class="flex-item input-wrap">
 					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" placeholder="请输入您要搜索的商品" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
-				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view> -->
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view>
+			</view>
 
+			<view class="merch-info-wrap">
 				<view class="merch-image-wrap">
 					<image :src="$util.img(merch.merch_image)" mode="widthFix" class="merch-image-wrap"  show-menu-by-longpress/>
 				</view>
@@ -25,7 +25,6 @@
 					</view>
 					<view class="desc-text" @longpress="showFullDesc">{{ merch.desc }}</view>
 				</view>
-
 			</view>
 
 			<!-- 排序 -->
@@ -50,12 +49,12 @@
 					</view>
 				</view>
 
-				<!-- 	<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
-					<text @click="sortTabClick('screen')">筛选</text>
-					<view @click="sortTabClick('screen')" class="iconfont-wrap">
+				<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap" @click="showScreen = true">
+					<text @click="showScreen = true">筛选</text>
+					<view @click="showScreen = true" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
 					</view>
-				</view> -->
+				</view>
 			</view>
 		</view>
 
@@ -377,6 +376,11 @@ export default {
 	padding-top: 22rpx;
 }
 
+.merch-info-wrap {
+	display: flex;
+	padding: 20rpx;
+}
+
 .merch-name {
 	line-height: 1;
 	font-size: 32rpx;