From 1d2309c339e7fdff94ca370828c5fc4948cde894 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 22 May 2019 23:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=9B=BD=E8=AF=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 7e7bc9c2271ea044b49a97a7c2bce03639a57354 [formerly 7e7bc9c2271ea044b49a97a7c2bce03639a57354 [formerly 7e7bc9c2271ea044b49a97a7c2bce03639a57354 [formerly 7e7bc9c2271ea044b49a97a7c2bce03639a57354 [formerly 764f5aaaa51c87117201055592c4500c2ac5a225 [formerly 4ff44b65dfb5193a8e665b47bde9420b3b0bf143]]]]]
Former-commit-id: 99f272b7caa6707e04a937ac24aad67b2a1a54a6
Former-commit-id: 37c5780ef1f6ea30d5a6b2a1e5d055a56d119a27
Former-commit-id: 5e10cbc2e29791330b5189f04f16ebe084ff5430 [formerly e6564a2bccc6cfb5b4a90ab9ce51793c1eeafbcd]
Former-commit-id: 99947591dfc5fdeb1c472bae3fe5b493c14660c5
Former-commit-id: 808ae463727f0a570f95d57827672d5a4cf22813
Former-commit-id: ba062ce52dfb808cb73d97d395d235873d2c8141
Former-commit-id: b6f083137751f8b06b329aca01362d56408a5a37
Former-commit-id: 4191cb34473f069304f6536bd4a3b38fb87fb9d3
---
 d2-admin.babel.REMOVED.git-id                 |  2 +-
 src/locales/en.json                           |  6 ++++-
 src/locales/ja.json                           |  6 ++++-
 src/locales/zh-chs.json                       |  6 ++++-
 src/locales/zh-cht.json                       |  6 ++++-
 .../system/index/components/d2-help/index.vue | 24 +++++++++++--------
 6 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/d2-admin.babel.REMOVED.git-id b/d2-admin.babel.REMOVED.git-id
index 9d2a0dfe..5d8f0c2e 100644
--- a/d2-admin.babel.REMOVED.git-id
+++ b/d2-admin.babel.REMOVED.git-id
@@ -1 +1 @@
-df03a79f990d713d14c11639842ec15c84f45469
\ No newline at end of file
+cbf998eca74f2ff50f199103bd08a4ed12aa4d4a
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index b1b92126..c47898dd 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -47,6 +47,10 @@
 				"help": {
 					"button": "need any help",
 					"dialog": {
+						"join": {
+							"qq": "QQ user group with 2000 people",
+							"we": "Invite the WeChat user group after becoming friends with the author"
+						},
 						"link": {
 							"text": {
 								"doc": "Document",
@@ -56,7 +60,7 @@
 						},
 						"sub-title": {
 							"doc": "Here are some references",
-							"join-chat-group": "Ask other users or authors"
+							"join": "Ask other users or authors"
 						},
 						"title": "Help"
 					}
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 3264a679..d5b4cfc9 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -47,6 +47,10 @@
 				"help": {
 					"button": "助けが必要ですか？",
 					"dialog": {
+						"join": {
+							"qq": "2000人のQQユーザーグループ",
+							"we": "著者と友達になった後にWeChatユーザーグループを招待する"
+						},
 						"link": {
 							"text": {
 								"doc": "文書",
@@ -56,7 +60,7 @@
 						},
 						"sub-title": {
 							"doc": "ここにいくつかの参照があります",
-							"join-chat-group": "他のユーザーや作者に尋ねる"
+							"join": "他のユーザーや作者に尋ねる"
 						},
 						"title": "ヘルプ"
 					}
diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json
index c6cb19ec..44fca0ab 100644
--- a/src/locales/zh-chs.json
+++ b/src/locales/zh-chs.json
@@ -47,6 +47,10 @@
 				"help": {
 					"button": "需要帮助吗",
 					"dialog": {
+						"join": {
+							"qq": "容纳 2000 人的 QQ 用户群",
+							"we": "与作者成为好友后邀请进微信用户群"
+						},
 						"link": {
 							"text": {
 								"doc": "文档",
@@ -56,7 +60,7 @@
 						},
 						"sub-title": {
 							"doc": "这里有一些参考资料",
-							"join-chat-group": "询问其它使用者或作者"
+							"join": "询问其它使用者或作者"
 						},
 						"title": "帮助"
 					}
diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json
index 33b4585e..5d72d3ee 100644
--- a/src/locales/zh-cht.json
+++ b/src/locales/zh-cht.json
@@ -47,6 +47,10 @@
 				"help": {
 					"button": "需要幫助嗎",
 					"dialog": {
+						"join": {
+							"qq": "容納 2000 人的 QQ 用戶群",
+							"we": "與作者成為好友後邀請進微信用戶群"
+						},
 						"link": {
 							"text": {
 								"doc": "文檔",
@@ -56,7 +60,7 @@
 						},
 						"sub-title": {
 							"doc": "這裡有一些參考資料",
-							"join-chat-group": "詢問其它使用者或作者"
+							"join": "詢問其它使用者或作者"
 						},
 						"title": "幫助"
 					}
diff --git a/src/views/system/index/components/d2-help/index.vue b/src/views/system/index/components/d2-help/index.vue
index 1a5759d5..83a59be0 100644
--- a/src/views/system/index/components/d2-help/index.vue
+++ b/src/views/system/index/components/d2-help/index.vue
@@ -1,10 +1,6 @@
 <template>
   <div>
-    <el-button
-      type="primary"
-      @click="dialogVisible = true"
-      plain
-      round>
+    <el-button type="primary" @click="dialogVisible = true" plain round>
       <d2-icon name="question-circle-o" class="d2-mr-5"/>
       {{ $t('views.system.index.help.button') }}
     </el-button>
@@ -31,15 +27,23 @@
             {{ $t('views.system.index.help.dialog.link.text.new-issue') }}
           </el-button>
         </el-button-group>
-        <h2>{{ $t('views.system.index.help.dialog.sub-title.join-chat-group') }}</h2>
+        <h2>{{ $t('views.system.index.help.dialog.sub-title.join') }}</h2>
         <el-row :gutter="20">
           <el-col :span="12">
-            <img src="./image/qq.jpg" class="d2-mb" style="width: 100%;">
-            <p>QQ群 [ 1500+ / 2000 人 ]</p>
+            <el-alert
+              :closable="false"
+              type="info"
+              :title="$t('views.system.index.help.dialog.join.qq')"
+              class="d2-mb"/>
+            <img src="./image/qq.jpg" style="width: 100%;">
           </el-col>
           <el-col :span="12">
-            <img src="./image/we.jpg" class="d2-mb" style="width: 100%;">
-            <p>与作者成为好友后邀请进微信群"</p>
+            <el-alert
+              :closable="false"
+              type="info"
+              :title="$t('views.system.index.help.dialog.join.we')"
+              class="d2-mb"/>
+            <img src="./image/we.jpg" style="width: 100%;">
           </el-col>
         </el-row>
       </div>