From a588e9ff424f359cc30f9924d3928fad9a74ccb8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 19 Jun 2018 21:02:25 +0800
Subject: [PATCH] no message

Former-commit-id: fb8a24015cbae6d2ae0464a1f27e272cdf176729 [formerly fb8a24015cbae6d2ae0464a1f27e272cdf176729 [formerly fb8a24015cbae6d2ae0464a1f27e272cdf176729 [formerly fb8a24015cbae6d2ae0464a1f27e272cdf176729 [formerly d47ab8bc03d5badc9f0560a044dd3df95c2dac7a [formerly 5f37fef0297ac26ceb5e5a12cd78ca7704fd856f]]]]]
Former-commit-id: d075a1c19f231d8ab7ee7584388e166ddfe22175
Former-commit-id: f43ac009e48b3870208f2c495432eff9fb5e3c17
Former-commit-id: 4315fc05dbdb335faa0dd38c23951892b1a4dce5 [formerly f1c03145e334cf5910ad99dc1e199b0c2c822fac]
Former-commit-id: dd77fb01a7b8ca69646b9a709d6a1893a7c6e196
Former-commit-id: d29fd80d9e0da4c6b43c4b2d5acfb8147018c45f
Former-commit-id: f9cf5de7f16e2855df6107641f8c5ec3dbcdbd5c
Former-commit-id: 49603658805d553c5260930bbf69862c0f368743
Former-commit-id: b81d5332dc6bbae7db6f2fc50e4174c2ddbee23a
---
 .../d2-layout-main/components/-help/index.vue | 42 +++++++++++++++++++
 .../components/-theme/index.vue               |  2 +-
 src/components/core/d2-layout-main/index.vue  |  4 +-
 static/image/me/qq.jpg.REMOVED.git-id         |  1 +
 static/image/me/we.jpg.REMOVED.git-id         |  1 +
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 src/components/core/d2-layout-main/components/-help/index.vue
 create mode 100644 static/image/me/qq.jpg.REMOVED.git-id
 create mode 100644 static/image/me/we.jpg.REMOVED.git-id

diff --git a/src/components/core/d2-layout-main/components/-help/index.vue b/src/components/core/d2-layout-main/components/-help/index.vue
new file mode 100644
index 00000000..e0fde816
--- /dev/null
+++ b/src/components/core/d2-layout-main/components/-help/index.vue
@@ -0,0 +1,42 @@
+<template>
+  <div>
+    <el-tooltip effect="dark" content="疑问" placement="bottom">
+      <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="dialogVisible = true">
+        <d2-icon name="question-circle"/>
+      </el-button>
+    </el-tooltip>
+    <el-dialog title="帮助" width="600px" :visible.sync="dialogVisible">
+      <div style="margin-top: -25px;">
+        <h1 class="d2-mt-0">如果你有问题可以加入交流群或者联系作者</h1>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-alert :closable="false" type="info" title="扫码进 QQ 群" class="d2-mb"/>
+            <img class="qr" src="/static/image/me/qq.jpg">
+          </el-col>
+          <el-col :span="12">
+            <el-alert :closable="false" type="info" title="我的微信 加好友拉进微信群" class="d2-mb"/>
+            <img class="qr" src="/static/image/me/we.jpg">
+          </el-col>
+        </el-row>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      dialogVisible: false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+img {
+  &.qr {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/components/core/d2-layout-main/components/-theme/index.vue b/src/components/core/d2-layout-main/components/-theme/index.vue
index dd990832..cb6c4933 100644
--- a/src/components/core/d2-layout-main/components/-theme/index.vue
+++ b/src/components/core/d2-layout-main/components/-theme/index.vue
@@ -6,7 +6,7 @@
       </el-button>
     </el-tooltip>
     <el-dialog title="主题" width="600px" :visible.sync="dialogVisible">
-      <d2-theme-list style="margin-top: -20px;"/>
+      <d2-theme-list style="margin-top: -25px;"/>
     </el-dialog>
   </div>
 </template>
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 05bb5c62..0c836571 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -14,6 +14,7 @@
         <d2-layout-main-header-menu/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
+          <d2-layout-main-header-help/>
           <d2-layout-main-header-full-screen/>
           <d2-layout-main-header-theme/>
           <d2-layout-main-header-user/>
@@ -45,7 +46,8 @@ export default {
     'd2-layout-main-header-menu': () => import('./components/-header-menu'),
     'd2-layout-main-header-full-screen': () => import('./components/-full-screen'),
     'd2-layout-main-header-theme': () => import('./components/-theme'),
-    'd2-layout-main-header-user': () => import('./components/-user')
+    'd2-layout-main-header-user': () => import('./components/-user'),
+    'd2-layout-main-header-help': () => import('./components/-help')
   },
   data () {
     return {
diff --git a/static/image/me/qq.jpg.REMOVED.git-id b/static/image/me/qq.jpg.REMOVED.git-id
new file mode 100644
index 00000000..a1c17adb
--- /dev/null
+++ b/static/image/me/qq.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+e4c4364c1109dd3097159bfdb13171116c406f5d
\ No newline at end of file
diff --git a/static/image/me/we.jpg.REMOVED.git-id b/static/image/me/we.jpg.REMOVED.git-id
new file mode 100644
index 00000000..b485920f
--- /dev/null
+++ b/static/image/me/we.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+12bb778e8779f32a46ee756e6dbb890024b40f5d
\ No newline at end of file