From ea661c3d44dd75ff9fb6dea856bfb3e369ff7d79 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 23 May 2019 09:37:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E5=B8=AE?= =?UTF-8?q?=E5=8A=A9=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 1bc853278099c5f2f050d3104df582f134ff7671 [formerly 1bc853278099c5f2f050d3104df582f134ff7671 [formerly 1bc853278099c5f2f050d3104df582f134ff7671 [formerly 1bc853278099c5f2f050d3104df582f134ff7671 [formerly 8b37f35d297c58958e22e6aad34a8c01c44817e7 [formerly 17a04e1bd4c8c5b80179d76c14a6f74055d8b89d]]]]] Former-commit-id: cbf90b25e2b73253c2de7f5c81e64a638077e5d5 Former-commit-id: 036ad74b0433bb46e0a8f290f6053575d4deacbe Former-commit-id: f37ccd7d7379f7387db9b8c6be0c17eb3e2abdbb [formerly fbac05c941cc89c669a57e29a82da4ce4e4d553b] Former-commit-id: 5245dce5ffa7d168df53c0f5e0fb40c831deec98 Former-commit-id: aecbf8089c3be637b237cf8403dcd7d15c2da38f Former-commit-id: 5f59569dba6199bec911caf4e9ba75421dcf9d5e Former-commit-id: 1a8e4dc3d40d689c493774de5f60804e61768659 Former-commit-id: e45b56ce72371ddc2f28754bd612c642a144c25e --- d2-admin.babel.REMOVED.git-id | 2 +- src/locales/en.json | 10 ++++- src/locales/ja.json | 10 ++++- src/locales/zh-chs.json | 10 ++++- src/locales/zh-cht.json | 10 ++++- .../d2-help/image/qq.jpg.REMOVED.git-id | 1 - .../d2-help/image/qq.png.REMOVED.git-id | 1 + .../d2-help/image/we.jpg.REMOVED.git-id | 1 - .../d2-help/image/we.png.REMOVED.git-id | 1 + .../system/index/components/d2-help/index.vue | 42 +++++++++++++------ 10 files changed, 64 insertions(+), 24 deletions(-) delete mode 100644 src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id create mode 100644 src/views/system/index/components/d2-help/image/qq.png.REMOVED.git-id delete mode 100644 src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id create mode 100644 src/views/system/index/components/d2-help/image/we.png.REMOVED.git-id diff --git a/d2-admin.babel.REMOVED.git-id b/d2-admin.babel.REMOVED.git-id index 5d8f0c2e..ddba107b 100644 --- a/d2-admin.babel.REMOVED.git-id +++ b/d2-admin.babel.REMOVED.git-id @@ -1 +1 @@ -cbf998eca74f2ff50f199103bd08a4ed12aa4d4a \ No newline at end of file +681ffc71f82857c857c50891b8f73e04e345c7db \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index c47898dd..de531a73 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -48,8 +48,14 @@ "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" + "qq": { + "sub-title": "Join 2,000 users and communicate with each other", + "title": "Please use your mobile phone QQ to scan the QR code above" + }, + "we": { + "sub-title": "Add author WeChat friends, invite to join WeChat group", + "title": "Please use the mobile phone WeChat scan above the QR code" + } }, "link": { "text": { diff --git a/src/locales/ja.json b/src/locales/ja.json index d5b4cfc9..b0c5f0e8 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -48,8 +48,14 @@ "button": "助けが必要ですか？", "dialog": { "join": { - "qq": "2000人のQQユーザーグループ", - "we": "著者と友達になった後にWeChatユーザーグループを招待する" + "qq": { + "sub-title": "2,000人のユーザーに参加してお互いにコミュニケーション", + "title": "上記のQRコードをスキャンするには、携帯電話のQQを使用してください" + }, + "we": { + "sub-title": "著者を追加するWeChat友達、WeChatグループに参加するよう招待する", + "title": "携帯電話のWeChatを使用してQRコードをスキャンしてください" + } }, "link": { "text": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index 44fca0ab..3ec07be9 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -48,8 +48,14 @@ "button": "需要帮助吗", "dialog": { "join": { - "qq": "容纳 2000 人的 QQ 用户群", - "we": "与作者成为好友后邀请进微信用户群" + "qq": { + "sub-title": "加入 2000 人用户大群共同交流", + "title": "请使用手机 QQ 扫面上方二维码" + }, + "we": { + "sub-title": "添加作者微信好友，邀请加入微信群", + "title": "请使用手机微信扫面上方二维码" + } }, "link": { "text": { diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index 5d72d3ee..74575e33 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -48,8 +48,14 @@ "button": "需要幫助嗎", "dialog": { "join": { - "qq": "容納 2000 人的 QQ 用戶群", - "we": "與作者成為好友後邀請進微信用戶群" + "qq": { + "sub-title": "加入 2000 人用戶大群共同交流", + "title": "請使用手機 QQ 掃面上方二維碼" + }, + "we": { + "sub-title": "添加作者微信好友，邀請加入微信群", + "title": "請使用手機微信掃面上方二維碼" + } }, "link": { "text": { diff --git a/src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id b/src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id deleted file mode 100644 index a957a237..00000000 --- a/src/views/system/index/components/d2-help/image/qq.jpg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -b27de32f6832b50dc5b8b1dc613060a81f88a8e9 \ No newline at end of file diff --git a/src/views/system/index/components/d2-help/image/qq.png.REMOVED.git-id b/src/views/system/index/components/d2-help/image/qq.png.REMOVED.git-id new file mode 100644 index 00000000..0538b352 --- /dev/null +++ b/src/views/system/index/components/d2-help/image/qq.png.REMOVED.git-id @@ -0,0 +1 @@ +84166686f9c39e81a4c467ff2fe0e661dc79c9f9 \ No newline at end of file diff --git a/src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id b/src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id deleted file mode 100644 index b485920f..00000000 --- a/src/views/system/index/components/d2-help/image/we.jpg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -12bb778e8779f32a46ee756e6dbb890024b40f5d \ No newline at end of file diff --git a/src/views/system/index/components/d2-help/image/we.png.REMOVED.git-id b/src/views/system/index/components/d2-help/image/we.png.REMOVED.git-id new file mode 100644 index 00000000..80541dee --- /dev/null +++ b/src/views/system/index/components/d2-help/image/we.png.REMOVED.git-id @@ -0,0 +1 @@ +602f585a258a64963f268f9ce844cf3d88be72ec \ No newline at end of file diff --git a/src/views/system/index/components/d2-help/index.vue b/src/views/system/index/components/d2-help/index.vue index 83a59be0..5cbbb56c 100644 --- a/src/views/system/index/components/d2-help/index.vue +++ b/src/views/system/index/components/d2-help/index.vue @@ -9,7 +9,7 @@ width="600px" :visible.sync="dialogVisible" :append-to-body="true"> -
+

{{ $t('views.system.index.help.dialog.sub-title.doc') }}

@@ -30,20 +30,18 @@

{{ $t('views.system.index.help.dialog.sub-title.join') }}

- - + +
+ {{ $t('views.system.index.help.dialog.join.qq.title') }}
+ {{ $t('views.system.index.help.dialog.join.qq.sub-title') }} +
- - + +
+ {{ $t('views.system.index.help.dialog.join.we.title') }}
+ {{ $t('views.system.index.help.dialog.join.we.sub-title') }} +
@@ -60,3 +58,21 @@ export default { } } + +