From 9ce1c89d90861b6a9882ab16b622b232e313622a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 8 Nov 2022 13:52:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue         | 3 ++-
 project/tianfuxing/AppMerchantList/AppMerchantList.vue | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue b/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue
index 1c703f7d..4ae8484c 100644
--- a/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue
+++ b/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue
@@ -18,7 +18,8 @@
           :size.sync="page.size" @getList="getList" class="ai-table">
           <el-table-column label="banner封面" align="left" width="150" slot="banner">
             <template slot-scope="{ row }">
-              <img :src="row.banner" alt="" class="banner-img" />
+              <!-- <img :src="row.banner" alt="" class="banner-img" /> -->
+              <el-image class="banner-img" :src="row.banner" :preview-src-list="[row.banner]"/>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="200" slot="option">
diff --git a/project/tianfuxing/AppMerchantList/AppMerchantList.vue b/project/tianfuxing/AppMerchantList/AppMerchantList.vue
index 16d87828..41a16b36 100644
--- a/project/tianfuxing/AppMerchantList/AppMerchantList.vue
+++ b/project/tianfuxing/AppMerchantList/AppMerchantList.vue
@@ -16,7 +16,7 @@
             ></ai-select>
           </template>
           <template #right>
-            <el-input v-model="search.merchantName" class="search-input" size="small" placeholder="请输入姓名/手机号" clearable @change="getList" @clear="page.current = 1, (search.merchantName = ''), getList()" suffix-icon="iconfont iconSearch">
+            <el-input v-model="search.merchantName" class="search-input" size="small" placeholder="请输入商户名称" clearable @change="getList" @clear="page.current = 1, (search.merchantName = ''), getList()" suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
         </ai-search-bar>
@@ -50,7 +50,7 @@
           <ai-uploader v-model="dialogInfo.photoList" :instance="instance" :limit="1"></ai-uploader>
         </el-form-item>
         <el-form-item label="商户名称" prop="merchantName">
-          <el-input placeholder="请输入等级名称" :maxlength="30" show-word-limit v-model="dialogInfo.merchantName"></el-input>
+          <el-input placeholder="请输入商户名称" :maxlength="30" show-word-limit v-model="dialogInfo.merchantName"></el-input>
         </el-form-item>
         <el-form-item style="width: 100%" label="地理位置" prop="address">
           <el-button @click="showMap = true">地图标绘</el-button>