Merge branch 'develop'

Former-commit-id: eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly 6a64a9ad43e59279488f7bcdc1bd51815fa1d748 [formerly ed409f881cf04880ebdad73667c2ab9ca72cd776]]]]]
Former-commit-id: 6d2e208d03ffb559ccec7c4c9d3d1788a6c1a1c8
Former-commit-id: 19dcdce75a3be15d34c3b5c91d83744618e5bbf3
Former-commit-id: 4d2f55350e8052cc4ffdf5c8a443fa12507574f6 [formerly 07affb8a527c3de1aab06b7f8651cff4e8ea3f65]
Former-commit-id: 97fdb96c7b15e5438c357924f760a09879b1194c
Former-commit-id: d1baf4da9e48165d2cfb270c471310ff9cbd26e9
Former-commit-id: b729d32e92e006de04de525c31b1320f38d8e176
Former-commit-id: d88dba955e71fe75e8ac277e5d3627bbb0aef5d0
Former-commit-id: 7296615c810569cfd27a4e41525c7ac86a4dce6c

doc/image/reward-me@2x.png.REMOVED.git-id

@@ -1 +0,0 @@
-729a7896f93feaddd10e80dab4f5ff4ce05e64a8

public/.well-known/pki-validation/fileauth.txt

@@ -1 +0,0 @@
-201810220000004bh2i5pwqfgrqp1azjyj7itsun1y3fr4mcbxlc397hri1pvzeo

src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue

@@ -1,17 +1,39 @@
 <template>
-  <el-table :data="list" v-bind="table">
-    <el-table-column prop="title" align="center" width="160"/>
-    <el-table-column label="预览" width="120">
+  <el-table
+    :data="list"
+    v-bind="table">
+    <el-table-column
+      prop="title"
+      align="center"
+      width="160"/>
+    <el-table-column
+      label="预览"
+      width="120">
       <div
         slot-scope="scope"
         class="theme-preview"
-        :style="{'backgroundImage': `url(${$baseUrl}${scope.row.preview})`}">
+        :style="{
+          backgroundImage: `url(${$baseUrl}${scope.row.preview})`
+        }">
       </div>
     </el-table-column>
-    <el-table-column prop="address" align="center">
+    <el-table-column
+      prop="address"
+      align="center">
       <template slot-scope="scope">
-        <el-button v-if="activeName === scope.row.name" type="success" icon="el-icon-check" round>已激活</el-button>
-        <el-button v-else round @click="handleSelectTheme(scope.row.name)">使用</el-button>
+        <el-button
+          v-if="activeName === scope.row.name"
+          type="success"
+          icon="el-icon-check"
+          round>
+          已激活
+        </el-button>
+        <el-button
+          v-else
+          round
+          @click="handleSelectTheme(scope.row.name)">
+          使用
+        </el-button>
       </template>
     </el-table-column>
   </el-table>

src/layout/header-aside/components/header-theme/index.vue

@@ -1,11 +1,23 @@
 <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="diamond" style="font-size: 16px"/>
+    <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="diamond"
+          style="font-size: 16px"/>
       </el-button>
     </el-tooltip>
-    <el-dialog title="主题" width="600px" :visible.sync="dialogVisible" :append-to-body="true">
+    <el-dialog
+      title="主题"
+      width="600px"
+      :visible.sync="dialogVisible"
+      :append-to-body="true">
       <d2-theme-list style="margin-top: -25px;"/>
     </el-dialog>
   </div>