Merge branch 'develop' of http://47.100.18.120:3000/SEEC-II-FrontEnd-Team/SEEC-II-FrontEnd into develop

src/components/PageHeader/index.jsx

@@ -0,0 +1,11 @@
+export default {
+  props: {
+    routes: {
+      type: Array,
+      default: () => []
+    }
+  },
+  render() {
+    return <h1>hello</h1>;
+  }
+};

src/components/UserDropdown/index.vue

@@ -9,18 +9,18 @@
       以 <b>{{ name }}</b> 的身份登录
     </b-dropdown-item>
     <hr class="dropdown-divider" />
-    <router-link :to="`${prefix}/profile`">
-      <b-dropdown-item value="settings">
+    <b-dropdown-item has-link value="settings">
+      <router-link :to="`${prefix}/profile`">
         <b-icon icon="settings"></b-icon>
         个人设置
-      </b-dropdown-item>
-    </router-link>
-    <router-link :to="{ name: 'LOGIN' }">
-      <b-dropdown-item value="logout">
+      </router-link>
+    </b-dropdown-item>
+    <b-dropdown-item has-link value="logout">
+      <router-link :to="{ name: 'LOGIN' }">
         <b-icon icon="logout"></b-icon>
         登出
-      </b-dropdown-item>
-    </router-link>
+      </router-link>
+    </b-dropdown-item>
   </b-dropdown>
 </template>
 

src/views/student/Review/index.vue

@@ -59,6 +59,7 @@ export default {
     );
   }
 };
+3;
 </script>
 
 <style lang="scss" scoped>