From a226085075e36accdc881038a6d93438a6d189d2 Mon Sep 17 00:00:00 2001 From: unknown <1104423600@qq.com> Date: Tue, 27 Jul 2021 22:39:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=81=E5=AE=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linkwe-ui/src/views/communityOperating/oldCustomer/list.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue b/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue index d223f3ef2..b92ca6ae6 100644 --- a/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue +++ b/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue @@ -127,7 +127,8 @@ export default { }, // 获取显示用tag字符串 getDisplayTags(row) { - const tags = row.tagList.map((t) => t.name) + if (!(row && row.length > 0)) return '' + const tags = row.tagList.map((t) => t && t.name ? t.name : '') return tags.join(' ') }, -- Gitee From 74fc57eaccc5bf8f9395b07fc37a3d22b135f619 Mon Sep 17 00:00:00 2001 From: xinla <1570728529@qq.com> Date: Thu, 29 Jul 2021 00:54:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linkwe-ui/src/layout/components/Navbar.vue | 23 +- linkwe-ui/src/store/modules/user.js | 78 +- .../src/views/conversation/component/chat.vue | 5 - .../views/conversation/component/curList.vue | 10 - .../conversation/component/customerList.vue | 3 - .../conversation/component/groupList.vue | 4 +- .../conversation/component/insideList.vue | 4 +- .../src/views/conversation/component/list.vue | 3 - linkwe-ui/src/views/index.vue | 921 ++++++++++-------- 9 files changed, 552 insertions(+), 499 deletions(-) diff --git a/linkwe-ui/src/layout/components/Navbar.vue b/linkwe-ui/src/layout/components/Navbar.vue index 767447633..6ea962968 100644 --- a/linkwe-ui/src/layout/components/Navbar.vue +++ b/linkwe-ui/src/layout/components/Navbar.vue @@ -17,7 +17,7 @@