Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/components/docNavBar/DocNavBar.vue

@@ -19,13 +19,21 @@
 </template>
 
 <script>
+import { backHome } from '@/utils/common.js'
+
 export default {
     name: 'DocNavBar',
     props: {
-        title: String
+        title: String,
+        // 是否首页
+        home: Boolean
     },
     methods: {
         goBack() {
+            if (this.home) {
+                backHome()
+                return
+            }
             this.$router.back()
         }
     }