Merge branch 'online' into wxlNew

dist/static/css/chunk-2c8448f4.9548d74d.css

@@ -0,0 +1 @@
+.vip-base[data-v-908e9054]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.vip-base[data-v-908e9054] .el-date-editor.el-input,.vip-base[data-v-908e9054] .el-date-editor.el-input__inner,.vip-base[data-v-908e9054] .el-input,.vip-base[data-v-908e9054] .el-select{width:180px!important}.vip-base .left[data-v-908e9054]{width:400px}.vip-base .tableWrap[data-v-908e9054]{margin-top:40px}.vip-base .tableWrap h4[data-v-908e9054]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-908e9054]{clear:both}.vip-base .right .resetBtn[data-v-908e9054]{margin-top:30px;float:right}.vip-base .disBox[data-v-908e9054]{background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;border-radius:4px;border:1px solid #dcdfe6;color:#333;padding:0 15px;width:180px}.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}

dist/static/css/chunk-6b55c86a.b62e964c.css

@@ -1 +0,0 @@
-.vip-base[data-v-0a57f614]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.vip-base[data-v-0a57f614] .el-date-editor.el-input,.vip-base[data-v-0a57f614] .el-date-editor.el-input__inner,.vip-base[data-v-0a57f614] .el-input,.vip-base[data-v-0a57f614] .el-select{width:180px!important}.vip-base .left[data-v-0a57f614]{width:400px}.vip-base .tableWrap[data-v-0a57f614]{margin-top:40px}.vip-base .tableWrap h4[data-v-0a57f614]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-0a57f614]{clear:both}.vip-base .right .resetBtn[data-v-0a57f614]{margin-top:30px;float:right}.vip-base .disBox[data-v-0a57f614]{background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;border-radius:4px;border:1px solid #dcdfe6;color:#333;padding:0 15px;width:180px}.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}

src/views/contentManager/contentOperation.vue

@@ -28,10 +28,10 @@
           <el-input v-model="form.memo"></el-input>
         </el-form-item>
         <!--  -->
-        <el-form-item v-if="type == 3 || type == 6 || type == 5 || type == 8" label="链接地址">
+        <!-- <el-form-item v-if="type == 3 || type == 6 || type == 5 || type == 8" label="链接地址">
           <el-input v-model.trim="form.linkUrl"></el-input>
-        </el-form-item>
-        <el-form-item v-else label="链接地址" prop="linkUrl">
+        </el-form-item> -->
+        <el-form-item label="链接地址" prop="linkUrl" :rules='[{ required: type == 3 || type == 6 || type == 5 || type == 8 ? false : true, message: "请输入连接地址", trigger: "blur" }]'>
           <el-input v-model.trim="form.linkUrl"></el-input>
         </el-form-item>
         <!-- 广告管理才有类型 -->
@@ -52,6 +52,7 @@
                    :src="form.coverImage"></video>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </div>
+          <p style="color: red">上传视频尺寸建议：1242px * 2208px；</p>
         </el-form-item>
         <el-form-item v-else key="coverImage" :label="type == 8 ? '广告图' : '封面图'"
                       prop="coverImage">
@@ -73,7 +74,7 @@
              v-if="imageSize">上传图片尺寸为：{{ imageSize }}</p>
         </el-form-item>
         <!-- 广告管理才有时长 -->
-        <el-form-item label="显示时长(秒)" prop="attribute1" v-if="type == 8">
+        <el-form-item label="显示时长(秒)" prop="attribute1" :rules="[{required: true, validator: validNum, trigger: 'blur'}]" v-if="type == 8">
           <el-input type="number" v-model.number="form.attribute1"></el-input>
           <p style="color: red">建议时长不超过5秒</p>
         </el-form-item>
@@ -81,7 +82,8 @@
         <!-- 知识库管理才会有类型 -->
         <el-form-item v-if="type == 7"
                       label="知识类别"
-                      prop="subType">
+                      prop="subType"
+                      :rules="[{ required: true, message: '请选择知识类别', trigger: 'change' }]">
           <el-select v-model="form.subType">
             <el-option label="演奏小技巧"
                        :value="1"></el-option>
@@ -93,10 +95,10 @@
                        :value="4"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="内容"
+        <!-- 闪页管理 BANNER管理 APP按钮管理 广告管理 -->
+        <el-form-item label="内容" v-show="type != 8 && type != 5 && type != 3 && type != 6"
                       prop="content"
-                      :rules="[{ required: type == 8 ? false : true, message: '请编辑内容', trigger: 'blur' }]">
-          <!-- bidirectional data binding（双向数据绑定） -->
+                      :rules="[{ required: type != 8 && type != 5 && type != 3 && type != 6 ? true : false, message: '请编辑内容', trigger: 'blur' }]">
           <quill-editor class="ql-editor"
                         v-model="form.content"
                         ref="myQuillEditor"
@@ -118,7 +120,7 @@
           <el-button @click="onSubmit('form')"
                      type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
-          <el-button @click="onLook">预览</el-button>
+          <el-button @click="onLook" v-if="type != 8 && type != 5 && type != 3 && type != 6">预览</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -299,14 +301,16 @@ export default {
     const query = this.$route.query
     let url = ''
     // let url = query.type == 7 ? vaildStudentUrl() + "/#/knowledge" : vaildStudentUrl() + "/#/specialdetail"
+    console.log(query.type)
     if(query.type == 7) {
       url = vaildStudentUrl() + "/#/knowledge"
-    } else if(query.type == 8) {
+    } else if(query.type == 8 || query.type == 5) {
       url = ''
     } else {
       url = vaildStudentUrl() + "/#/specialdetail"
     }
     return {
+      validNum: validNum,
       uploadType: 1, // 上传类型
       uploadStatus: false,
       categoryList: [],
@@ -385,17 +389,10 @@ export default {
           { required: true, message: "请输入标题", trigger: "blur" },
           { min: 2, max: 30, message: "长度在 2 到 30 个字符", trigger: "blur" }
         ],
-        linkUrl: [
-          { required: true, message: "请输入连接地址", trigger: "blur" }
-        ],
-        attribute1: [
-          {required: true, validator: validNum, trigger: 'blur'}
-        ],
         coverImage: [
           { required: true, message: '请选择封面图或广告视频', trigger: "blur" }
         ],
         tenantId: [{ required: true, message: "请选择适用范围", trigger: "change" }],
-        subType: [{ required: true, message: "请选择知识类别", trigger: "change" }],
       },
       imageSize: null
     };
@@ -410,7 +407,7 @@ export default {
       let url = ''
       if(query.type == 7) {
         url = vaildStudentUrl() + "/#/knowledge"
-      } else if(query.type == 8) {
+      } else if(query.type == 8 || query.type == 5) {
         url = ''
       } else {
         url = vaildStudentUrl() + "/#/specialdetail"
@@ -428,7 +425,7 @@ export default {
         tenantId: null,
         subType: null
       };
-      this.$refs["form"].resetFields();
+      this.$refs["form"].clearValidate();
 
       this.dialogForm = {
         poster: null,
@@ -448,6 +445,7 @@ export default {
       const query = this.$route.query
       this.type = query.type;
       this.pageType = query.pageType;
+
       // this.form.type
       let tempTitle = {
         1: "468px * 552px；图片不能超过 2M；",

src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -1,33 +1,48 @@
 <template>
   <div class="vip-base">
     <div class="left">
-      <el-form label-position="right" label-width="120px" :model="topForm">
+      <el-form label-position="right"
+               label-width="120px"
+               :model="topForm">
         <el-form-item label="指导老师">
-          <el-input v-model.trim="topForm.teacherCount" disabled></el-input>
+          <el-input v-model.trim="topForm.teacherCount"
+                    disabled></el-input>
+        </el-form-item>
+        <el-form-item label="教务老师">
+          <el-input v-model.trim="topForm.educationalTeacherName"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="科目名称">
-          <el-input v-model.trim="topForm.subject" disabled></el-input>
+          <el-input v-model.trim="topForm.subject"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="活动方案">
-          <el-input v-model.trim="topForm.active" disabled></el-input>
+          <el-input v-model.trim="topForm.active"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="课程形式">
-          <el-input v-model.trim="topForm.status" disabled></el-input>
+          <el-input v-model.trim="topForm.status"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="每班人数">
-          <el-input v-model.trim="topForm.classNum" disabled></el-input>
+          <el-input v-model.trim="topForm.classNum"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="每课时长">
-          <el-input v-model.trim="topForm.classTime" disabled></el-input>
+          <el-input v-model.trim="topForm.classTime"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="教学点名称">
-          <el-input v-model.trim="topForm.address" disabled></el-input>
+          <el-input v-model.trim="topForm.address"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="线上课数">
-          <el-input v-model.trim="topForm.onlineClass" disabled></el-input>
+          <el-input v-model.trim="topForm.onlineClass"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="线下课数">
-          <el-input v-model.trim="topForm.offlineClass" disabled></el-input>
+          <el-input v-model.trim="topForm.offlineClass"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="报名开始时间">
           <div class="disBox">{{topForm.startTime | dateForMinFormat}}</div>
@@ -40,31 +55,32 @@
       </el-form>
     </div>
     <div class="right">
-      <el-form label-position="right" label-width="120px" :model="rightForm">
+      <el-form label-position="right"
+               label-width="120px"
+               :model="rightForm">
         <el-form-item label="总课时数">
-          <el-input v-model.trim="rightForm.allClass" disabled></el-input>
+          <el-input v-model.trim="rightForm.allClass"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="课程单价(线上)">
-          <el-input
-            v-model.trim="rightForm.onlineClass"
-            type="number"
-            @mousewheel.native.prevent
-            :disabled="!isreset"
-          ></el-input>
+          <el-input v-model.trim="rightForm.onlineClass"
+                    type="number"
+                    @mousewheel.native.prevent
+                    :disabled="!isreset"></el-input>
         </el-form-item>
         <el-form-item label="课程单价(线下)">
-          <el-input
-            v-model.trim="rightForm.offlineClass"
-            type="number"
-            @mousewheel.native.prevent
-            :disabled="!isreset"
-          ></el-input>
+          <el-input v-model.trim="rightForm.offlineClass"
+                    type="number"
+                    @mousewheel.native.prevent
+                    :disabled="!isreset"></el-input>
         </el-form-item>
         <el-form-item label="课程总价">
-          <el-input v-model.trim="rightForm.allPrice" disabled></el-input>
+          <el-input v-model.trim="rightForm.allPrice"
+                    disabled></el-input>
         </el-form-item>
         <el-form-item label="当前课程进度">
-          <el-input v-model.trim="rightForm.progress" disabled></el-input>
+          <el-input v-model.trim="rightForm.progress"
+                    disabled></el-input>
         </el-form-item>
       </el-form>
       <!-- <el-button v-if="!isreset"
@@ -88,7 +104,7 @@ import {
   updateVipBaseInfo
 } from "@/api/vipSeting";
 export default {
-  data() {
+  data () {
     return {
       topForm: {
         teacherCount: "",
@@ -114,14 +130,14 @@ export default {
       isreset: false
     };
   },
-  mounted() {
+  mounted () {
     this.__init();
   },
-  activated() {
+  activated () {
     this.__init();
   },
   methods: {
-    __init() {
+    __init () {
       let id = this.$route.query.id;
       this.id = id;
       // 根据id 获取vip详情
@@ -129,7 +145,7 @@ export default {
       // 根据id 获取vip学员
       this.getStudents();
     },
-    getVipGroupDetail(id) {
+    getVipGroupDetail (id) {
       getVipGroupDetail({ vipGroupId: id }).then(res => {
         if (res.code == 200) {
           /**
@@ -146,10 +162,12 @@ export default {
            * 
            */
           this.topForm.teacherCount = res.data.userName;
+          this.topForm.educationalTeacherName = res.data.educationalTeacherName
           this.topForm.subject = res.data.subjectName; //科目名称
           this.topForm.active = res.data.vipGroupActivityName;
           this.topForm.status = res.data.categoryName;
           this.topForm.classNum = res.data.studentNum;
+
           // totalClassTimes; 总课时数
           this.topForm.classTime = res.data.singleClassMinutes;
           //  教学点
@@ -175,14 +193,14 @@ export default {
         }
       });
     },
-    getStudents() {
+    getStudents () {
       findVipGroupStudents({ vipGroupId: this.id }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
         }
       });
     },
-    leaveSchool(scope) {
+    leaveSchool (scope) {
       let studentId = scope.row.id;
       let vipGroupId = this.id;
       leaveSchool({ studentId, vipGroupId }).then(res => {
@@ -193,10 +211,10 @@ export default {
         }
       });
     },
-    resetPrice() {
+    resetPrice () {
       this.isreset = true;
     },
-    submitBtn() {
+    submitBtn () {
       // 提交
       /**
        * this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;