From 6bd3f751c8f127b5e8f8bb236a1551121287fe1e Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 17 Nov 2020 19:17:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=95=99=E8=A8=80=E6=9D=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cd59d4e26e1967aa58cff30ec060e52e1abd8eca) --- src/views/newMap/displayNew/demon/messageBoard.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/newMap/displayNew/demon/messageBoard.vue b/src/views/newMap/displayNew/demon/messageBoard.vue index ca0741d54..d6b74ff69 100644 --- a/src/views/newMap/displayNew/demon/messageBoard.vue +++ b/src/views/newMap/displayNew/demon/messageBoard.vue @@ -311,6 +311,8 @@ export default { this.commentContentNoName = val.slice(this.replyUserName.length); } else if (this.replyUserName) { this.commentContent = this.replyUserName + this.commentContentNoName; + } else { + this.commentContentNoName = this.commentContent; } } } From 34775ad6902997938b08ebdc4cbe624721ca1a9e Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 17 Nov 2020 19:38:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?jenkins=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-prd | 1 - Jenkinsfile-test | 1 - 2 files changed, 2 deletions(-) diff --git a/Jenkinsfile-prd b/Jenkinsfile-prd index 1bd53bb27..09cd9e7b6 100644 --- a/Jenkinsfile-prd +++ b/Jenkinsfile-prd @@ -11,7 +11,6 @@ pipeline { nodejs 'nodejs-10' } steps { - sh 'npm update' sh 'npm install' sh 'npm run build' } diff --git a/Jenkinsfile-test b/Jenkinsfile-test index fff7d237c..7961d5f98 100644 --- a/Jenkinsfile-test +++ b/Jenkinsfile-test @@ -11,7 +11,6 @@ pipeline { nodejs 'nodejs-10' } steps { - sh 'npm update' sh 'npm install' sh 'npm run test' }