Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

src/components/pages/addCourse.vue

@@ -506,7 +506,7 @@
           <div class="rightBox" v-if="this.steps == 3">
             <div class="basic_box">
               <div
-                style="display: flex; flex-direction: row; align-items: center"
+                style="display: flex; flex-direction: row; align-items: center;position: sticky;top: 0;background: #fff;z-index: 99;width: 100%;padding: 0 20px 0 20px;box-sizing: border-box;"
               >
                 <div class="cru_selectBox">
                   <div
@@ -532,7 +532,7 @@
               </div>
 
               <div
-                style="margin: 0 0 40px 0"
+                style="margin: 0 0 40px 0;padding: 0 20px 0 20px;"
                 v-for="(item, index) in unitJson[unitIndex].chapterInfo"
                 :key="index"
               >
@@ -2721,7 +2721,8 @@ export default {
             // this.courseId = this.cid;
           })
           .catch((err) => {
-            this.$message.error("修改失败");
+            // this.$message.error("修改失败");
+            this.$message.error("网络不佳");
             console.error(err);
           });
       }
@@ -3029,7 +3030,8 @@ export default {
           this.unitIndex = this.unitIndex - 1;
         })
         .catch((err) => {
-          this.$message.error("修改失败");
+          // this.$message.error("修改失败");
+          this.$message.error("网络不佳");
           console.error(err);
         });
     },
@@ -3664,7 +3666,8 @@ export default {
           this.islogin = true;
         })
         .catch((err) => {
-          this.$message.error("新增失败");
+          // this.$message.error("新增失败");
+          this.$message.error("网络不佳");
           console.error(err);
         });
     },
@@ -3732,7 +3735,8 @@ export default {
           this.courseId = this.cid;
         })
         .catch((err) => {
-          this.$message.error("修改失败");
+          // this.$message.error("修改失败");
+          this.$message.error("网络不佳");
           console.error(err);
         });
     },
@@ -3826,7 +3830,8 @@ export default {
           this.courseId = this.cid;
         })
         .catch((err) => {
-          this.$message.error("修改失败");
+          // this.$message.error("修改失败");
+          this.$message.error("网络不佳");
           console.error(err);
         });
     },
@@ -4622,7 +4627,8 @@ export default {
           }, 1000);
         })
         .catch((err) => {
-          this.$message.error("修改失败");
+          // this.$message.error("修改失败");
+          this.$message.error("网络不佳");
           console.error(err);
         });
     },
@@ -5003,7 +5009,7 @@ export default {
   width: 100%;
   display: flex;
   justify-content: space-evenly;
-  margin: 20px 0 25px 0;
+  margin: 10px 0 10px 0;
 }
 
 .info_btn,
@@ -6277,6 +6283,7 @@ ol {
   background: rgb(255, 255, 255);
   border-radius: 10px;
   overflow: auto;
+  height: calc(100% - 130px);
 }
 .e_add_top {
   display: flex;

src/components/pages/data.vue

@@ -73,13 +73,23 @@
               placeholder="请输入邮箱"
             ></el-input>
           </el-form-item> -->
-          <el-form-item label="手机号码" prop="phone">
+          <!-- <el-form-item label="手机号码" prop="phone">
             <el-input
               v-model="ruleForm.phone"
               style="width: 300px"
               placeholder="请输入手机号码"
             ></el-input>
-          </el-form-item>
+          </el-form-item> -->
+          <!-- <el-form-item label="组织" prop="sBySchool">
+            <el-select
+              v-model="ruleForm.sBySchool"
+              clearable
+              placeholder="请选择组织"
+              disabled
+            >
+              <el-option :value="ruleForm.sBySchool"> </el-option>
+            </el-select>
+          </el-form-item> -->
           <el-form-item label="学校" prop="sBySchool">
             <el-select
               v-model="ruleForm.sBySchool"