Merge branch 'develop' into feature/result-zhouweilu

src/util/request.js

@@ -2,6 +2,7 @@
 import "whatwg-fetch";
 import router from "@/router";
 import { LOGIN } from "@/router/name";
+import { getToken } from "@/util/tokenStorage";
 
 /**
  * @description error
@@ -68,7 +69,13 @@ export default async function request(url, options) {
       };
     }
   }
-
+  const token = getToken();
+  if (token) {
+    newOptions.headers = {
+      ...newOptions.headers,
+      Authorization: token
+    };
+  }
   const response = await fetch(url, newOptions);
   try {
     await checkStatus(response);

src/views/student/Group/index.vue

@@ -2,7 +2,10 @@
   <div>
     <page-header :routes="[{ name: '我的小组' }]">
       <template slot="title">
-        我的小组 {{ this.groups.length > 0 && `「${this.groups[0].name}」` }}
+        我的小组
+        <span v-if="groups.length > 0">
+          {{ `「${this.groups[0].name}」` }}
+        </span>
       </template>
     </page-header>
     <page-body>
@@ -185,7 +188,10 @@ export default {
         try {
           this.submitLoading = true;
           this.isServerError = false;
-          await postStudentGroup(this.name);
+          await postStudentGroup({
+            name: this.name,
+            courseId: this.$route.params.courseId
+          });
           this.$toast.open({
             message: `小组「${this.name}」创建成功`,
             type: "is-success"

vue.config.js

@@ -2,7 +2,8 @@ module.exports = {
   devServer: {
     proxy: {
       "^/api": {
-        target: "http://localhost:4000/",
+        // target: "http://localhost:4000/",
+        target: "http://172.19.131.216:8080/",
         ws: true,
         changeOrigin: true
       }