From 1d4343e73107a574e5df53071de5894e849fc176 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 27 Mar 2024 11:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=20=20?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E5=95=86=E6=B8=B2=E6=9F=93=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=20=E5=AF=BC=E8=87=B4=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E5=95=86=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/agent/apply/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/marketing/agent/apply/index.vue b/src/views/marketing/agent/apply/index.vue
index 240727c..2ea939c 100644
--- a/src/views/marketing/agent/apply/index.vue
+++ b/src/views/marketing/agent/apply/index.vue
@@ -96,7 +96,7 @@
                   </template>
                   <template v-if="Number(scope.row.agent_type) == 8">
                     <el-tag type="info" effect="dark" size="small">配送商</el-tag>
-                    <el-tag v-if="Object.values(scope.row.merList).length > 0" type="success" effect="dark" size="small">
+                    <el-tag v-if="Object.values(scope.row.merList || {}).length > 0" type="success" effect="dark" size="small">
                       {{ scope.row.merList[0].mer_name }}
                       {{ Object.values(scope.row.merList).length > 1 ? '+'+Object.values(scope.row.merList).length : '' }}
                     </el-tag>
@@ -260,6 +260,7 @@ export default {
   components: { },
   data() {
     return {
+      moren: require("@/assets/images/f.png"),
       listLoading: true,
       tableFrom: {
         page: 1,