Merge branch 'zcwy_0806_paihangb' into dev0515

src/utils/xajax2.js

@@ -158,7 +158,7 @@ formRequest.interceptors.response.use(res => {
       message = "网络异常，请稍后重试";
     }
     else if (message.includes("timeout")) {
-      message = "上传超时，请检查是否上传成功";
+      message = "接口超时，请检查是否上传成功";
       //location.href = this.webBaseUrl + ReLoginUrl;
     }
     else if (message.includes("Request failed with status code")) {

src/views/course/Courseware.vue

@@ -652,6 +652,20 @@ export default {
         item.duration = item.minute ? parseFloat(item.minute) * 60 : 1800;
       });
       this.loading = true;
+      const messageD = this.fileList.some(item =>{
+        if(item.name == ''){
+          this.$message.error('课件名称不能为空');
+          return true;
+        }else if(item.minute==''||item.minute == 0){
+          this.$message.error('时长不能为空并且不能为0');
+          return true;
+        }else{
+          return false
+        }
+      })
+      if(messageD){
+        return 
+      }
       coueseFile.batchUpdate(this.fileList).then(rs => {
         if (rs.status === 200) {
           this.$message.success('保存成功');