Merge branch 'master' into deploy

PanJiaChen · PanJiaChen · commit 7c683b6f114d · 2018-12-04T14:02:12.000+08:00
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "clipboard": "1.7.1",
     "codemirror": "5.39.2",
     "connect": "3.6.6",
-    "driver.js": "0.5.2",
+    "driver.js": "0.8.1",
     "dropzone": "5.2.0",
     "echarts": "4.1.0",
     "element-ui": "2.4.6",
diff --git a/src/views/errorPage/404.vue b/src/views/errorPage/404.vue
@@ -14,7 +14,7 @@
         </div>
         <div class="bullshit__headline">{{ message }}</div>
         <div class="bullshit__info">请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告</div>
-        <a href="" class="bullshit__return-home">返回首页</a>
+        <router-link to="/" class="bullshit__return-home">返回首页</router-link>
       </div>
     </div>
   </div>
diff --git a/src/views/guide/defineSteps.js b/src/views/guide/defineSteps.js
@@ -45,7 +45,8 @@ const steps = [
       title: 'Tags view',
       description: 'The history of the page you visited',
       position: 'bottom'
-    }
+    },
+    padding: 0
   }
 ]
 
diff --git a/src/views/guide/index.vue b/src/views/guide/index.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import * as Driver from 'driver.js' // import driver.js
+import Driver from 'driver.js' // import driver.js
 import 'driver.js/dist/driver.min.css' // import driver.js css
 import steps from './defineSteps'
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ const steps = [`
`45`	`45`	`title: 'Tags view',`
`46`	`46`	`description: 'The history of the page you visited',`
`47`	`47`	`position: 'bottom'`
`48`		`- }`
	`48`	`+ },`
	`49`	`+ padding: 0`
`49`	`50`	`}`
`50`	`51`	`]`
`51`	`52`