Merge branch 'master' into 03/03GRADE

src/utils/request.js

@@ -117,7 +117,7 @@ service.interceptors.response.use(
       if (data.code == 404) {
         router.push('/404')
       }
-      if (data.code < 200||data.code >= 300) {
+      if (data.code < 200&&data.code != 100||data.code >= 300&&data.code != 100) {
         // Message({
         //   message: data.msg || `请求失败code码为${ data.code }`,
         //   type: 'error',

src/utils/request2.js

@@ -123,7 +123,7 @@ service.interceptors.response.use(
       if (data.code == 404) {
         router.push('/404')
       }
-      if (data.code < 200||data.code >= 300) {
+      if (data.code < 200&&data.code != 100||data.code >= 300&&data.code != 100) {
         // Message({
         //   message: data.msg || `请求失败code码为${ data.code }`,
         //   type: 'error',

src/views/teamBuild/signupList.vue

@@ -1744,10 +1744,28 @@ export default {
       }).then(async () => {
         try {
           const res = await setNoneCloudTeacher({ id: row.id });
-          this.$message.success("解除预约成功");
-          this.getList();
+          console.log('code',res.code)
+          if (res.code == 200) {
+            this.$message.success("解除预约成功");
+            this.getList();
+          } else if (res.code == 100) {
+            this.$confirm(res.msg, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(async (some) => {
+              const res = await setNoneCloudTeacher({
+                id: row.id,
+                isContinue: true,
+              });
+              if (res.code == 200) {
+                this.$message.success("解除预约成功");
+                this.getList();
+              }
+            });
+          }
         } catch (e) {
-          console.log(e);
+          console.log('错误',e);
         }
       });
     },