Merge branch '03/03GRADE' into test

src/views/teamDetail/teamCourseList.vue

@@ -861,6 +861,7 @@ import resetClass from "./componentCourse/resetClass";
 import teacherList from "./componentCourse/teacherList";
 import addCompound from "./componentCourse/addCompound";
 import infoMsg from "./componentCourse/infoMsg";
+import cleanDeep from 'clean-deep'
 let nowTime = new Date();
 nowTime =
   nowTime.getFullYear() +
@@ -1144,7 +1145,7 @@ export default {
         headers: {
           Authorization: getToken(),
         },
-        params: this.getSearchForm(),
+        params: cleanDeep(this.getSearchForm()),
         url,
         // responseType: "blob",
       };
@@ -1157,8 +1158,11 @@ export default {
           load.startLoading();
           axios(options)
             .then((res) => {
-              console.log(res);
-              this.$message.success(res.data.data);
+              if(res.data.code == 200) {
+                this.$message.success(res.data.data);
+              } else {
+                this.$message.error(res.data.msg)
+              }
               // let blob = new Blob([res.data], {
               // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
               // type: "application/vnd.ms-excel;charset=utf-8",

vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -54,7 +54,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: false,
+    https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy