From 4c84f63a932ab856ac39716e4d824c2dcf986c8c Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 7 May 2026 14:17:51 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E4=BA=91=E7=81=B5AI):[#5228]=E7=A4=BC?=
 =?UTF-8?q?=E5=93=81=E5=8D=A1=E7=89=87=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 76eea8dcb4064ef6babb3b15b641036547b129b9)
---
 aiChat/views/history.vue | 2 +-
 aiChat/views/index.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aiChat/views/history.vue b/aiChat/views/history.vue
index 3abebb2..deca2ff 100644
--- a/aiChat/views/history.vue
+++ b/aiChat/views/history.vue
@@ -170,7 +170,7 @@
                             mode="widthFix"
                             lazy-load
                           />
-                          <text class="s-name">{{ goodItem.storeName }}</text>
+                          <text class="s-name">{{ goodItem.merName ||goodItem.storeName }}</text>
                           <u-icon name="arrow-right" color="#999" size="12"></u-icon>
                         </view>
                         <view class="title one-t">{{ goodItem.name }}</view>
diff --git a/aiChat/views/index.vue b/aiChat/views/index.vue
index d3a862b..6567589 100644
--- a/aiChat/views/index.vue
+++ b/aiChat/views/index.vue
@@ -286,7 +286,7 @@
                             mode="widthFix"
                             lazy-load
                           />
-                          <text class="s-name">{{ goodItem.storeName }}</text>
+                          <text class="s-name">{{ goodItem.merName ||goodItem.storeName }}</text>
                           <u-icon name="arrow-right" color="#999" size="12"></u-icon>
                         </view>
                         <view class="title one-t">{{ goodItem.name }}</view>