Merge branch '11/24SAAS' into 08/24teamQuest

dist/static/css/chunk-3f3a399a.596b6506.css

@@ -1 +0,0 @@
-.box-card[data-v-a3ab0ede]{margin-bottom:20px;padding-bottom:20px}.el-input[data-v-a3ab0ede],.el-select[data-v-a3ab0ede],.el-textarea[data-v-a3ab0ede]{width:100%!important}.el-button--primary[data-v-a3ab0ede],.el-button--primary[data-v-a3ab0ede]:active,.el-button--primary[data-v-a3ab0ede]:focus,.el-button--primary[data-v-a3ab0ede]:hover{color:#fff}[data-v-a3ab0ede] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}[data-v-a3ab0ede] .avatar-uploader .el-upload:hover{border-color:#409eff}.uploadFile[data-v-a3ab0ede] .el-input__inner{padding:0;height:40px;line-height:32px}.avatar-uploader-icon[data-v-a3ab0ede]{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatar[data-v-a3ab0ede]{width:178px;height:178px;display:block}.w1200[data-v-a3ab0ede]{width:1000px;margin:0 auto}

dist/static/css/chunk-e1979926.a680045c.css

@@ -0,0 +1 @@
+.box-card[data-v-2bacea26]{margin-bottom:20px;padding-bottom:20px}.el-input[data-v-2bacea26],.el-select[data-v-2bacea26],.el-textarea[data-v-2bacea26]{width:100%!important}.el-button--primary[data-v-2bacea26],.el-button--primary[data-v-2bacea26]:active,.el-button--primary[data-v-2bacea26]:focus,.el-button--primary[data-v-2bacea26]:hover{color:#fff}[data-v-2bacea26] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}[data-v-2bacea26] .avatar-uploader .el-upload:hover{border-color:#409eff}.uploadFile[data-v-2bacea26] .el-input__inner{padding:0;height:40px;line-height:32px}.avatar-uploader-icon[data-v-2bacea26]{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatar[data-v-2bacea26]{width:178px;height:178px;display:block}.w1200[data-v-2bacea26]{width:1000px;margin:0 auto}

src/components/Editor/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="editor">
     <quill-editor
@@ -39,7 +38,6 @@
             class="avatar-uploader"
             style="line-height: 0; display: inline-block"
             :show-file-list="false"
-
             accept=".jpg, .jpeg, .png"
             :on-success="handleImgSuccess"
             :on-error="handleUploadImgError"
@@ -139,7 +137,7 @@ const toolbarOptions = [
   [{ font: [] }], // 字体种类
   [{ align: [] }], // 对齐方式
   ["clean"], // 清除文本格式 // 链接、图片、视频 , "video"
-  ["link", "image", "video"], // 链接、图片、视频
+  ["link", "image", "video"] // 链接、图片、视频
 ];
 // 标题
 const titleConfig = {
@@ -165,7 +163,7 @@ const titleConfig = {
   "ql-image": "图片",
   "ql-video": "视频",
   "ql-clean": "清除字体样式",
-  "ql-upload": "文件",
+  "ql-upload": "文件"
 };
 
 // 这里引入修改过的video模块并注册
@@ -179,19 +177,19 @@ export default {
     id: "",
     keyWord: {
       type: String,
-      default: "content",
+      default: "content"
     },
     form: {
-      type: String,
+      type: String
     },
     alias: {
       type: String,
-      default: "myQuillEditor",
+      default: "myQuillEditor"
     },
     bucket_name: {
       type: String,
-      default: "daya",
-    },
+      default: "daya"
+    }
   },
   name: "editor",
   components: { quillEditor },
@@ -199,20 +197,20 @@ export default {
     return {
       content: null,
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       dialogFormVisible: false,
       dialogForm: {
         poster: null,
         url: null,
-        videoUrl: null,
+        videoUrl: null
       },
       uploadLoading: false,
       uploadImgLoading: false,
       fileList: [],
       dialogFormRules: {
         url: [{ required: true, message: "请输入视频地址", trigger: "blur" }],
-        videoUrl: [{ required: true, message: "请上传视频", trigger: "blur" }],
+        videoUrl: [{ required: true, message: "请上传视频", trigger: "blur" }]
       },
       formRadio: 1,
       editorOption: {
@@ -221,7 +219,7 @@ export default {
           toolbar: {
             container: toolbarOptions,
             handlers: {
-              image: (value) => {
+              image: value => {
                 if (value) {
                   // 调用iview图片上传
                   let editor = this.editor;
@@ -232,7 +230,7 @@ export default {
                   this.quill.format("image", false);
                 }
               },
-              video: (value) => {
+              video: value => {
                 if (value) {
                   this.dialogFormVisible = true;
                   let editor = this.editor;
@@ -242,10 +240,10 @@ export default {
                 } else {
                   this.quill.format("image", false);
                 }
-              },
-            },
-          },
-        },
+              }
+            }
+          }
+        }
       },
       ActiveEditor: null,
       dataObj: {
@@ -255,9 +253,10 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`
     };
   },
   created() {},
@@ -282,7 +281,7 @@ export default {
       // this.form = html;
     },
     onVideoComfirm(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(valid => {
         if (valid) {
           let dialogForm = this.dialogForm;
           // 获取富文本组件实例
@@ -291,7 +290,7 @@ export default {
           // 插入图片，res为服务器返回的图片链接地址
           const params = {
             poster: dialogForm.poster,
-            url: this.formRadio == 1 ? dialogForm.url : dialogForm.videoUrl,
+            url: this.formRadio == 1 ? dialogForm.url : dialogForm.videoUrl
           };
           quill.insertEmbed(this.editorIndex, "video", params);
           // 调整光标到最后
@@ -301,7 +300,7 @@ export default {
           this.dialogForm = {
             poster: null,
             url: null,
-            videoUrl: null,
+            videoUrl: null
           };
         } else {
           return false;
@@ -332,7 +331,7 @@ export default {
       const oToolBar = document.querySelector(".ql-toolbar"),
         aButton = oToolBar.querySelectorAll("button"),
         aSelect = oToolBar.querySelectorAll("select");
-      aButton.forEach(function (item) {
+      aButton.forEach(function(item) {
         if (item.className === "ql-script") {
           item.value === "sub" ? (item.title = "下标") : (item.title = "上标");
         } else if (item.className === "ql-indent") {
@@ -343,7 +342,7 @@ export default {
           item.title = titleConfig[item.classList[0]];
         }
       });
-      aSelect.forEach(function (item) {
+      aSelect.forEach(function(item) {
         item.parentNode.title = titleConfig[item.classList[0]];
       });
     },
@@ -359,7 +358,7 @@ export default {
     async beforeImgUpload(file) {
       const imageType = {
         "image/png": true,
-        "image/jpeg": true,
+        "image/jpeg": true
       };
       const isImage = imageType[file.type];
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -384,8 +383,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -396,7 +395,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
       } catch (e) {
@@ -411,7 +410,7 @@ export default {
     beforeAvatarUpload(file) {
       const imageType = {
         "image/png": true,
-        "image/jpeg": true,
+        "image/jpeg": true
       };
       const isImage = imageType[file.type];
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -445,8 +444,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -457,7 +456,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
       } catch (e) {
@@ -479,7 +478,7 @@ export default {
     },
     handleExceed(files, fileList) {
       this.$message.error("您已上传过视频");
-    },
+    }
   },
   computed: {
     editor() {
@@ -488,12 +487,12 @@ export default {
     ActiveEditors() {
       console.log(this.id);
       return this.ActiveEditor;
-    },
-  },
+    }
+  }
 };
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 ::v-deep .ql-editor {
   min-height: 250px;
   padding: 0;
@@ -506,4 +505,3 @@ export default {
   max-width: 95%;
 }
 </style>
-

src/components/ImageCropper/index.vue

@@ -9,7 +9,8 @@
         :data="dataObj"
         :http-request="handleChange"
       >
-         <i v-if="isDelete && imageUrl"
+        <i
+          v-if="isDelete && imageUrl"
           @click.stop="onDelete"
           style="position: absolute;right: -14px;font-size: 24px;top: -14px;color: #787878;background: #fff;"
         ></i>
@@ -44,13 +45,13 @@ import axios from "axios";
 export default {
   name: "ImageCropper",
   components: {
-    CropperModal,
+    CropperModal
   },
   props: {
     //图片裁切配置
     options: {
       type: Object,
-      default: function () {
+      default: function() {
         return {
           autoCrop: true, //是否默认生成截图框
           enlarge: 1, //  图片放大倍数
@@ -70,11 +71,11 @@ export default {
     // 上传图片的大小，单位M
     imgSize: {
       type: Number,
-      default: 2,
+      default: 2
     },
     isDelete: {
       type: Boolean,
-      default: false,
+      default: false
     },
     // 图片地址
     imageUrl: {
@@ -94,11 +95,11 @@ export default {
     },
     bucket_name: {
       type: String,
-      default: "daya",
+      default: "daya"
     },
-    disabled:{
-       type: Boolean,
-      default: false,
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -106,7 +107,8 @@ export default {
       loading: false,
       isStopRun: false,
       info: null,
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
       dataObj: {
         policy: "",
         signature: "",
@@ -114,7 +116,7 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
       },
       isStopRun: false
     };
@@ -150,10 +152,10 @@ export default {
 
       //----
       const { options } = this;
-      this.getBase64(info.file, (imageUrl) => {
+      this.getBase64(info.file, imageUrl => {
         const target = Object.assign({}, options, {
           img: imageUrl,
-          name: info.file.name, // 上传文件名
+          name: info.file.name // 上传文件名
         });
         this.$refs.CropperModal.edit(target);
       });
@@ -197,8 +199,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
         const res = await policy(obj);
         this.dataObj = {
@@ -207,7 +209,7 @@ export default {
           key: key,
           KSSAccessKeyId: res.data.kssAccessKeyId,
           acl: "public-read",
-          name: fileName,
+          name: fileName
         };
         for (let key in this.dataObj) {
           formData.append(key, this.dataObj[key]);
@@ -215,14 +217,12 @@ export default {
         formData.append(filename, data, fileName);
         axios
           .post(action, formData, {
-            ...headers,
+            ...headers
           })
-          .then((res) => {
-
+          .then(res => {
             let url = this.ossUploadUrl + "/" + this.dataObj.key;
 
             if (url) {
-
               // filelist.value = [
               //   {
               //     name: url,
@@ -232,13 +232,12 @@ export default {
 
               // resValues.value = url;
 
-
               let data = {
                 data: {
-                  url: url,
-                },
+                  url: url
+                }
               };
-                  this.loading = false;
+              this.loading = false;
               this.$emit("crop-upload-success", data);
               CropperModal.value.closeVisible();
             } else {
@@ -246,7 +245,7 @@ export default {
               // ElMessage.error(res.msg || '上传失败')
             }
           })
-          .catch((e) => {
+          .catch(e => {
             // console.log(e, '失败')
             this.handleCropperClose();
           });

src/components/Upload/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="upload">
     <!--       :headers="headers" -->
@@ -28,11 +27,12 @@ export default {
   data() {
     return {
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       uploadImgLoading: false,
       imgUrl: null,
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
       dataObj: {
         policy: "",
         signature: "",
@@ -40,42 +40,42 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
         // bucket_name: props.bucket_name
-      },
+      }
     };
   },
   props: {
     value: {
       // 组件状态
-      type: String,
+      type: String
     },
     accept: {
       type: String,
       default() {
         return ".jpg, .jpeg, .png, .gif";
-      },
+      }
     },
     imageSizeM: {
       // 默认2M
       type: Number,
       default() {
         return 2;
-      },
+      }
     },
     imageWidthM: {
       // 默认2M
       type: Number,
       default() {
         return null;
-      },
+      }
     },
     imageHeightM: {
       // 默认2M
       type: Number,
       default() {
         return null;
-      },
+      }
     },
     imageType: {
       // 检测类型
@@ -85,14 +85,14 @@ export default {
           "image/png": true,
           "image/jpeg": true,
           "image/jpg": true,
-          "image/gif": true,
+          "image/gif": true
         };
-      },
+      }
     },
     bucket_name: {
       type: String,
-      default: "daya",
-    },
+      default: "daya"
+    }
   },
   mounted() {
     this.imgUrl = this.value;
@@ -106,7 +106,7 @@ export default {
       const _URL = window.URL || window.webkitURL;
       const isSize = new Promise((resolve, reject) => {
         const img = new Image();
-        img.onload = function () {
+        img.onload = function() {
           if (imageWidth && imageHeigh) {
             this.width === imageWidth && this.height === imageHeigh
               ? resolve()
@@ -128,7 +128,7 @@ export default {
         () => {
           return file;
         },
-        (src) => {
+        src => {
           this.$message.error(src);
           this.uploadImgLoading = false;
           return Promise.reject();
@@ -154,8 +154,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -166,7 +166,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.
         };
         return isImage && isLt2M && isSize;
@@ -184,14 +184,14 @@ export default {
       let url = this.ossUploadUrl + "/" + this.dataObj.key;
       this.imgUrl = url;
       this.$emit("input", url);
-    },
+    }
   },
   watch: {
     value(newValue) {
       this.imgUrl = newValue;
-    },
+    }
   },
-  beforeDestroy() {},
+  beforeDestroy() {}
 };
 </script>
 

src/components/remote-search/index.vue

@@ -114,7 +114,8 @@ export default {
               item.userName
                 .toLowerCase()
                 .indexOf(query.toString().toLowerCase()) > -1 ||
-              item.userId == query;
+              item.userId == query || item.mobile.indexOf(query) > -1  ;
+              // console.log(item.mobile,'query',query,item.mobile.indexOf(query))
             if (this.multiple) {
               return flag || this.value.includes(item.userId);
             } else {
@@ -128,7 +129,6 @@ export default {
         try {
           await this.getList();
           const optionids = this.options.map((item) => item.userId);
-
           const valueItem = this.listById[this.value];
           if (!optionids.includes(this.value) && valueItem) {
             this.options.push(valueItem);

src/components/singe-file-upload/index.vue

@@ -1,7 +1,6 @@
 <template>
   <!-- :before-upload="beforeUpload"     :headers="headers"    action="/api-web/uploadFile"-->
   <el-upload
-
     :action="ossUploadUrl"
     :data="dataObj"
     :on-success="success"
@@ -49,24 +48,24 @@ export default {
   props: {
     buttonText: {
       type: String,
-      default: "点击上传",
+      default: "点击上传"
     },
     tips: {
       type: String,
-      default: "",
+      default: ""
     },
     value: {
       type: String,
-      default: "",
+      default: ""
     },
     accept: {
       type: String,
-      default: "",
+      default: ""
     },
     bucket_name: {
       type: String,
-      default: "daya",
-    },
+      default: "daya"
+    }
   },
   watch: {
     value: {
@@ -75,23 +74,24 @@ export default {
           this.filelist = [
             {
               name: this.value,
-              url: this.value,
-            },
+              url: this.value
+            }
           ];
         } else {
           this.remove();
         }
       },
-      immediate: true,
-    },
+      immediate: true
+    }
   },
   data() {
     return {
       filelist: [],
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
       dataObj: {
         policy: "",
         signature: "",
@@ -99,9 +99,9 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
         // bucket_name: props.bucket_name
-      },
+      }
     };
   },
   methods: {
@@ -124,25 +124,25 @@ export default {
     },
     success(res, file) {
       load.endLoading();
-       let url = this.ossUploadUrl + '/' + this.dataObj.key
+      let url = this.ossUploadUrl + "/" + this.dataObj.key;
       if (url) {
         this.filelist = [
           {
             name: url,
-            url: url,
-          },
+            url: url
+          }
         ];
-        this.$emit("update:value",url);
+        this.$emit("update:value", url);
         this.$emit("input", url);
         this.$emit("inputFile", file);
-        this.$emit('success')
+        this.$emit("success");
         // val.data.name
 
-       let res= {
-        data:{
-          name:this.dataObj.name
-        }
-       }
+        let res = {
+          data: {
+            name: this.dataObj.name
+          }
+        };
         this.$emit("getName", res);
       } else {
         this.remove();
@@ -179,8 +179,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -191,14 +191,14 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/uploadImageList/index.vue

@@ -15,7 +15,9 @@
       :limit="max"
     >
       <el-button :loading="uploading" type="primary">上传图片</el-button>
-       <div v-if="max" class="el-upload__tip" slot="tip">最多只能上传{{max}}张图片</div>
+      <div v-if="max" class="el-upload__tip" slot="tip">
+        最多只能上传{{ max }}张图片
+      </div>
     </el-upload>
     <div class="img-container">
       <div class="list" v-if="uploaded.length > 0">
@@ -25,7 +27,7 @@
           </div>
           <el-image
             :src="item.url"
-            :preview-src-list="uploaded.map((item) => item.url)"
+            :preview-src-list="uploaded.map(item => item.url)"
             class="img"
           >
           </el-image>
@@ -51,28 +53,28 @@ export default {
   props: {
     buttonText: {
       type: String,
-      default: "点击上传",
+      default: "点击上传"
     },
     tips: {
       type: String,
-      default: "",
+      default: ""
     },
     uploaded: {
       type: Array,
-      default: ()=>[],
+      default: () => []
     },
     accept: {
       type: String,
-      default: "",
+      default: ""
     },
     max: {
       type: Number,
-      default: 5,
+      default: 5
     },
     bucket_name: {
       type: String,
-      default: "daya",
-    },
+      default: "daya"
+    }
   },
   watch: {
     value: {
@@ -81,23 +83,24 @@ export default {
           this.filelist = [
             {
               name: this.value,
-              url: this.value,
-            },
+              url: this.value
+            }
           ];
         } else {
           this.remove();
         }
       },
-      immediate: true,
-    },
+      immediate: true
+    }
   },
   data() {
     return {
       filelist: [],
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
       dataObj: {
         policy: "",
         signature: "",
@@ -105,15 +108,15 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
         // bucket_name: props.bucket_name
       },
-        uploading:false
+      uploading: false
     };
   },
   methods: {
     async beforeUpload(file) {
-      console.log(file)
+      console.log(file);
       this.uploading = true;
       try {
         let fileName = file.name.replaceAll(" ", "_");
@@ -127,8 +130,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -139,7 +142,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
       } catch (e) {
@@ -154,7 +157,7 @@ export default {
         this.uploaded.push({
           url,
           name: file.name.split(".").shift(),
-          clientShow: "YES",
+          clientShow: "YES"
         });
       } else {
         this.$message.error(res.data?.message || res.msg || "上传失败");
@@ -171,10 +174,14 @@ export default {
     remove(index) {
       this.uploaded.splice(index, 1);
     },
-    handError(files, fileList){
-      this.$message.error(`当前限制选择 ${this.max} 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    handError(files, fileList) {
+      this.$message.error(
+        `当前限制选择 ${this.max} 个文件，本次选择了 ${
+          files.length
+        } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+      );
     }
-  },
+  }
 };
 </script>
 

src/layout/components/modal/userModal.vue

@@ -91,7 +91,7 @@ export default {
   data() {
     return {
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       formLabelWidth: "100px",
       form: {
@@ -101,15 +101,15 @@ export default {
         gender: null,
         phone: null,
         contactAddress: null,
-        postalCode: null,
+        postalCode: null
       },
       rules: {
         avatar: [
           {
             required: true,
             message: "请上传用户头像",
-            trigger: "blur, change",
-          },
+            trigger: "blur, change"
+          }
         ],
         realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
         gender: [{ required: true, message: "请选择性别", trigger: "change" }],
@@ -118,16 +118,17 @@ export default {
             type: "number",
             required: true,
             validator: validPhone,
-            trigger: "blur",
+            trigger: "blur"
           },
           {
             pattern: /^1[3456789]\d{9}$/,
             message: "请输入正确的手机号",
-            trigger: "blur",
-          },
-        ],
+            trigger: "blur"
+          }
+        ]
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/daya",
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/daya",
+      ossUploadUrl: `https://daya.ks3-cn-beijing.ksyuncs.com`,
       dataObj: {
         policy: "",
         signature: "",
@@ -135,10 +136,10 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
         //
       },
-      bucket_name: 'daya'
+      bucket_name: "daya"
     };
   },
   mounted() {
@@ -155,7 +156,7 @@ export default {
           gender,
           phone,
           contactAddress,
-          postalCode,
+          postalCode
         } = res.data;
         this.form = {
           id,
@@ -164,20 +165,20 @@ export default {
           gender,
           phone,
           contactAddress,
-          postalCode,
+          postalCode
         };
       } catch (e) {}
     },
     handleAvatarSuccess(res) {
-         let url = this.ossUploadUrl + '/' + this.dataObj.key
-      this.form.avatar =url;
+      let url = this.ossUploadUrl + "/" + this.dataObj.key;
+      this.form.avatar = url;
     },
-async beforeAvatarUpload(file) {
+    async beforeAvatarUpload(file) {
       const imageType = {
         "image/png": true,
         "image/jpg": true,
         "image/jpeg": true,
-        "image/gif": true,
+        "image/gif": true
       };
       const isImage = imageType[file.type];
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -190,7 +191,7 @@ async beforeAvatarUpload(file) {
         return false;
       }
 
-        try {
+      try {
         let fileName = file.name.replaceAll(" ", "_");
         let key = new Date().getTime() + fileName;
         let obj = {
@@ -200,8 +201,8 @@ async beforeAvatarUpload(file) {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -212,21 +213,20 @@ async beforeAvatarUpload(file) {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
-          return isImage && isLt2M;
+        return isImage && isLt2M;
       } catch (e) {
-        console.log(e)
-        return false
+        console.log(e);
+        return false;
       }
-
     },
     onRoleSubmit() {
       // employee/simpleUpdate
-      this.$refs["ruleForm"].validate(async (valid) => {
+      this.$refs["ruleForm"].validate(async valid => {
         if (valid) {
-          simpleUpdate(this.form).then((res) => {
+          simpleUpdate(this.form).then(res => {
             this.messageTips("修改", res);
           });
         } else {
@@ -244,8 +244,8 @@ async beforeAvatarUpload(file) {
       } else {
         this.$message.error(res.msg);
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/activityScheduling/2021doubleDetail.vue

@@ -30,7 +30,7 @@
             ></el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item prop="type">
+        <el-form-item prop="type" v-if="!$route.query.year">
           <el-select
             v-model.trim="searchForm.type"
             filterable
@@ -45,6 +45,21 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="type" v-else>
+          <el-select
+            v-model.trim="searchForm.type"
+            filterable
+            clearable
+            placeholder="购买课程"
+          >
+            <el-option
+              v-for="item in typeListBase"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="giveMemberFlag" v-if="!$route.query.year">
           <el-select
             class="multiple"
@@ -145,11 +160,14 @@ import { Export } from "@/utils/downLoadFile";
 import { getTimes } from "@/utils";
 import cleanDeep from "clean-deep";
 import qs from "qs";
-const typeList = [
-  { value: 1, label: "1v1 20节" },
+const typeListBase = [
+{ value: 1, label: "1v1 20节" },
   { value: 2, label: "1v1 40节" },
   { value: 3, label: "1v2 20节" },
   { value: 4, label: "1v2 40节" },
+];
+const typeList = [
+  ...typeListBase,
   { value: 5, label: "乐理课" },
 ];
 export default {
@@ -165,6 +183,7 @@ export default {
       courseViewTypeList,
       tableList: [],
       organList: [],
+      typeListBase,
       typeList: typeList,
       rules: {
         // 分页规则

src/views/adapayAccount/form.vue

@@ -122,30 +122,30 @@
                 </el-tooltip>
               </template>
               <!-- <el-input type="file" class="uploadFile" v-model="form.multipartFile"></el-input> -->
-                   <el-upload
-              class="avatar-upload"
-              ref="upload"
-              :action="ossUploadUrl"
-              :data="dataObj"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :on-change="handleChange"
-              :file-list="fileList"
-              accept=".zip"
-              :multiple="false"
-              :limit="1"
-              :auto-upload="false"
-            >
-              <el-button slot="trigger" type="primary">选取文件</el-button>
-              <!-- ，且不超过500kb -->
-              <div
-                slot="tip"
-                style="display: inline; padding-left: 20px"
-                class="el-upload__tip"
+              <el-upload
+                class="avatar-upload"
+                ref="upload"
+                :action="ossUploadUrl"
+                :data="dataObj"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :on-change="handleChange"
+                :file-list="fileList"
+                accept=".zip"
+                :multiple="false"
+                :limit="1"
+                :auto-upload="false"
               >
-                只能上传一个文件
-              </div>
-            </el-upload>
+                <el-button slot="trigger" type="primary">选取文件</el-button>
+                <!-- ，且不超过500kb -->
+                <div
+                  slot="tip"
+                  style="display: inline; padding-left: 20px"
+                  class="el-upload__tip"
+                >
+                  只能上传一个文件
+                </div>
+              </el-upload>
               <!-- <el-upload class="avatar-uploader"
                             action="/api-web/uploadFile"
                             :headers="headers"
@@ -287,7 +287,7 @@ export default {
       cityList: cityJson,
       selectListCity: [],
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       fileList: [],
       files: null, // 上传对象
@@ -310,64 +310,64 @@ export default {
         multipartFile: null,
         zipCode: null,
         bankAcctType: null,
-        cardName: null,
+        cardName: null
       },
       rules: {
         memberId: [
-          { required: true, message: "请输入商户号", trigger: "blur" },
+          { required: true, message: "请输入商户号", trigger: "blur" }
         ],
         name: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
         legalPerson: [
-          { required: true, message: "请输入公司法人", trigger: "blur" },
+          { required: true, message: "请输入公司法人", trigger: "blur" }
         ],
         legalMp: [
           {
             type: "number",
             required: true,
             validator: validPhone,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         legalCertId: [
-          { required: true, message: "请输入法人身份证号", trigger: "blur" },
+          { required: true, message: "请输入法人身份证号", trigger: "blur" }
         ],
         legalCertIdExpires: [
-          { required: true, message: "请选择身份证有效期", trigger: "change" },
+          { required: true, message: "请选择身份证有效期", trigger: "change" }
         ],
         cardNo: [
-          { required: true, message: "请输入银行卡号", trigger: "blur" },
+          { required: true, message: "请输入银行卡号", trigger: "blur" }
         ],
         bankCode: [
-          { required: true, message: "请选择所属银行", trigger: "change" },
+          { required: true, message: "请选择所属银行", trigger: "change" }
         ],
         provCode: [
-          { required: true, message: "请选择省份", trigger: "change" },
+          { required: true, message: "请选择省份", trigger: "change" }
         ],
         areaCode: [
-          { required: true, message: "请选择城市", trigger: "change" },
+          { required: true, message: "请选择城市", trigger: "change" }
         ],
         socialCreditCode: [
-          { required: true, message: "请输入统一社会信用码", trigger: "blur" },
+          { required: true, message: "请输入统一社会信用码", trigger: "blur" }
         ],
         socialCreditCodeExpires: [
           {
             required: true,
             message: "请选择统一社会信用码有效期",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         businessScope: [
-          { required: true, message: "请输入经营范围", trigger: "blur" },
+          { required: true, message: "请输入经营范围", trigger: "blur" }
         ],
         address: [
-          { required: true, message: "请输入公司地址", trigger: "blur" },
+          { required: true, message: "请输入公司地址", trigger: "blur" }
         ],
         multipartFile: [
-          { required: true, message: "请上传证照文件", trigger: "change" },
+          { required: true, message: "请上传证照文件", trigger: "change" }
         ],
-        zipCode: [{ required: true, message: "请输入邮编", trigger: "blur" }],
+        zipCode: [{ required: true, message: "请输入邮编", trigger: "blur" }]
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com/`,
       dataObj: {
         policy: "",
         signature: "",
@@ -375,10 +375,10 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
         // bucket_name: props.bucket_name
       },
-      bucket_name: "daya",
+      bucket_name: "daya"
     };
   },
   mounted() {
@@ -412,10 +412,10 @@ export default {
           address: row.address,
           multipartFile: row.multipartFile,
           zipCode: row.zipCode,
-          bankAcctType:  row.bankAcctType,
-        cardName:  row.cardName,
+          bankAcctType: row.bankAcctType,
+          cardName: row.cardName
         };
-        this.cityList.forEach((item) => {
+        this.cityList.forEach(item => {
           if (item.value == row.provCode) {
             this.selectListCity = item.cities;
           }
@@ -443,7 +443,7 @@ export default {
       }
     },
     async onSubmit(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(valid => {
         if (valid) {
           const form = this.form;
           let formData = new FormData();
@@ -469,7 +469,7 @@ export default {
           formData.append("bankAcctType", form.bankAcctType);
           formData.append("cardName", form.cardName);
           if (this.payType == "create") {
-            createMember(formData).then((res) => {
+            createMember(formData).then(res => {
               if (res.code == 200) {
                 this.$message.success("保存成功");
                 this.onCancel();
@@ -479,7 +479,7 @@ export default {
             });
           } else if (this.payType == "update") {
             formData.append("id", this.id);
-            updateMember(formData).then((res) => {
+            updateMember(formData).then(res => {
               if (res.code == 200) {
                 this.$message.success("保存成功");
                 this.onCancel();
@@ -493,14 +493,14 @@ export default {
             let isError = document.getElementsByClassName("is-error");
             isError[0].scrollIntoView({
               block: "center",
-              behavior: "smooth",
+              behavior: "smooth"
             });
           });
           return false;
         }
       });
     },
-   async handleChange(file) {
+    async handleChange(file) {
       const isLt2M = file.size / 1024 / 1024 < 9;
       if (!isLt2M) {
         this.$message.error(`上传文件大小不能超过 ${9}MB!`);
@@ -517,8 +517,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -529,7 +529,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
         this.files = file;
@@ -551,7 +551,7 @@ export default {
     },
     onProvChange(value) {
       this.form.areaCode = null;
-      this.cityList.forEach((item) => {
+      this.cityList.forEach(item => {
         if (item.value == value) {
           this.selectListCity = item.cities;
         }
@@ -563,13 +563,13 @@ export default {
       this.form.multipartFile = null;
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
-        path: "/sysBasics/adapayManager",
+        path: "/sysBasics/adapayManager"
       });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .box-card {
   margin-bottom: 20px;
   padding-bottom: 20px;

src/views/contentManager/model/systemNotifyModel.vue

@@ -51,7 +51,7 @@
           prop="linkUrl"
           v-if="outUrlRadio == 1"
           :rules="[
-            { required: true, message: '请输入外链地址', trigger: 'blur' },
+            { required: true, message: '请输入外链地址', trigger: 'blur' }
           ]"
         >
           <el-input
@@ -126,8 +126,8 @@
             {
               required: uploadType == 2 ? true : false,
               message: '请上传封面图',
-              trigger: 'blur',
-            },
+              trigger: 'blur'
+            }
           ]"
           label-width="120px"
         >
@@ -260,7 +260,7 @@ const toolbarOptions = [
   [{ font: [] }], // 字体种类
   [{ align: [] }], // 对齐方式
   ["clean"], // 清除文本格式
-  ["image", "video"], // 链接、图片、视频
+  ["image", "video"] // 链接、图片、视频
   // ["link", "image", "video"] // 链接、图片、视频
 ];
 // 标题
@@ -287,7 +287,7 @@ const titleConfig = {
   "ql-image": "图片",
   "ql-video": "视频",
   "ql-clean": "清除字体样式",
-  "ql-upload": "文件",
+  "ql-upload": "文件"
 };
 
 // 这里引入修改过的video模块并注册
@@ -298,7 +298,7 @@ export default {
   props: ["options"],
   name: "contentOperation",
   components: {
-    quillEditor,
+    quillEditor
   },
   data() {
     let that = this;
@@ -320,7 +320,7 @@ export default {
         title: "",
         type: query.type,
         updateTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        content: null,
+        content: null
       },
       editorIndex: 0, // 光标位置
       editorOption: {
@@ -329,7 +329,7 @@ export default {
           toolbar: {
             container: toolbarOptions,
             handlers: {
-              image: function (value) {
+              image: function(value) {
                 if (value) {
                   // 调用iview图片上传
                   document.querySelector(".ivu-upload .el-upload").click();
@@ -337,7 +337,7 @@ export default {
                   this.quill.format("image", false);
                 }
               },
-              video: function (value) {
+              video: function(value) {
                 if (value) {
                   that.dialogFormVisible = true;
                   let editor = that.$refs.myQuillEditor.quill;
@@ -346,22 +346,22 @@ export default {
                 } else {
                   this.quill.format("image", false);
                 }
-              },
-            },
-          },
-        },
+              }
+            }
+          }
+        }
       },
       dialogForm: {
         poster: null,
         url: null,
-        videoUrl: null,
+        videoUrl: null
       },
       uploadLoading: false,
       uploadImgLoading: false,
       fileList: [],
       dialogFormRules: {
         url: [{ required: true, message: "请输入视频地址", trigger: "blur" }],
-        videoUrl: [{ required: true, message: "请上传视频", trigger: "blur" }],
+        videoUrl: [{ required: true, message: "请上传视频", trigger: "blur" }]
       },
       outUrlRadio: 0, // 是否使用外部连接，默认不使用
       form: {
@@ -371,7 +371,7 @@ export default {
         type: query.type,
         status: 0,
         content: null,
-        organIdList: [],
+        organIdList: []
       },
       rules: {
         title: [
@@ -380,12 +380,12 @@ export default {
             min: 2,
             max: 30,
             message: "长度在 2 到 30 个字符",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         organIdList: [
-          { required: true, message: "请选择分部", trigger: "change" },
-        ],
+          { required: true, message: "请选择分部", trigger: "change" }
+        ]
       },
       imageSize: null,
       dataObj: {
@@ -395,11 +395,12 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
         // bucket_name: props.bucket_name
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + "news-info",
-      bucket_name: "news-info",
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + "news-info",
+      ossUploadUrl: `https://news-info.ks3-cn-beijing.ksyuncs.com`,
+      bucket_name: "news-info"
     };
   },
   mounted() {
@@ -420,14 +421,14 @@ export default {
         5: "图片不能超过 2M；",
         6: "图片不能超过 2M；",
         7: "图片不能超过 2M；",
-        8: "1242px * 2208px； 图片不能超过 2M；",
+        8: "1242px * 2208px； 图片不能超过 2M；"
       };
       this.imageSize = tempTitle[this.form.type];
 
       this.$refs["form"].clearValidate();
     },
     onVideoComfirm(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(valid => {
         if (valid) {
           let dialogForm = this.dialogForm;
           // 编辑器输入视频
@@ -436,7 +437,7 @@ export default {
           // 插入图片，res为服务器返回的图片链接地址
           const params = {
             poster: dialogForm.poster,
-            url: this.formRadio == 1 ? dialogForm.url : dialogForm.videoUrl,
+            url: this.formRadio == 1 ? dialogForm.url : dialogForm.videoUrl
           };
           quill.insertEmbed(this.editorIndex, "video", params);
           // 调整光标到最后
@@ -446,7 +447,7 @@ export default {
           this.dialogForm = {
             poster: null,
             url: null,
-            videoUrl: null,
+            videoUrl: null
           };
         } else {
           return false;
@@ -457,7 +458,7 @@ export default {
       this.dialogForm = {
         poster: null,
         url: null,
-        videoUrl: null,
+        videoUrl: null
       };
       this.$refs[diologForm].resetFields();
     },
@@ -465,7 +466,7 @@ export default {
       const oToolBar = document.querySelector(".ql-toolbar"),
         aButton = oToolBar.querySelectorAll("button"),
         aSelect = oToolBar.querySelectorAll("select");
-      aButton.forEach(function (item) {
+      aButton.forEach(function(item) {
         if (item.className === "ql-script") {
           item.value === "sub" ? (item.title = "下标") : (item.title = "上标");
         } else if (item.className === "ql-indent") {
@@ -476,12 +477,12 @@ export default {
           item.title = titleConfig[item.classList[0]];
         }
       });
-      aSelect.forEach(function (item) {
+      aSelect.forEach(function(item) {
         item.parentNode.title = titleConfig[item.classList[0]];
       });
     },
     onSubmit(formName) {
-      this.$refs[formName].validate(async (valid) => {
+      this.$refs[formName].validate(async valid => {
         if (valid) {
           let { organIdList, linkUrl, content, ...rest } = this.form;
           if (this.outUrlRadio == 1) {
@@ -493,7 +494,7 @@ export default {
             ...rest,
             linkUrl,
             content,
-            organIdList: organIdList ? organIdList.join(",") : null,
+            organIdList: organIdList ? organIdList.join(",") : null
           };
           if (this.pageType == "create") {
             if (form.id) {
@@ -501,11 +502,11 @@ export default {
               delete form.id;
             }
             // return false
-            await newsAdd(form).then((res) => {
+            await newsAdd(form).then(res => {
               this.messageTips("添加", res);
             });
           } else if (this.pageType == "update") {
-            await newsUpdate(form).then((res) => {
+            await newsUpdate(form).then(res => {
               this.messageTips("修改", res);
             });
           }
@@ -514,7 +515,7 @@ export default {
             let isError = document.getElementsByClassName("is-error");
             isError[0].scrollIntoView({
               block: "center",
-              behavior: "smooth",
+              behavior: "smooth"
             });
           });
           return false;
@@ -532,7 +533,7 @@ export default {
     },
     handleSuccess(res) {
       // 获取富文本组件实例
-        this.uploadImgLoading = false;
+      this.uploadImgLoading = false;
       let quill = this.editor;
       // 如果上传成功
       let url = this.ossUploadUrl + "/" + this.dataObj.key;
@@ -557,7 +558,7 @@ export default {
         type: this.type,
         status: 1,
         content: null,
-        organIdList: [],
+        organIdList: []
       };
       this.$refs[formName].resetFields();
     },
@@ -570,14 +571,14 @@ export default {
       setTimeout(() => {
         let imgNode = document.querySelectorAll(".msgWrap img");
         if (imgNode.length > 0) {
-          imgNode.forEach((item) => {
+          imgNode.forEach(item => {
             item.style.width = "100%";
           });
         }
 
         let videoNode = document.querySelectorAll(".msgWrap .ql-video");
         if (videoNode.length > 0) {
-          videoNode.forEach((item) => {
+          videoNode.forEach(item => {
             item.style.width = "100%";
             item.style.height = "195px";
           });
@@ -589,7 +590,7 @@ export default {
       if (this.pageType == "create") {
         return;
       } else {
-        await newsQueryId({ id: this.options.id }).then((res) => {
+        await newsQueryId({ id: this.options.id }).then(res => {
           if (res.code == 200) {
             let result = res.data;
             let organ = result.organIdList ? result.organIdList.split(",") : [];
@@ -606,10 +607,10 @@ export default {
               linkUrl: result.linkUrl,
               type: result.type,
               status: result.status,
-              organIdList: organ.map((item) => {
+              organIdList: organ.map(item => {
                 return +item;
               }),
-              content: result.content,
+              content: result.content
             };
             this.dataInfo.updateTime = result.updateTime;
           }
@@ -632,7 +633,7 @@ export default {
     async beforeImgUpload(file) {
       const imageType = {
         "image/png": true,
-        "image/jpeg": true,
+        "image/jpeg": true
       };
       const isImage = imageType[file.type];
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -657,8 +658,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -669,7 +670,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
       } catch (e) {
@@ -684,7 +685,7 @@ export default {
         2: "热门资讯",
         4: "专项训练",
         7: "知识库",
-        19: "系统通知",
+        19: "系统通知"
       };
       return params[type] ? params[type] : "管乐迷";
     },
@@ -698,7 +699,7 @@ export default {
         6: 5,
         7: 6,
         8: 7,
-        19: 8,
+        19: 8
       };
       return tempTitle[type];
     },
@@ -726,8 +727,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -738,7 +739,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
       } catch (e) {
@@ -763,13 +764,13 @@ export default {
     },
     handleExceed(files, fileList) {
       this.$message.error("您已上传过视频");
-    },
+    }
   },
   computed: {
     editor() {
       return this.$refs.myQuillEditor.quill;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/resetTeaming/components/training-photos/upload/index.vue

@@ -40,7 +40,7 @@
             </div>
             <el-image
               :src="item.url"
-              :preview-src-list="uploaded.map((item) => item.url)"
+              :preview-src-list="uploaded.map(item => item.url)"
               class="img"
             >
             </el-image>
@@ -73,12 +73,12 @@ export default {
     name: String,
     query: {
       type: Object,
-      default: () => ({}),
+      default: () => ({})
     },
     bucket_name: {
       type: String,
-      default: "daya",
-    },
+      default: "daya"
+    }
   },
   data() {
     return {
@@ -87,11 +87,12 @@ export default {
       dialogVisible: false,
       uploading: false,
       form: {
-        photoAlbumId: "",
+        photoAlbumId: ""
       },
       uploaded: [],
       photos: [],
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
       dataObj: {
         policy: "",
         signature: "",
@@ -99,9 +100,9 @@ export default {
         KSSAccessKeyId: "",
         // dir: "",
         acl: "public-read",
-        name: "",
+        name: ""
         // bucket_name: props.bucket_name
-      },
+      }
     };
   },
   mounted() {
@@ -112,12 +113,12 @@ export default {
     handleChange(file, fileList) {
       this.fileList = fileList.slice(-3);
     },
-   async beforeUpload(file) {
+    async beforeUpload(file) {
       this.uploading = true;
       try {
         let fileName = file.name.replaceAll(" ", "_");
 
-        let key =new Date().getTime() + fileName;
+        let key = new Date().getTime() + fileName;
         file.key = key;
         let obj = {
           filename: fileName,
@@ -126,8 +127,8 @@ export default {
             filename: fileName,
             acl: "public-read",
             key: key,
-            unknowValueField: [],
-          },
+            unknowValueField: []
+          }
         };
 
         const res = await policy(obj);
@@ -138,7 +139,7 @@ export default {
           KSSAccessKeyId: res.data.kssAccessKeyId,
           // dir: "",
           acl: "public-read",
-          name: fileName,
+          name: fileName
           // bucket_name: props.bucket_name
         };
       } catch (e) {
@@ -153,7 +154,7 @@ export default {
         this.uploaded.push({
           url,
           name: file.name.split(".").shift(),
-          clientShow: "YES",
+          clientShow: "YES"
         });
       } else {
         this.$message.error(res.data?.message || res.msg || "上传失败");
@@ -171,7 +172,7 @@ export default {
       try {
         const res = await photoAlbumQueryPage({
           ...this.query,
-          rows: 9999,
+          rows: 9999
         });
         this.photos = res.data.rows;
       } catch (error) {}
@@ -181,11 +182,11 @@ export default {
       evt.stopImmediatePropagation();
       evt.preventDefault();
       try {
-        this.$refs.form.validate(async (valid) => {
+        this.$refs.form.validate(async valid => {
           if (valid) {
-            const phoths = this.uploaded.map((item) => ({
+            const phoths = this.uploaded.map(item => ({
               ...item,
-              ...this.query,
+              ...this.query
               // photoAlbumId: this.form.photoAlbumId || this.$route.params.id,
             }));
             await photoAdd(phoths);
@@ -198,8 +199,8 @@ export default {
     },
     remove(index) {
       this.uploaded.splice(index, 1);
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="less" scoped>

src/views/smallStudentManager/components/index.vue

@@ -10,6 +10,7 @@
             </el-button> -->
           </div>
         </template>
+        <div v-if="activeNames">
         <el-row class="rows" :gutter="20">
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <sleep :data="statistic" />
@@ -24,6 +25,7 @@
             <studentChange :groupType="groupType" />
           </el-col>
         </el-row>
+      </div>
       </el-collapse-item>
     </el-collapse>
     <div v-show="false">{{ isSearchs }}</div>

src/views/teamDetail/teamClassList.vue

@@ -86,6 +86,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="mainTeacherUserId">
+          <remote-search
+            :commit="'setTeachers'"
+            v-model="searchForm.mainTeacherUserId"
+            :demissionFlag="true"
+            :isForzenWithQueryCondition="true"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
@@ -295,6 +303,7 @@ export default {
         organIdList: [],
         type: "",
         groupType: "MUSIC",
+        mainTeacherUserId:''
       },
       courseListType: courseListType,
       musicClassTypeList,