diff --git a/src/setting.js b/src/setting.js
index 28506aa..b8ddb3a 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -13,7 +13,7 @@ if (isDev) {
 	sandPath = `http://${location.hostname}:9520`
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
-  host = 'http://192.168.31.217:9000/'// 榕
+  // host = 'http://192.168.31.217:9000/'// 榕
   // host = 'http://192.168.31.51:9000/'// 赓
 } else if (isPro) {
   jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
diff --git a/src/utils/api.js b/src/utils/api.js
index bff10a7..812a036 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -415,6 +415,8 @@ export default {
     cCompetitionStageFileList: `competition/cCompetitionStageFile/listByEntity`,
     derive: `${host}competition/cCompetitionStageFile/deriveAll`,
     allExperimentalResultsAreDerived: `${host}competition/competition/performance/allExperimentalResultsAreDerived`,
+    derivedRanking: `${host}competition/competition/rank/derivedRanking`,
+    individualDerivedRanking: `${host}competition/competition/rank/individualDerivedRanking`,
     gradeImport: `https://www.occupationlab.com/template/赛事成绩导入模板.xlsx`,
     rankImportTeam: `https://www.occupationlab.com/template/赛事排名导入模板(团队赛).xlsx`,
     rankImportPerson: `https://www.occupationlab.com/template/赛事排名导入模板(个人赛).xlsx`,
diff --git a/src/utils/core.js b/src/utils/core.js
index 96b5d0d..1913a25 100644
--- a/src/utils/core.js
+++ b/src/utils/core.js
@@ -1,5 +1,3 @@
-import { Loading } from 'element-ui'
-
 const pad2 = str => ('0' + str).substr(-2)
 
 function fMoney (s, n) {
@@ -205,7 +203,6 @@ function formatDate(fmt,date) {
 
 // 传入文件名和路径，下载图片视频，支持跨域，a标签加download不支持跨域
 function downloadFile(fileName, url) {
-  const loadIns = Loading.service()
   var x = new XMLHttpRequest()
   x.open("GET", url, true)
   x.responseType = "blob"
@@ -215,7 +212,6 @@ function downloadFile(fileName, url) {
     a.href = url
     a.download = fileName
     a.click()
-    loadIns.close()
   }
   x.send()
 }
diff --git a/src/views/course/contentSettings.vue b/src/views/course/contentSettings.vue
index 3af73cd..5136d2c 100644
--- a/src/views/course/contentSettings.vue
+++ b/src/views/course/contentSettings.vue
@@ -162,6 +162,7 @@
                      @submit.native.prevent>
               <el-form-item label="资源添加">
                 <Upload :max-size="100000"
+                        :file-list="uploadList"
                         :on-remove="handleRemove"
                         @beforeUpload="beforeUpload"
                         @onSuccess="uploadSuccess">
@@ -192,6 +193,7 @@
                      @close="closeSwitch">
             <div style="text-align: center">
               <Upload :max-size="100000"
+                      :file-list="uploadList"
                       :on-remove="handleRemove"
                       @beforeUpload="beforeUpload"
                       @onSuccess="uploadSuccess">
@@ -528,34 +530,6 @@ export default {
       this.fileUrl = file.url
       this.fileName = file.name
     },
-    // 自定义上传
-    handleRequest (data) {
-      const param = new FormData()
-      param.append('file', data.file)
-      const config = {
-        timeout: 10000000000,
-        headers: {
-          'Accept': '*/*',
-          'Content-Type': 'multipart/form-data'
-        },
-        // 获取上传进度，自带的组件上传进度不准确
-        onUploadProgress: progressEvent => {
-          const per = Number((progressEvent.loaded / progressEvent.total * 100).toFixed(2))
-          console.log("🚀 ~ file: contentSettings.vue ~ line 329 ~ handleRequest ~ per", per, this.progressPercent)
-          if (this.progressPercent <= 80) this.progressPercent = (per > 80) ? (Math.random() * 10 + 80).toFixed(2) : per
-        }
-      }
-      axios.post(this.api.fileupload, param, config).then(res => {
-        this.progressPercent = 100
-        this.showProgress = false
-        const { fileId, fileType, fileUrl, ossFileName } = res.data.data.filesResult
-        this.uploading = false
-        this.fileId = fileId
-        this.fileType = fileType
-        this.fileUrl = fileUrl
-        this.fileName = ossFileName
-      })
-    },
     uploadError (err, file, fileList) {
       this.$message({
         message: "上传出错，请重试！",
@@ -568,7 +542,8 @@ export default {
         return this.$confirm(`确定移除 ${file.name}？`);
       }
     },
-    handleRemove (file, fileList) {
+    handleRemove () {
+      Oss.del(this.fileUrl)
       this.fileUrl = ''
     },
     uploadSure () {
diff --git a/src/views/information/addArticle/index.vue b/src/views/information/addArticle/index.vue
index c740c3b..6fec251 100644
--- a/src/views/information/addArticle/index.vue
+++ b/src/views/information/addArticle/index.vue
@@ -1,211 +1,238 @@
 <template>
-    <div>
-        <el-card shadow="hover" class="m-b-20">
-            <div class="flex-between">
-                <el-page-header @back="goBack" :content="'新增文章'"></el-page-header>
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="flex-between">
+        <el-page-header @back="goBack"
+                        :content="'新增文章'"></el-page-header>
+      </div>
+    </el-card>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-form :model="form"
+               :rules="rules"
+               ref="form"
+               label-width="90px"
+               label-suffix=":"
+               size="small">
+        <el-form-item prop="coverUrl"
+                      label="封面图">
+          <el-upload class="avatar-uploader"
+                     accept=".jpg,.png,.jpeg"
+                     :on-remove="handleRemove"
+                     :on-error="uploadError"
+                     :before-remove="beforeRemove"
+                     :limit="1"
+                     :on-exceed="handleExceed"
+                     action=""
+                     :http-request="handleRequest">
+            <img v-if="form.coverUrl"
+                 :src="form.coverUrl"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
+              <i class="el-icon-plus"></i>
+              <p>上传封面</p>
             </div>
-        </el-card>
-        <el-card shadow="hover" class="m-b-20">
-            <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-suffix=":" size="small">
-                <el-form-item prop="coverUrl" label="封面图">
-                    <el-upload
-                        class="avatar-uploader"
-                        accept=".jpg,.png,.jpeg"
-                        :on-remove="handleRemove"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccess"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="this.api.fileupload"
-                        :headers="headers"
-                        name="file"
-                    >
-                        <img v-if="form.coverUrl" :src="form.coverUrl" class="avatar">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传封面</p>
-                        </div>
-                    </el-upload>
-                </el-form-item>
-                <el-form-item prop="author" label="作者">
-                    <div class="d-inline-block">
-                        <el-input placeholder="请输入作者" v-model="form.author" clearable></el-input>
-                    </div>
-                </el-form-item>
-                <el-form-item prop="date" label="日期">
-                    <div class="d-inline-block">
-                        <el-date-picker v-model="form.date" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
-                    </div>
-                </el-form-item>
-                <el-form-item prop="title" label="文章标题">
-                    <el-input placeholder="请输入文章标题" v-model="form.title" clearable></el-input>
-                </el-form-item>
-                <el-form-item prop="content" label="文章内容">
-                    <quill :border="true" v-model="form.content" :uploading.sync="uploading" :height="400" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="saveData">确定</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-    </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item prop="author"
+                      label="作者">
+          <div class="d-inline-block">
+            <el-input placeholder="请输入作者"
+                      v-model="form.author"
+                      clearable></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item prop="date"
+                      label="日期">
+          <div class="d-inline-block">
+            <el-date-picker v-model="form.date"
+                            type="date"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择日期"></el-date-picker>
+          </div>
+        </el-form-item>
+        <el-form-item prop="title"
+                      label="文章标题">
+          <el-input placeholder="请输入文章标题"
+                    v-model="form.title"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item prop="content"
+                      label="文章内容">
+          <quill :border="true"
+                 v-model="form.content"
+                 :uploading.sync="uploading"
+                 :height="400" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="saveData">确定</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
 </template>
 
 <script>
+import Oss from '@/components/upload/upload.js'
 import quill from "@/components/quill";
 import util from "@/libs/util";
 export default {
-    name: "addarticle",
-    data() {
-        return {
-            headers: {
-                token: sessionStorage.getItem('token')
-            },
-            form: {
-              columnId: +this.$route.query.columnId,
-              sort: +this.$route.query.sort,
-              id: '',
-              coverUrl: '',
-              author: '',
-              date: '',
-              title: '',
-              content: '',
-              createUser: this.$store.state.userName
-            },
-            rules: {
-              coverUrl: [
-                { required: true, message: '请上传封面', trigger: 'change' }
-              ],
-              author: [
-                { required: true, message: '请输入作者', trigger: 'blur' }
-              ],
-              date: [
-                { required: true, message: '请选择日期', trigger: 'change' }
-              ],
-              title: [
-                { required: true, message: '请输入文章标题', trigger: 'blur' }
-              ],
-              content: [
-                { required: true, message: '请输入文章内容', trigger: 'blur' }
-              ],
-            },
-            uploadList: [],
-            uploadDataList: [],
-            submiting: false,
-            uploading: false
-        };
+  name: "addarticle",
+  data () {
+    return {
+      headers: {
+        token: sessionStorage.getItem('token')
+      },
+      form: {
+        columnId: +this.$route.query.columnId,
+        sort: +this.$route.query.sort,
+        id: '',
+        coverUrl: '',
+        author: '',
+        date: '',
+        title: '',
+        content: '',
+        createUser: this.$store.state.userName
+      },
+      rules: {
+        coverUrl: [
+          { required: true, message: '请上传封面', trigger: 'change' }
+        ],
+        author: [
+          { required: true, message: '请输入作者', trigger: 'blur' }
+        ],
+        date: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        title: [
+          { required: true, message: '请输入文章标题', trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: '请输入文章内容', trigger: 'blur' }
+        ],
+      },
+      uploadList: [],
+      uploadDataList: [],
+      submiting: false,
+      uploading: false
+    };
+  },
+  components: {
+    quill
+  },
+  mounted () {
+    this.id = this.$route.query.id;
+    this.id && this.getData();
+  },
+  methods: {
+    // 返回
+    goBack () {
+      this.$router.back();
     },
-    components: {
-        quill
+    getData () {
+      this.$get(`${this.api.getArticle}?articleId=${this.id}`).then(({ article }) => {
+        this.form = article
+      }).catch(err => { })
     },
-    mounted() {
-        this.id = this.$route.query.id;
-        this.id && this.getData();
-    },
-    methods: {
-        // 返回
-        goBack() {
-            this.$router.back();
-        },
-        getData() {
-          this.$get(`${this.api.getArticle}?articleId=${this.id}`).then(({ article }) => {
-            this.form = article
-          }).catch(err => {})
-        },
-        saveData() {
-          this.$refs.form.validate((valid) => {
-            if (valid) {
-              if (this.submiting) return false
-              const { form } = this
-              if (this.uploading) return util.warningMsg("图片正在上传中，请稍等");
-              this.submiting = true
-              if (form.id) {
-                  this.$put(this.api.editArticle, form).then(res => {
-                      this.submiting = false;
-                      util.successMsg("修改成功");
-                      this.back();
-                  })
-                      .catch(err => {
-                          this.submiting = false;
-                      });
-              } else {
-                  this.$post(this.api.addArticle, form).then(res => {
-                      this.submiting = false;
-                      util.successMsg("创建成功");
-                      this.back();
-                  })
-                      .catch(err => {
-                          this.submiting = false;
-                      });
-              }
-            }
-          })
-        },
-        handleCurrentChange(val) {
-            this.currPage = val;
-        },
-        handleExceed(files, fileList) {
-            util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
-        },
-        uploadSuccess(res, file, fileList) {
-            if (this.form.coverUrl) {
-                let fileName = this.coverUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-                this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                }).catch(res => {
-                });
-            }
-            this.form.coverUrl = res.data.filesResult.fileUrl;
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            let fileName = this.form.coverUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-            this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                this.form.coverUrl = "";
-            }).catch(res => {
-            });
-        },
-        uploadSure() {
-            this.BatchUpload = false;
-            this.pageNo = 1;
-            this.keyword = "";
-            this.getData();
-        },
-        back() {
-            this.$router.back();
-        },
-        goback() {
-            this.$confirm("确定返回？未更新的信息将不会保存。", "提示", {
-                type: "warning"
+    saveData () {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.submiting) return false
+          const { form } = this
+          if (this.uploading) return util.warningMsg("图片正在上传中，请稍等");
+          this.submiting = true
+          if (form.id) {
+            this.$put(this.api.editArticle, form).then(res => {
+              this.submiting = false;
+              util.successMsg("修改成功");
+              this.back();
             })
-                .then(() => {
-                    this.back();
-                })
-                .catch(() => {
-                });
-        },
-        addSponsor() {
-            this.sponsorList.push("");
-        },
-        delSponsor(index) {
-            this.sponsorList.splice(index, 1);
-        },
-        addOrganizer() {
-            this.organzinerList.push("");
-        },
-        delOrganizer(index) {
-            this.organzinerList.splice(index, 1);
+              .catch(err => {
+                this.submiting = false;
+              });
+          } else {
+            this.$post(this.api.addArticle, form).then(res => {
+              this.submiting = false;
+              util.successMsg("创建成功");
+              this.back();
+            })
+              .catch(err => {
+                this.submiting = false;
+              });
+          }
         }
+      })
+    },
+    handleCurrentChange (val) {
+      this.currPage = val;
+    },
+    handleExceed (files, fileList) {
+      util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
+    },
+    // 封面自定义上传
+    async handleRequest ({ file }) {
+      Oss.upload(file).then(res => {
+        this.form.coverUrl = res.url
+      })
+    },
+    uploadSuccess (res, file, fileList) {
+      if (this.form.coverUrl) {
+        let fileName = this.coverUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
+        this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
+        }).catch(res => {
+        });
+      }
+      this.form.coverUrl = res.data.filesResult.fileUrl;
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      });
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleRemove (file, fileList) {
+      Oss.del(this.form.coverUrl)
+      this.form.coverUrl = ''
+    },
+    uploadSure () {
+      this.BatchUpload = false;
+      this.pageNo = 1;
+      this.keyword = "";
+      this.getData();
+    },
+    back () {
+      this.$router.back();
+    },
+    goback () {
+      this.$confirm("确定返回？未更新的信息将不会保存。", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.back();
+        })
+        .catch(() => {
+        });
+    },
+    addSponsor () {
+      this.sponsorList.push("");
+    },
+    delSponsor (index) {
+      this.sponsorList.splice(index, 1);
+    },
+    addOrganizer () {
+      this.organzinerList.push("");
+    },
+    delOrganizer (index) {
+      this.organzinerList.splice(index, 1);
     }
+  }
 };
 </script>
 
@@ -221,7 +248,7 @@ $avatar-width: 104px;
         overflow: hidden;
 
         &:hover {
-            border-color: #409EFF;
+            border-color: #409eff;
         }
 
         .uploader-default {
@@ -272,7 +299,8 @@ $avatar-width: 104px;
 /deep/ .d-inline-block {
     width: 216px;
 
-    .el-select, .el-input {
+    .el-select,
+    .el-input {
         width: 100%;
     }
 }
diff --git a/src/views/match/add/step1.vue b/src/views/match/add/step1.vue
index 02cf55e..f43aa50 100644
--- a/src/views/match/add/step1.vue
+++ b/src/views/match/add/step1.vue
@@ -36,7 +36,6 @@
                        accept=".jpg,.png,.jpeg,.gif"
                        :on-remove="handleLgRemove"
                        :on-error="uploadError"
-                       :on-success="uploadLgSuccess"
                        :before-remove="beforeRemove"
                        :limit="1"
                        :on-exceed="handleExceed"
@@ -598,16 +597,6 @@ export default {
         this.form.carouselUrl = res.url
       })
     },
-    uploadSuccess (res) {
-      const { coverUrl } = this.form
-      coverUrl && this.$del(`${this.api.fileDeletion}?keys=${coverUrl}`).then(res => { }).catch(res => { })
-      this.form.coverUrl = res.data.filesResult.fileUrl
-    },
-    uploadLgSuccess (res) {
-      const { carouselUrl } = this.form
-      carouselUrl && this.$del(`${this.api.fileDeletion}?keys=${carouselUrl}`).then(res => { }).catch(res => { })
-      this.form.carouselUrl = res.data.filesResult.fileUrl
-    },
     // 附件上传成功
     uploadAnnexSuccess (file) {
       const { id } = this.form
diff --git a/src/views/match/add/step3.vue b/src/views/match/add/step3.vue
index 34cdfbe..f936c90 100644
--- a/src/views/match/add/step3.vue
+++ b/src/views/match/add/step3.vue
@@ -62,11 +62,11 @@
                   <template v-if="item.competitionStageContentSetting.whetherToUploadFiles">
                     <el-upload :on-remove="(file, fileList) => handleRemove(file, fileList, item)"
                                :on-error="uploadError"
-                               :on-success="res => uploadSuccess(res, item)"
                                :before-remove="beforeRemove"
-                               :action="api.fileUploadNakadai"
+                               action=""
                                :headers="headers"
                                :file-list="item.competitionStageContentSetting.fileList"
+                               :http-request="res => handleRequest(res, item)"
                                name="file">
                       <el-button size="small"
                                  type="primary">上传文件</el-button>
@@ -140,6 +140,7 @@
 </template>
 
 <script>
+import Oss from '@/components/upload/upload.js'
 import util from "@/libs/util";
 import set from './set'
 export default {
@@ -235,11 +236,12 @@ export default {
                 fileList: []
               }
             }
+            form.competitionStageContentSetting.fileList = []
             // 文件路径名称处理
             if (form.competitionStageContentSetting.fileUrl) {
               const urls = form.competitionStageContentSetting.fileUrl.split('|')
               const names = form.competitionStageContentSetting.fileName.split('|')
-              form.competitionStageContentSetting.fileList = []
+
               urls.map((n, i) => {
                 form.competitionStageContentSetting.fileList.push({
                   name: names[i],
@@ -320,14 +322,17 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove (file, fileList, item) {
+      Oss.del(file.url)
       const i = item.competitionStageContentSetting.fileList.findIndex(e => e.url === file.url)
       item.competitionStageContentSetting.fileList.splice(i, 1)
     },
-    uploadSuccess (res, item) {
-      const { originalFileName, fileUrl } = res.filesResult
-      item.competitionStageContentSetting.fileList.push({
-        name: originalFileName,
-        url: fileUrl
+    // 自定义上传
+    async handleRequest ({ file }, item) {
+      Oss.upload(file).then(res => {
+        item.competitionStageContentSetting.fileList.push({
+          name: res.name,
+          url: res.url
+        })
       })
     },
     // 发布赛事
@@ -410,9 +415,14 @@ export default {
       for (const e of form) {
         e.offlineButton = e.offlineButton ? 1 : 0
         e.onlineButton = e.onlineButton ? 1 : 0
-        if (e.competitionStageContentSetting && e.competitionStageContentSetting.fileList && e.competitionStageContentSetting.fileList.length) {
-          e.competitionStageContentSetting.fileName = e.competitionStageContentSetting.fileList.map(n => n.name).join('|')
-          e.competitionStageContentSetting.fileUrl = e.competitionStageContentSetting.fileList.map(n => n.url).join('|')
+        if (e.competitionStageContentSetting) {
+          if (e.competitionStageContentSetting.fileList && e.competitionStageContentSetting.fileList.length) {
+            e.competitionStageContentSetting.fileName = e.competitionStageContentSetting.fileList.map(n => n.name).join('|')
+            e.competitionStageContentSetting.fileUrl = e.competitionStageContentSetting.fileList.map(n => n.url).join('|')
+          } else {
+            e.competitionStageContentSetting.fileName = ''
+            e.competitionStageContentSetting.fileUrl = ''
+          }
         }
       }
       this.$parent.showLoad()
diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue
index f376d40..70aafc1 100644
--- a/src/views/match/manage/matchArchList.vue
+++ b/src/views/match/manage/matchArchList.vue
@@ -190,7 +190,7 @@
                            align="center">
           </el-table-column>
           <el-table-column label="操作"
-                           width="160">
+                           width="200">
             <template slot-scope="scope">
               <el-button v-if="!isCompress(scope.row.fileFormat)"
                          type="text"
@@ -324,6 +324,7 @@ export default {
           keyWord: this.keyword,
         }).then(({ data }) => {
           data.records.forEach(e => {
+            e.loading = false
             e.fileType = '其他'
             if (util.isVideo(e.fileFormat)) {
               e.fileType = '视频'
@@ -557,8 +558,19 @@ export default {
     // 导出文件
     exportFile (item) {
       item.loading = true
-      util.downloadFile(item.userName + '-' + item.fileName, item.filePath)
-      item.loading = false
+      const url = item.filePath
+      var x = new XMLHttpRequest()
+      x.open("GET", url, true)
+      x.responseType = "blob"
+      x.onload = function (e) {
+        var url = window.URL.createObjectURL(x.response)
+        var a = document.createElement("a")
+        a.href = url
+        a.download = item.userName + '-' + item.fileName
+        a.click()
+        item.loading = false
+      }
+      x.send()
     },
   }
 };
diff --git a/src/views/match/manage/matchRank.vue b/src/views/match/manage/matchRank.vue
index 4a2c293..bc8b42e 100644
--- a/src/views/match/manage/matchRank.vue
+++ b/src/views/match/manage/matchRank.vue
@@ -39,18 +39,28 @@
           <el-button v-if="!published"
                      type="primary"
                      @click="cancelPublish(1)">发布排名</el-button>
-          <div v-else>
+          <template v-else>
             <span style="margin-right: 10px">{{ publishTime }}发布排名</span>
             <el-button type="primary"
                        @click="cancelPublish(0)">取消发布</el-button>
-          </div>
+          </template>
+          <el-button v-if="list.length"
+                     type="primary"
+                     :loading="loading"
+                     @click="exportData">{{ loading ? '正在导出' : '批量导出' }}</el-button>
         </div>
       </div>
       <el-table :data="list"
                 class="table"
                 ref="table"
                 stripe
+                row-key="scoreId"
+                @selection-change="handleSelectionChange"
                 header-align="center">
+        <el-table-column type="selection"
+                         width="55"
+                         align="center"
+                         :reserve-selection="true"></el-table-column>
         <el-table-column type="index"
                          width="60"
                          label="排名"
@@ -312,7 +322,9 @@ export default {
           return [`${hour}:${minute}:${second} - 23:59:59`]
         })(),
       },
-      uploaded: 0
+      uploaded: 0,
+      multipleSelection: [],
+      loading: false
     };
   },
   mounted () {
@@ -487,10 +499,32 @@ export default {
     toReport (row) {
       this.$router.push(`/matchReport?reportId=${row.reportId}`)
     },
+    handleSelectionChange (val) { // 多选
+      this.multipleSelection = val;
+    },
     handleCurrentChange (val) { // 切换分页
       this.page = val;
       this.getData();
     },
+    // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
+    exportData () {
+      let { list } = this
+      if (this.multipleSelection.length) {
+        list = this.multipleSelection
+      }
+      this.loading = true
+      list.forEach((e, i) => {
+        e.serialNumber = i + 1
+        if (e.leaderName) e.userName = e.leaderName
+      })
+      axios.post(this.api[this.competitionType ? 'derivedRanking' : 'individualDerivedRanking'], list, {
+        headers: this.headers,
+        responseType: 'blob'
+      }).then((res) => {
+        util.downloadFileDirect(`${this.grades.find(e => e.stageId == this.active).stageName}排名.xls`, new Blob([res.data]))
+        this.loading = false
+      }).catch(res => { })
+    },
     // 发布排名
     publishSubmit () {
       if (this.type) { // 手动发布
diff --git a/src/views/match/manage/noticeDetail.vue b/src/views/match/manage/noticeDetail.vue
index 8c3584c..05e6602 100644
--- a/src/views/match/manage/noticeDetail.vue
+++ b/src/views/match/manage/noticeDetail.vue
@@ -1,174 +1,170 @@
 <template>
-    <!-- 大赛详情 -->
-    <div>
-      <el-card shadow="hover" style="margin-bottom: 20px">
-          <div class="flex-between">
-              <el-page-header @back="back" :content="(form.id ? '编辑' : '创建') + '公告'"></el-page-header>
-          </div>
-      </el-card>
-      <div class="page">
-          <div class="page-content">
-              <el-form label-width="170px" label-suffix=":" size="small">
-                  <el-form-item label="公告标题">
-                      <div class="d-inline-block">
-                          <el-input placeholder="请输入公告名称" v-model="form.announcementTitle" clearable></el-input>
-                      </div>
-                  </el-form-item>
-                  <el-form-item label="正文">
-                      <quill :border="true" v-model="form.announcementText" :height="400" />
-                  </el-form-item>
-                  <el-form-item label="附件">
-                    <el-upload
-                        :on-remove="handleRemove"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccess"
-                        :before-upload="beforeUpload"
-                        :before-remove="beforeRemove"
-                        :limit="5"
-                        :on-exceed="handleExceed"
-                        :action="this.api.fileupload"
-                        :headers="headers"
-                        :file-list="fileList"
-                        name="file"
-                    >
-                      <el-button size="small" type="primary">点击上传</el-button>
-                      <div slot="tip" class="el-upload__tip">
-                        <p>支持扩展名：.rar .zip .doc .docx .pdf .jpg...</p>
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                  <el-form-item>
-                      <el-button v-if="!form.id" @click="save(0)" v-auth="'/match:管理:公告通知:草稿'">草稿</el-button>
-                      <el-button type="primary" @click="save(1)" v-auth="'/match:管理:公告通知:发布'">发布</el-button>
-                      <el-button @click="back">取消</el-button>
-                  </el-form-item>
-              </el-form>
-          </div>
+  <!-- 大赛详情 -->
+  <div>
+    <el-card shadow="hover"
+             style="margin-bottom: 20px">
+      <div class="flex-between">
+        <el-page-header @back="back"
+                        :content="(form.id ? '编辑' : '创建') + '公告'"></el-page-header>
+      </div>
+    </el-card>
+    <div class="page">
+      <div class="page-content">
+        <el-form label-width="170px"
+                 label-suffix=":"
+                 size="small">
+          <el-form-item label="公告标题">
+            <div class="d-inline-block">
+              <el-input placeholder="请输入公告名称"
+                        v-model="form.announcementTitle"
+                        clearable></el-input>
+            </div>
+          </el-form-item>
+          <el-form-item label="正文">
+            <quill :border="true"
+                   v-model="form.announcementText"
+                   :height="400" />
+          </el-form-item>
+          <el-form-item label="附件">
+            <Upload :limit="5"
+                    :file-list="fileList"
+                    :on-remove="handleRemove"
+                    @onSuccess="uploadSuccess" />
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="!form.id"
+                       @click="save(0)"
+                       v-auth="'/match:管理:公告通知:草稿'">草稿</el-button>
+            <el-button type="primary"
+                       @click="save(1)"
+                       v-auth="'/match:管理:公告通知:发布'">发布</el-button>
+            <el-button @click="back">取消</el-button>
+          </el-form-item>
+        </el-form>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
 import quill from "@/components/quill";
 import util from "@/libs/util";
+import Upload from '@/components/upload';
+import Oss from '@/components/upload/upload.js'
 export default {
-    name: "matchDetail",
-    data() {
-        return {
-            headers: {
-                token: sessionStorage.getItem('token')
-            },
-            form: {
-              id: this.$route.query.id,
-              competitionId: this.$route.query.competitionId,
-              announcementText: '',
-              announcementTitle: '',
-              announcementAnnexList: [],
-              isOpen: 1
-            },
-            updateTime: 0,
-            fileName: '',
-            fileList: [],
-        };
+  name: "matchDetail",
+  data () {
+    return {
+      headers: {
+        token: sessionStorage.getItem('token')
+      },
+      form: {
+        id: this.$route.query.id,
+        competitionId: this.$route.query.competitionId,
+        announcementText: '',
+        announcementTitle: '',
+        announcementAnnexList: [],
+        isOpen: 1
+      },
+      updateTime: 0,
+      fileName: '',
+      fileList: [],
+    };
+  },
+  components: {
+    quill,
+    Upload
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler () {
+        this.updateTime++
+        if (this.updateTime > 1) this.$store.commit('match/setWait', 0)
+      },
+      deep: true
     },
-    components: {
-        quill
+  },
+  mounted () {
+    this.form.id && this.getData()
+  },
+  methods: {
+    getData () {
+      this.$post(`${this.api.queryAnnouncementDetails}?id=${this.form.id}`).then(({ data }) => {
+        this.form = data
+        // 附件
+        const fileList = data.announcementAnnexList
+        if (fileList) {
+          const files = []
+          fileList.map(e => {
+            files.push({
+              name: e.fileName,
+              url: e.filePath
+            })
+          })
+          this.fileList = files
+        } else {
+          data.announcementAnnexList = []
+        }
+      }).catch(err => { })
     },
-    watch: {
-        // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-        form: {
-            handler(){
-                this.updateTime++
-                if(this.updateTime > 1) this.$store.commit('match/setWait', 0)
-            },
-            deep:true
-        },
+    // 保存
+    save (status) {
+      const form = this.form
+      if (!form.announcementTitle) return util.warningMsg('请填写公告标题')
+      if (!form.announcementText) return util.warningMsg('请填写正文')
+      form.status = status
+      if (form.id) {
+        form.isOpen = 0
+        delete form.announcementAnnexList
+        this.$post(this.api.amendmentAnnouncement, form).then(res => {
+          util.successMsg("修改成功")
+          this.$router.back()
+        }).catch(err => { })
+      } else {
+        form.isOpen = status ? 0 : 1
+        this.$post(this.api.addAnnouncement, form).then(res => {
+          util.successMsg("创建成功")
+          this.$router.back()
+        }).catch(err => { })
+      }
     },
-    mounted() {
-        this.form.id && this.getData()
+    handleExceed (files, fileList) {
+      util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
     },
-    methods: {
-        getData() {
-          this.$post(`${this.api.queryAnnouncementDetails}?id=${this.form.id}`).then(({ data }) => {
-            this.form = data
-            // 附件
-            const fileList = data.announcementAnnexList
-            if (fileList) {
-              const files = []
-              fileList.map(e => {
-                files.push({
-                  name: e.fileName,
-                  url: e.filePath
-                })
-              })
-              this.fileList = files
-            } else {
-              data.announcementAnnexList = []
-            }
-          }).catch(err => {})
-        },
-        // 保存
-        save(status) {
-            const form = this.form
-            if (!form.announcementTitle) return util.warningMsg('请填写公告标题')
-            if (!form.announcementText) return util.warningMsg('请填写正文')
-            form.status = status
-            if (form.id) {
-                form.isOpen = 0
-                delete form.announcementAnnexList
-                this.$post(this.api.amendmentAnnouncement, form).then(res => {
-                    util.successMsg("修改成功")
-                    this.$router.back()
-                }).catch(err => {})
-            } else {
-              form.isOpen = status ? 0 : 1
-              this.$post(this.api.addAnnouncement, form).then(res => {
-                util.successMsg("创建成功")
-                this.$router.back()
-              }).catch(err => {})
-            }
-        },
-        handleExceed(files, fileList) {
-            util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
-        },
-        // 附件上传成功
-        uploadSuccess(res) {
-          const file = res.data.filesResult
-          const { id } = this.form
-          const data = {
-            announcementId: id || '',
-            fileName: this.fileName,
-            filePath: file.fileUrl || file.fileId
-          }
-          this.form.announcementAnnexList.push(data)
-          // 编辑的时候需要调新增附件接口
-          id && this.$post(this.api.saveAnnouncementAnnex, data).then(res => {}).catch(res => {})
-        },
-        // 附件上传前
-        beforeUpload(file) {
-          this.fileName = file.name
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-          if (file.url) {
-            this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {})
-            const id = this.form.announcementAnnexList.find(e => e.fileName === file.name).id
-            this.$post(`${this.api.delAnnex}?id=${id}`).then(res => {}).catch(res => {})
-          }
-        },
-        back() {
-          this.$router.back()
-        }
+    // 附件上传成功
+    uploadSuccess (file) {
+      const { id } = this.form
+      const data = {
+        announcementId: id || '',
+        fileName: file.name,
+        filePath: file.url
+      }
+      this.form.announcementAnnexList.push(data)
+      // 编辑的时候需要调新增附件接口
+      id && this.$post(this.api.saveAnnouncementAnnex, data).then(res => { }).catch(res => { })
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      });
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleRemove (file, fileList) {
+      if (file.url) {
+        Oss.del(file.url)
+        const id = this.form.announcementAnnexList.find(e => e.fileName === file.name).id
+        this.$post(`${this.api.delAnnex}?id=${id}`).then(res => { }).catch(res => { })
+      }
+    },
+    back () {
+      this.$router.back()
     }
+  }
 };
 </script>
 
@@ -255,7 +251,8 @@ $upload-lg-height: 150px;
 /deep/ .d-inline-block {
     width: 216px;
 
-    .el-select, .el-input {
+    .el-select,
+    .el-input {
         width: 100%;
     }
 }
@@ -275,7 +272,7 @@ $upload-lg-height: 150px;
         .remove {
             width: 16px;
             height: 16px;
-            background: url("../../../assets/img/close.png") 0 0/cover no-repeat;
+            background: url('../../../assets/img/close.png') 0 0 / cover no-repeat;
             cursor: pointer;
         }
     }
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 0f41ea2..29d0517 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -1498,21 +1498,11 @@
                           :offset="4"
                           class="flex-start">
                     <el-form-item label="上传合同">
-                      <el-upload class="contract"
-                                 :headers="{token}"
-                                 :on-remove="handleRemove"
-                                 :on-error="uploadError"
-                                 :on-success="uploadSuccess"
-                                 :before-upload="beforeAvatarUpload"
-                                 :before-remove="beforeRemove"
-                                 :limit="1"
-                                 :on-exceed="handleExceed"
-                                 :action="api.fileupload"
-                                 :file-list="uploadList">
-                        <el-button size="medium"
-                                   type="plain"
-                                   class="uploadTitle">上传</el-button>
-                      </el-upload>
+                      <Upload :on-remove="handleRemove"
+                              :file-list="uploadList"
+                              @onSuccess="uploadSuccess">
+                        <div slot="tip"></div>
+                      </Upload>
                     </el-form-item>
                     <!-- <el-form-item>
                                             <el-button size="medium" type="plain" style="height:40px">重新上传</el-button>
@@ -1702,10 +1692,13 @@
 
 <script>
 import selectClient from "./selectClient.vue";
+import Upload from '@/components/upload';
+import Oss from '@/components/upload/upload.js'
 
 export default {
   components: {
-    selectClient
+    selectClient,
+    Upload
   },
   data () {
     return {
@@ -2979,8 +2972,8 @@ export default {
       return str && size;
     },
     // 上传成功
-    uploadSuccess (res, file, fileList) {
-      this.contract.contractFile = res.data.filesResult.fileUrl;
+    uploadSuccess (file) {
+      this.contract.contractFile = file.url
     },
     // 上传报错
     uploadError (err, file, fileList) {
@@ -3002,8 +2995,9 @@ export default {
       }
     },
     // 删除文件钩子
-    handleRemove (file, fileList) {
-      this.contract.contractFile = "";
+    handleRemove () {
+      Oss.del(this.contract.contractFile)
+      this.contract.contractFile = ''
     },
     configure () {
       this.ipVisible = true;
diff --git a/src/views/parnerOperation/learnMg.vue b/src/views/parnerOperation/learnMg.vue
index 1f81d91..6e1ada6 100644
--- a/src/views/parnerOperation/learnMg.vue
+++ b/src/views/parnerOperation/learnMg.vue
@@ -125,7 +125,7 @@
                      accept=".jpg,.png,.jpeg,.gif"
                      :on-change="changeFile"
                      :show-file-list="false"
-                     :action="this.api.fileupload"
+                     action=""
                      :auto-upload="false">
             <img v-if="form.bannerImg"
                  :src="form.bannerImg"
@@ -581,24 +581,17 @@ export default {
     },
     // 图片裁剪上传事件
     customUpload (data) {
-      const formData = new FormData()
-      formData.append('file', data, this.file.name)
-      this.imgUpload(formData)
+      data.name = this.file.name
+      this.imgUpload(data)
     },
     // 图片上传到服务器
     imgUpload (formData) {
       this.isUpload = true
-      Axios({
-        method: 'post',
-        url: this.api.fileUploadNakadai,
-        data: formData,
-        headers: {
-          'Content-Type': 'multipart/form-data',
-          ...this.headers
-        },
-      }).then(({ data }) => {
-        this.form.bannerImg = data.filesResult.fileUrl
-      }).catch(res => { })
+      Oss.upload(formData).then(res => {
+        this.form.bannerImg && Oss.del(this.form.bannerImg)
+        this.form.bannerImg = res.url
+      })
+
       this.$refs.cropper.isDisabled = false
       this.isUpload = false
       this.cropperModel = false
@@ -631,12 +624,6 @@ export default {
         this.form.fileList = fileList
       }).catch(res => { }) : (this.form.fileList = fileList)
     },
-    // banner上传成功
-    uploadSuccessBanner (res) {
-      let url = this.form.bannerImg
-      url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => { }).catch(e => { })
-      this.form.bannerImg = res.url
-    },
     // 附件上传之前的钩子
     fileBeforeUpload (file) {
       this.uploading++
diff --git a/src/views/parnerOperation/schemeSet.vue b/src/views/parnerOperation/schemeSet.vue
index 2e18eca..e6470ec 100644
--- a/src/views/parnerOperation/schemeSet.vue
+++ b/src/views/parnerOperation/schemeSet.vue
@@ -77,15 +77,10 @@
         </el-form-item>
         <el-form-item prop="schemeFile"
                       label="方案文件">
-          <el-upload :before-upload="fileBeforeUpload"
-                     :on-success="uploadSuccessFile"
-                     :action="this.api.fileUploadNakadai"
-                     :file-list="fileList"
-                     :limit="1"
-                     :on-exceed="handleExceed"
-                     :headers="headers">
-            <el-button>上传</el-button>
-          </el-upload>
+          <Upload :max-size="100000"
+                  :file-list.sync="fileList"
+                  :on-remove="handleRemove"
+                  @onSuccess="uploadSuccessFile" />
         </el-form-item>
       </el-form>
       <div class="btns">
@@ -264,6 +259,8 @@ import Util from '@/libs/util'
 import Editor from '@tinymce/tinymce-vue'
 import editorConfig from '@/utils/editor'
 import Cropper from '@/components/img-upload/Cropper'
+import Upload from '@/components/upload';
+import Oss from '@/components/upload/upload.js'
 import Axios from 'axios'
 export default {
   data () {
@@ -332,7 +329,8 @@ export default {
   },
   components: {
     Editor,
-    Cropper
+    Cropper,
+    Upload
   },
   watch: {
     // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
@@ -556,10 +554,17 @@ export default {
     fileBeforeUpload (file) {
       this.uploading++
     },
+    // 文件删除
+    handleRemove () {
+      Oss.del(this.form.schemeFile)
+      this.fileList = []
+      this.form.fileName = ''
+      this.form.schemeFile = ''
+    },
     // 附件上传成功
-    uploadSuccessFile ({ filesResult }) {
-      this.form.fileName = filesResult.originalFileName
-      this.form.schemeFile = filesResult.fileUrl
+    uploadSuccessFile (file) {
+      this.form.fileName = file.name
+      this.form.schemeFile = file.url
     },
     // 上传文件
     handleExceed (files, fileList) {
diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue
index 0702c0c..9a4c724 100644
--- a/src/views/shop/addProduct/index.vue
+++ b/src/views/shop/addProduct/index.vue
@@ -245,10 +245,9 @@
                           label="封面图">
               <el-upload class="avatar-uploader"
                          accept=".jpg,.png,.jpeg"
-                         :before-remove="beforeCoverRemove"
                          :on-change="file => changeFile(file, 1)"
                          :auto-upload="false"
-                         :action="api.fileupload"
+                         action=""
                          :show-file-list="false"
                          :headers="headers"
                          name="file">
@@ -274,7 +273,7 @@
                          :before-upload="beforeUpload"
                          :on-change="file => changeFile(file, 2)"
                          :auto-upload="false"
-                         :action="api.fileupload"
+                         action=""
                          :headers="headers"
                          :show-file-list="false"
                          name="file">
@@ -294,7 +293,7 @@
                      class="pic">
                   <img :src="item">
                   <i class="el-icon-close close"
-                     @click="form.mall.interfaceDiagrams.splice(i, 1)"></i>
+                     @click="delInterface(item, i)"></i>
                 </div>
               </div>
             </el-form-item>
@@ -307,7 +306,7 @@
                          :auto-upload="false"
                          :limit="1"
                          :on-exceed="handleExceed"
-                         :action="api.fileupload"
+                         action=""
                          :headers="headers"
                          :file-list="appletList"
                          name="file">
@@ -1433,29 +1432,20 @@ export default {
 
     // 图片裁剪上传事件
     customUpload (data) {
-      const formData = new FormData()
-      formData.append('file', data, this.file.name)
-      this.imgUpload(formData)
+      data.name = this.file.name
+      this.imgUpload(data)
     },
     // 图片上传到服务器
     imgUpload (formData) {
       this.isUpload = true
-      Axios({
-        method: 'post',
-        url: this.api.fileUploadNakadai,
-        data: formData,
-        headers: {
-          'Content-Type': 'multipart/form-data',
-          ...this.headers
-        },
-      }).then(({ data }) => {
-        const url = data.filesResult.fileUrl
+      Oss.upload(formData).then(({ url }) => {
         if (this.picType == 2) {
           this.form.mall.interfaceDiagrams.push(url)
         } else {
           this.form.mall[this.picType == 1 ? 'coverDrawing' : 'appletIcon'] = url
         }
-      }).catch(res => { })
+      })
+
       this.$refs.cropper.isDisabled = false
       this.isUpload = false
       this.cropperModel = false
@@ -1491,18 +1481,17 @@ export default {
       Util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
     },
 
-    beforeCoverRemove () {
-      this.form.mall.coverDrawing = ''
+    delInterface (item, i) {
+      Oss.del(item)
+      this.form.mall.interfaceDiagrams.splice(i, 1)
     },
     uploadSuccessMini (res) {
       this.form.mall.appletIcon = res.data.filesResult.fileUrl;
     },
     handleMiniRemove () {
+      Oss.del(this.form.mall.appletIcon)
       this.form.mall.appletIcon = ''
     },
-    uploadSuccessInterface (res) { // 文件上传成功时的钩子
-      this.form.mall.interfaceDiagrams.push(res.data.filesResult.fileUrl)
-    },
     uploadSuccessFile (file) { // 文件上传成功时的钩子
       this.form.mallAnnex.push({
         mallId: this.id,
diff --git a/src/views/shop/list/market/index.vue b/src/views/shop/list/market/index.vue
index 0779dfe..1a935c4 100644
--- a/src/views/shop/list/market/index.vue
+++ b/src/views/shop/list/market/index.vue
@@ -72,7 +72,7 @@
                      accept=".jpg,.png,.jpeg,.gif"
                      :on-change="changeFile"
                      :show-file-list="false"
-                     :action="this.api.fileupload"
+                     action=""
                      :auto-upload="false">
             <img v-if="form.banner"
                  :src="form.banner"
@@ -131,6 +131,7 @@ import Util from "@/libs/util";
 import Setting from '@/setting'
 import Cropper from '@/components/img-upload/Cropper'
 import Axios from 'axios'
+import Oss from '@/components/upload/upload.js'
 export default {
   data () {
     return {
@@ -171,24 +172,16 @@ export default {
     },
     // 图片裁剪上传事件
     customUpload (data) {
-      const formData = new FormData()
-      formData.append('file', data, this.file.name)
-      this.imgUpload(formData)
+      data.name = this.file.name
+      this.imgUpload(data)
     },
     // 图片上传到服务器
     imgUpload (formData) {
       this.isUpload = true
-      Axios({
-        method: 'post',
-        url: this.api.fileUploadNakadai,
-        data: formData,
-        headers: {
-          'Content-Type': 'multipart/form-data',
-          ...this.headers
-        },
-      }).then(({ data }) => {
-        this.form.banner = data.filesResult.fileUrl
-      }).catch(res => { })
+      Oss.upload(formData).then(res => {
+        this.form.banner && Oss.del(this.form.banner)
+        this.form.banner = res.url
+      })
       this.$refs.cropper.isDisabled = false
       this.isUpload = false
       this.cropperModel = false
diff --git a/src/views/system/addLog.vue b/src/views/system/addLog.vue
index 5310b02..6a72c19 100644
--- a/src/views/system/addLog.vue
+++ b/src/views/system/addLog.vue
@@ -1,209 +1,234 @@
 <template>
-    <div class="wrap">
-       <el-card shadow="hover" class="mgb20">
-            <div class="flex-between">
-                <div class="per_title" v-preventReClick @click="$router.back()">
-                    <i class="el-icon-arrow-left"></i>
-                    <span class="per_back">返回</span>
-                    <span class="per_school" v-text="id ? '编辑更新日志' : '新增更新日志'"></span>
-                </div>
-                <div>
-                    <el-button type="primary" round v-preventReClick @click="submit(0)">发布</el-button>
-                    <el-button v-if="draft || !id" type="primary" round v-preventReClick @click="submit(1)">草稿</el-button>
+  <div class="wrap">
+    <el-card shadow="hover"
+             class="mgb20">
+      <div class="flex-between">
+        <div class="per_title"
+             v-preventReClick
+             @click="$router.back()">
+          <i class="el-icon-arrow-left"></i>
+          <span class="per_back">返回</span>
+          <span class="per_school"
+                v-text="id ? '编辑更新日志' : '新增更新日志'"></span>
+        </div>
+        <div>
+          <el-button type="primary"
+                     round
+                     v-preventReClick
+                     @click="submit(0)">发布</el-button>
+          <el-button v-if="draft || !id"
+                     type="primary"
+                     round
+                     v-preventReClick
+                     @click="submit(1)">草稿</el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <el-card class="page"
+             shadow="hover">
+      <el-form class="form"
+               ref="form"
+               label-width="120px"
+               center>
+        <el-form-item class="required"
+                      label="版本标题">
+          <el-input placeholder="请输入版本标题"
+                    v-model="form.versionName"
+                    maxlength="30"
+                    style="width: 400px"
+                    @change="nameChange"></el-input>
+        </el-form-item>
+        <el-form-item label="封面图片">
+          <el-upload class="avatar-uploader"
+                     accept=".jpg,.png,.jpeg"
+                     :on-remove="handleRemove"
+                     :on-error="uploadError"
+                     :before-remove="beforeRemove"
+                     :limit="1"
+                     :on-exceed="handleExceed"
+                     action=""
+                     :http-request="handleRequest">
+            <img v-if="form.coverUrl"
+                 :src="form.coverUrl"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
+              <i class="el-icon-plus"></i>
+              <p>上传封面</p>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item class="required"
+                      label="更新内容">
+          <ul class="contents">
+            <li v-for="(item, i) in form.logContents"
+                :key="i">
+              <div class="action">
+                <el-select v-model="item.type"
+                           size="small"
+                           placeholder="请选择">
+                  <el-option v-for="item in funcList"
+                             :key="item.id"
+                             :label="item.name"
+                             :value="item.id">
+                  </el-option>
+                </el-select>
+                <div class="btns">
+                  <i v-if="i === form.logContents.length - 1"
+                     class="el-icon-circle-plus-outline"
+                     @click="add"></i>
+                  <i class="el-icon-delete"
+                     @click="del(i)"></i>
                 </div>
-            </div>              
-        </el-card>
-        
-        <el-card class="page" shadow="hover">
-            <el-form class="form" ref="form" label-width="120px" center>
-                <el-form-item class="required" label="版本标题">
-                    <el-input placeholder="请输入版本标题" v-model="form.versionName" maxlength="30" style="width: 400px" @change="nameChange"></el-input>
-                </el-form-item>
-                <el-form-item label="封面图片">
-                    <el-upload
-                        class="avatar-uploader"
-                        accept=".jpg,.png,.jpeg"
-                        :on-remove="handleRemove"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccess"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="this.api.fileupload"
-                        :headers="headers"
-                        name="file"
-                    >
-                        <img v-if="form.coverUrl" :src="form.coverUrl" class="avatar">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传封面</p>
-                        </div>
-                    </el-upload>
-                </el-form-item>
-                <el-form-item class="required" label="更新内容">
-                    <ul class="contents">
-                        <li v-for="(item, i) in form.logContents" :key="i">
-                            <div class="action">
-                                <el-select v-model="item.type" size="small" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in funcList"
-                                        :key="item.id"
-                                        :label="item.name"
-                                        :value="item.id">
-                                    </el-option>
-                                </el-select>
-                                <div class="btns">
-                                    <i v-if="i === form.logContents.length - 1" class="el-icon-circle-plus-outline" @click="add"></i>
-                                    <i class="el-icon-delete" @click="del(i)"></i>
-                                </div>
-                            </div>
-                            <el-input
-                                type="textarea"
-                                :rows="5"
-                                placeholder="请输入"
-                                v-model="item.content">
-                            </el-input>
-                        </li>
-                    </ul>
-                </el-form-item>
-            </el-form>
-        </el-card>
-    </div>
+              </div>
+              <el-input type="textarea"
+                        :rows="5"
+                        placeholder="请输入"
+                        v-model="item.content">
+              </el-input>
+            </li>
+          </ul>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
 </template>
 
 <script>
 import Setting from '@/setting'
+import Oss from '@/components/upload/upload.js'
 export default {
-    data() {
-        return {
-            id : this.$route.query.id,
-            platformId: this.$route.query.platformId,
-            draft : this.$route.query.draft === '1',
-            headers: {
-                token: sessionStorage.getItem("token")
-            },
-            funcList: [
-                {
-                    id: 0,
-                    name: '新功能'
-                },
-                {
-                    id: 1,
-                    name: '修复'
-                },
-                {
-                    id: 2,
-                    name: '优化'
-                }
-            ],
-            nameRepeat: false,
-            originName: '',
-            form: {
-                versionName: '',
-                coverUrl: '',
-                logContents: []
-            },
-            originContent: {
-                type: '',
-                content: ''
-            },
-            submiting: false
-        };
-    },
-    mounted() {
-        this.id ? this.getData() : this.form.logContents.push(JSON.parse(JSON.stringify(this.originContent)))
-    },
-    methods: {
-        // 获取详情
-        getData() {
-            this.$get(`${this.api.logGet}?logId=${this.id}`).then(res => {
-                const { log } = res
-                this.form = {
-                  versionName: log.versionName,
-                  coverUrl: log.coverUrl,
-                  logContents: log.logContents.length ? log.logContents : [JSON.parse(JSON.stringify(this.originContent))]
-                }
-                this.originName = log.versionName
-            }).catch(res => {})
-        },
-        // 版本标题判重
-        nameChange(val) {
-          if (this.originName === val) {
-            this.nameRepeat = false
-          } else {
-            this.$get(`${this.api.checkRepeat}?platformId=${this.platformId}&versionName=${val}`).then(res => {
-              this.nameRepeat = false
-            }).catch(res => {
-              this.nameRepeat = true
-            })
-          }
-        },
-        // 新增内容
-        add() {
-            this.form.logContents.push(JSON.parse(JSON.stringify(this.originContent)))
-        },
-        // 删除内容
-        del(i) {
-            this.form.logContents.splice(i, 1)
-        },
-        handleExceed(files, fileList) { // 上传文件
-            util.warningMsg("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！");
+  data () {
+    return {
+      id: this.$route.query.id,
+      platformId: this.$route.query.platformId,
+      draft: this.$route.query.draft === '1',
+      headers: {
+        token: sessionStorage.getItem("token")
+      },
+      funcList: [
+        {
+          id: 0,
+          name: '新功能'
         },
-        uploadSuccess(res, file, fileList) {
-            this.form.coverUrl = res.data.filesResult.fileUrl
+        {
+          id: 1,
+          name: '修复'
         },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            let fileName = this.coverUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-            this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                this.coverUrl = ''
-            }).catch(res => {});
-        },
-        // 保存
-        submit(draft){
-            if (this.submiting) return false
-            const { versionName, logContents } = this.form
-            const id = this.id
-            if (!versionName) return this.$message.error('请输入版本标题')
-            if (this.nameRepeat) return this.$message.error('版本名称已存在！')
-            if (!logContents.length || !logContents.find(e => e.type !== '' && e.content)) return this.$message.error('请输入更新内容')
-            this.submiting = true
-            const data = {
-                platformId: this.platformId,
-                versionName,
-                coverUrl: this.form.coverUrl,
-                logContents,
-                withdraw: 0,
-                open: draft, // 启用禁用，0:启用，1:禁用
-                draft // 状态，0:发布，1:草稿
-            }
-            if (id) {
-                data.logId = id
-                this.$post(this.api.listUpdate, data).then(res => {
-                    this.$message.success('编辑成功')
-                    this.$router.back()
-                }).catch(res => {
-                    this.submiting = false
-                })
-            } else {
-                this.$post(this.api.logAdd, data).then(res => {
-                    this.$message.success('新增成功')
-                    this.$router.back()
-                }).catch(res => {
-                    this.submiting = false
-                })
-            }
-        },
-    }
+        {
+          id: 2,
+          name: '优化'
+        }
+      ],
+      nameRepeat: false,
+      originName: '',
+      form: {
+        versionName: '',
+        coverUrl: '',
+        logContents: []
+      },
+      originContent: {
+        type: '',
+        content: ''
+      },
+      submiting: false
+    };
+  },
+  mounted () {
+    this.id ? this.getData() : this.form.logContents.push(JSON.parse(JSON.stringify(this.originContent)))
+  },
+  methods: {
+    // 获取详情
+    getData () {
+      this.$get(`${this.api.logGet}?logId=${this.id}`).then(res => {
+        const { log } = res
+        this.form = {
+          versionName: log.versionName,
+          coverUrl: log.coverUrl,
+          logContents: log.logContents.length ? log.logContents : [JSON.parse(JSON.stringify(this.originContent))]
+        }
+        this.originName = log.versionName
+      }).catch(res => { })
+    },
+    // 版本标题判重
+    nameChange (val) {
+      if (this.originName === val) {
+        this.nameRepeat = false
+      } else {
+        this.$get(`${this.api.checkRepeat}?platformId=${this.platformId}&versionName=${val}`).then(res => {
+          this.nameRepeat = false
+        }).catch(res => {
+          this.nameRepeat = true
+        })
+      }
+    },
+    // 新增内容
+    add () {
+      this.form.logContents.push(JSON.parse(JSON.stringify(this.originContent)))
+    },
+    // 删除内容
+    del (i) {
+      this.form.logContents.splice(i, 1)
+    },
+    handleExceed (files, fileList) { // 上传文件
+      util.warningMsg("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！");
+    },
+    handleRequest ({ file }) {
+      Oss.upload(file).then(res => {
+        this.form.coverUrl = res.url
+      })
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      });
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleRemove (file, fileList) {
+      Oss.del(this.form.coverUrl)
+      this.form.coverUrl = res.url
+    },
+    // 保存
+    submit (draft) {
+      if (this.submiting) return false
+      const { versionName, logContents } = this.form
+      const id = this.id
+      if (!versionName) return this.$message.error('请输入版本标题')
+      if (this.nameRepeat) return this.$message.error('版本名称已存在！')
+      if (!logContents.length || !logContents.find(e => e.type !== '' && e.content)) return this.$message.error('请输入更新内容')
+      this.submiting = true
+      const data = {
+        platformId: this.platformId,
+        versionName,
+        coverUrl: this.form.coverUrl,
+        logContents,
+        withdraw: 0,
+        open: draft, // 启用禁用，0:启用，1:禁用
+        draft // 状态，0:发布，1:草稿
+      }
+      if (id) {
+        data.logId = id
+        this.$post(this.api.listUpdate, data).then(res => {
+          this.$message.success('编辑成功')
+          this.$router.back()
+        }).catch(res => {
+          this.submiting = false
+        })
+      } else {
+        this.$post(this.api.logAdd, data).then(res => {
+          this.$message.success('新增成功')
+          this.$router.back()
+        }).catch(res => {
+          this.submiting = false
+        })
+      }
+    },
+  }
 };
 </script>
 
@@ -213,12 +238,12 @@ export default {
     justify-content: center;
     min-height: calc(100vh - 310px);
     /deep/.required {
-      label:before {
-        content: '*';
-        margin-right: 5px;
-        vertical-align: middle;
-        color: #f00;
-      }
+        label:before {
+            content: '*';
+            margin-right: 5px;
+            vertical-align: middle;
+            color: #f00;
+        }
     }
 }
 $avatar-width: 104px;
@@ -233,7 +258,7 @@ $avatar-width: 104px;
         overflow: hidden;
 
         &:hover {
-            border-color: #409EFF;
+            border-color: #409eff;
         }
 
         .uploader-default {
@@ -296,10 +321,10 @@ $avatar-width: 104px;
     .btns {
         i {
             margin-left: 10px;
-            color: #9076FF;
+            color: #9076ff;
             cursor: pointer;
             &:hover {
-                opacity: .9;
+                opacity: 0.9;
             }
         }
     }
diff --git a/src/views/theoreticalCourse/add/index.vue b/src/views/theoreticalCourse/add/index.vue
index b813185..ce2bb0e 100644
--- a/src/views/theoreticalCourse/add/index.vue
+++ b/src/views/theoreticalCourse/add/index.vue
@@ -1,504 +1,549 @@
 <template>
-    <div>
-        <el-card shadow="hover" class="m-b-20">
-            <div class="flex-between">
-                <el-page-header @back="back" :content="form.id ? '编辑课程' : '新增课程'"></el-page-header>
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="flex-between">
+        <el-page-header @back="back"
+                        :content="form.id ? '编辑课程' : '新增课程'"></el-page-header>
+      </div>
+    </el-card>
+
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-form :model="form"
+               :rules="rules"
+               ref="form"
+               :disabled="isDetail"
+               label-width="100px"
+               label-suffix=":">
+        <el-form-item prop="courseName"
+                      label="课程名称">
+          <div class="d-inline-block">
+            <el-input placeholder="请输入课程名称"
+                      v-model="form.courseName"
+                      clearable
+                      maxlength="25"
+                      @change="nameChange"></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item prop="platformClassificationIds"
+                      label="课程分类">
+          <div class="d-inline-block">
+            <el-select v-model="form.platformClassificationIds"
+                       placeholder="请选择课程分类"
+                       multiple>
+              <el-option v-for="item in classificationList"
+                         :key="item.id"
+                         :label="item.classificationName"
+                         :value="item.id"></el-option>
+            </el-select>
+          </div>
+        </el-form-item>
+        <el-form-item prop="coverUrl"
+                      label="课程封面">
+          <el-upload class="avatar-uploader"
+                     accept=".jpg,.png,.jpeg"
+                     :on-remove="handleRemove"
+                     :on-error="uploadError"
+                     :before-remove="beforeRemove"
+                     :limit="1"
+                     :on-exceed="handleExceed"
+                     action=""
+                     :http-request="handleRequest">
+            <img v-if="form.coverUrl"
+                 :src="form.coverUrl"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
+              <i class="el-icon-plus"></i>
+              <p>上传封面</p>
             </div>
-        </el-card>
 
-        <el-card shadow="hover" class="m-b-20">
-            <el-form :model="form" :rules="rules" ref="form" :disabled="isDetail" label-width="100px" label-suffix=":">
-                <el-form-item prop="courseName" label="课程名称">
-                    <div class="d-inline-block">
-                        <el-input placeholder="请输入课程名称" v-model="form.courseName" clearable maxlength="25" @change="nameChange"></el-input>
-                    </div>
-                </el-form-item>
-                <el-form-item prop="platformClassificationIds" label="课程分类">
-                    <div class="d-inline-block">
-                        <el-select v-model="form.platformClassificationIds" placeholder="请选择课程分类" multiple>
-                            <el-option v-for="item in classificationList" :key="item.id" :label="item.classificationName" :value="item.id"></el-option>
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item prop="coverUrl" label="课程封面">
-                    <el-upload
-                        class="avatar-uploader"
-                        accept=".jpg,.png,.jpeg"
-                        :on-remove="handleRemove"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccess"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="this.api.fileupload"
-                        :headers="headers"
-                        name="file"
-                    >
-                        <img v-if="form.coverUrl" :src="form.coverUrl" class="avatar">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传封面</p>
-                        </div>
+            <div slot="tip"
+                 class="el-upload__tip">
+              <p>只能上传jpg/png文件</p>
+              <p>课程封面图将按2:1显示，最佳分辨率1400*700</p>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item prop="courseType"
+                      label="课程类型">
+          <div class="d-inline-block">
+            <el-select v-model="form.courseType"
+                       placeholder="请选择课程类型">
+              <el-option label="免费"
+                         :value="0"></el-option>
+              <el-option label="付费"
+                         :value="1"></el-option>
+            </el-select>
+          </div>
+        </el-form-item>
+        <el-form-item prop="visibleRange"
+                      label="可见范围">
+          <div>
+            <el-radio v-model="form.visibleRange"
+                      :label="0"
+                      disabled>仅本校</el-radio>
+          </div>
+          <div>
+            <el-radio v-model="form.visibleRange"
+                      :label="1">全平台</el-radio>
+          </div>
+          <div>
+            <el-radio v-model="form.visibleRange"
+                      :label="2">指定区域、院校</el-radio>
+            <el-button v-if="form.visibleRange === 2"
+                       type="primary"
+                       size="mini"
+                       @click="showRange">选择院校</el-button>
+            <span style="margin-left: 20px">{{ rangeName }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="courseIntroduction"
+                      label="课程介绍">
+          <quill :border="true"
+                 :readonly="isDetail"
+                 v-model="form.courseIntroduction"
+                 :height="400" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="save"
+                     v-show="!isDetail">{{ form.id ? "更新" : "创建" }}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-                        <div slot="tip" class="el-upload__tip">
-                            <p>只能上传jpg/png文件</p>
-                            <p>课程封面图将按2:1显示，最佳分辨率1400*700</p>
-                        </div>
-                    </el-upload>
-                </el-form-item>
-                <el-form-item prop="courseType" label="课程类型">
-                    <div class="d-inline-block">
-                        <el-select v-model="form.courseType" placeholder="请选择课程类型">
-                            <el-option label="免费" :value="0"></el-option>
-                            <el-option label="付费" :value="1"></el-option>
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item prop="visibleRange" label="可见范围">
-                  <div>
-                    <el-radio v-model="form.visibleRange" :label="0" disabled>仅本校</el-radio>
-                  </div>
-                  <div>
-                    <el-radio v-model="form.visibleRange" :label="1">全平台</el-radio>
-                  </div>
-                  <div>
-                    <el-radio v-model="form.visibleRange" :label="2">指定区域、院校</el-radio>
-                    <el-button v-if="form.visibleRange === 2" type="primary" size="mini" @click="showRange">选择院校</el-button>
-                    <span style="margin-left: 20px">{{ rangeName }}</span>
-                  </div>
-                </el-form-item>
-                <el-form-item prop="courseIntroduction" label="课程介绍">
-                    <quill :border="true" :readonly="isDetail" v-model="form.courseIntroduction" :height="400" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="save" v-show="!isDetail">{{ form.id ? "更新" : "创建" }}</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        
-        <el-dialog title="请勾选院校" :visible.sync="rangeVisible" width="580px" custom-class="range-dia" :close-on-click-modal="false">
-          <div class="range-wrap">
-            <el-cascader
-              ref="range"
-              class="range-cas"
-              key="range"
-              v-model="range"
-              :props="props"
-              :show-all-levels="false"
-              clearable
-              filterable
-              :before-filter="beforeFilter"
-              :options="rangeList"
-              @change="rangeChange"
-              @visible-change="rangeViChange"
-              @input.native="rangeSearch"></el-cascader>
-              <el-tag
-                v-for="(tag, i) in rangeChecked"
+    <el-dialog title="请勾选院校"
+               :visible.sync="rangeVisible"
+               width="580px"
+               custom-class="range-dia"
+               :close-on-click-modal="false">
+      <div class="range-wrap">
+        <el-cascader ref="range"
+                     class="range-cas"
+                     key="range"
+                     v-model="range"
+                     :props="props"
+                     :show-all-levels="false"
+                     clearable
+                     filterable
+                     :before-filter="beforeFilter"
+                     :options="rangeList"
+                     @change="rangeChange"
+                     @visible-change="rangeViChange"
+                     @input.native="rangeSearch"></el-cascader>
+        <el-tag v-for="(tag, i) in rangeChecked"
                 :key="tag.value"
                 class="range-check"
                 closable
                 :disable-transitions="false"
                 @close="val => closeRange(i)">
-                {{tag.label}}
-              </el-tag>
-          </div>
-          
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" @click="rangeVisible = false">取 消</el-button>
-            <el-button size="small" type="primary" @click="rangeSubmit">确 定</el-button>
-          </span>
-        </el-dialog>
-    </div>
+          {{tag.label}}
+        </el-tag>
+      </div>
+
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   @click="rangeVisible = false">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="rangeSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 import Setting from "@/setting";
 import quill from "@/components/quill";
+import Oss from '@/components/upload/upload.js'
 
 export default {
-    name: "courseAddEdit",
-    data() {
-        const that = this
-        return {
-            headers: {
-                token: sessionStorage.getItem("token")
-            },
-            isDetail: Boolean(this.$route.query.show),
-            form: {
-              id: this.$route.query.id,
-              courseIntroduction: '',
-              courseName: '',
-              courseType: 0,
-              coverUrl: '',
-              platformSource: Setting.platformSource,
-              platformClassificationIds: [],
-              schoolClassificationsIds: [],
-              visibleRange: 1
-            },
-            rules: {
-              courseName: [
-                { required: true, message: '请输入课程名称', trigger: 'blur' }
-              ],
-              platformClassificationIds: [
-                { required: true, message: '请选择课程分类', trigger: 'change' }
-              ],
-              coverUrl: [
-                { required: true, message: '请选择课程封面', trigger: 'change' }
-              ],
-              courseType: [
-                { required: true, message: '请选择课程类型', trigger: 'change' }
-              ],
-              visibleRange: [
-                { required: true, message: '请选择可见范围', trigger: 'change' }
-              ],
-              courseIntroduction: [
-                { required: true, message: '请输入课程介绍', trigger: 'blur' }
-              ]
-            },
-            classificationList: [],
-            uploadList: [],
-            submiting: false,
-            updateTime: 0,
-            
-            rangeVisible: false,
-            range: [],
-            rangeInit: [],
-            rangeName: '',
-            rangeChecked: [],
-            schools: [],
-            rangeList: [],
-            rangeTimer: null,
-            // 选择区域懒加载
-            props: {
-              multiple: true,
-              checkStrictly: true,
-              lazy: true,
-              lazyLoad (node, resolve) {
-                // 如果是在模糊搜索中，则不再用懒加载请求数据
-                const input = document.querySelector('.el-cascader__search-input')
-                const checked = that.rangeChecked
-                
-                if (input && input.value.trim()) {
-                  const val = input.value.trim()
-                  return that.schools.filter(e => e.label.includes(val))
-                }
-                
-                const { level, value } = node
-                // 省份
-                if (!level) {
-                  that.$get(that.api.queryProvince).then(({ list }) => {
-                    const data = []
-                    list.map(e => {
-                      e.value = e.provinceId
-                      e.label = e.provinceName
-                      e.children = []
-                      e.disabled = !!checked.find(n => n.provinceId == e.provinceId && !n.cityId)
-                      data.push(e)
-                    })
-                    resolve(data)
-                  }).catch(res => {})
-                } else if (level === 1) {
-                  // 城市
-                  that.$get(that.api.queryCity, {
-                    provinceId: value
-                  }).then(({ list }) => {
-                    const data = []
-                    list.map(e => {
-                      e.value = e.cityId
-                      e.label = e.cityName
-                      e.children = []
-                      e.disabled = !!checked.find(n => n.cityId == e.cityId && n.provinceId == e.provinceId && !n.schoolId)
-                      data.push(e)
-                    })
-                    resolve(data)
-                  }).catch(res => {})
-                } else if (level === 2) {
-                  // 学校
-                  that.$get(that.api.getSchoolsByProvince, {
-                    provinceId: node.data.provinceId,
-                    cityId: value,
-                    schoolName: ''
-                  }).then(({ list }) => {
-                    const data = []
-                    list.map(e => {
-                      e.value = e.schoolId
-                      e.label = e.schoolName
-                      e.leaf = true
-                      e.disabled = !!checked.find(n => n.schoolId == e.schoolId && n.cityId == e.cityId && n.provinceId == e.provinceId)
-                      data.push(e)
-                    })
-                    resolve(data)
-                  }).catch(res => {})
-                } else {
-                  resolve([])
-                }
-              }
-            },
-            nameRepeat: false
-        };
-    },
-    watch: {
-      // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+  name: "courseAddEdit",
+  data () {
+    const that = this
+    return {
+      headers: {
+        token: sessionStorage.getItem("token")
+      },
+      isDetail: Boolean(this.$route.query.show),
       form: {
-        handler(val){
-          this.updateTime++
-        },
-        deep:true
-      }
-    },
-    mounted() {
-      this.getClassification();
-      this.form.id && this.getData();
-      this.getSchool()
-    },
-    components: {
-        quill
-    },
-    methods: {
-      getClassification() {
-        this.$post(this.api.listClassification, {
-          pageNum: 1,
-          pageSize: 1000,
-          platformSource: Setting.platformSource
-        }).then(({ page }) => {
-            this.classificationList = page.records
-        }).catch(res => {})
+        id: this.$route.query.id,
+        courseIntroduction: '',
+        courseName: '',
+        courseType: 0,
+        coverUrl: '',
+        platformSource: Setting.platformSource,
+        platformClassificationIds: [],
+        schoolClassificationsIds: [],
+        visibleRange: 1
       },
-      getData() {
-          this.$post(`${this.api.findTheoreticalCourse}?id=${this.form.id}`).then(({ data }) => {
-            // 分类id处理
-            if (data.platformClassificationList) {
-              data.platformClassificationIds = data.platformClassificationList.map(e => e.classificationId)
-              delete data.platformClassificationList
-            }
-            this.form = data
+      rules: {
+        courseName: [
+          { required: true, message: '请输入课程名称', trigger: 'blur' }
+        ],
+        platformClassificationIds: [
+          { required: true, message: '请选择课程分类', trigger: 'change' }
+        ],
+        coverUrl: [
+          { required: true, message: '请选择课程封面', trigger: 'change' }
+        ],
+        courseType: [
+          { required: true, message: '请选择课程类型', trigger: 'change' }
+        ],
+        visibleRange: [
+          { required: true, message: '请选择可见范围', trigger: 'change' }
+        ],
+        courseIntroduction: [
+          { required: true, message: '请输入课程介绍', trigger: 'blur' }
+        ]
+      },
+      classificationList: [],
+      uploadList: [],
+      submiting: false,
+      updateTime: 0,
 
-            // 选择范围name
-            const rangeName = data.courseRangeList
-            if (rangeName) {
-              const range = []
-              const rangeChecked = []
-              rangeName.map(e => {
-                const name = e.type ? (e.cityName || e.provinceName) : e.schoolName
-                range.push(name)
-                rangeChecked.push({
-                  value: e.type ? (e.cityId || e.provinceId) : e.schoolId,
-                  label: name,
-                  cityId: e.cityId,
-                  provinceId: e.provinceId,
-                  schoolId: e.schoolId,
-                })
-              })
-              this.rangeName = range.join('，')
+      rangeVisible: false,
+      range: [],
+      rangeInit: [],
+      rangeName: '',
+      rangeChecked: [],
+      schools: [],
+      rangeList: [],
+      rangeTimer: null,
+      // 选择区域懒加载
+      props: {
+        multiple: true,
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad (node, resolve) {
+          // 如果是在模糊搜索中，则不再用懒加载请求数据
+          const input = document.querySelector('.el-cascader__search-input')
+          const checked = that.rangeChecked
 
-              this.rangeChecked = rangeChecked
-            }
+          if (input && input.value.trim()) {
+            const val = input.value.trim()
+            return that.schools.filter(e => e.label.includes(val))
+          }
 
-            this.uploadList.push({
-                name: "cover.jpg",
-                url: data.coverUrl
-            })
-          }).catch(err => {})
-      },
-      // 选择范围
-      showRange() {
-        this.rangeVisible = true
-      },
-      // 范围勾选回调
-      rangeChange(val, e) {
-        const checked = this.$refs.range.getCheckedNodes()
-        const name = []
-        const { rangeChecked } = this
-        checked.map(e => {
-          rangeChecked.find(n => n.value === e.value && n.label == e.label) || name.push(e.data) // 未勾选的，则push
-        })
-        this.rangeChecked.push(...name)
-        console.log("🚀 ~ file: index.vue:306 ~ rangeChange ~ this.rangeChecked", this.rangeChecked)
-      },
-      // 范围展开收缩回调
-      rangeViChange(e) {
-        // 展开的时候清空搜索结果
-        if (e) {
-          this.rangeList = []
+          const { level, value } = node
+          // 省份
+          if (!level) {
+            that.$get(that.api.queryProvince).then(({ list }) => {
+              const data = []
+              list.map(e => {
+                e.value = e.provinceId
+                e.label = e.provinceName
+                e.children = []
+                e.disabled = !!checked.find(n => n.provinceId == e.provinceId && !n.cityId)
+                data.push(e)
+              })
+              resolve(data)
+            }).catch(res => { })
+          } else if (level === 1) {
+            // 城市
+            that.$get(that.api.queryCity, {
+              provinceId: value
+            }).then(({ list }) => {
+              const data = []
+              list.map(e => {
+                e.value = e.cityId
+                e.label = e.cityName
+                e.children = []
+                e.disabled = !!checked.find(n => n.cityId == e.cityId && n.provinceId == e.provinceId && !n.schoolId)
+                data.push(e)
+              })
+              resolve(data)
+            }).catch(res => { })
+          } else if (level === 2) {
+            // 学校
+            that.$get(that.api.getSchoolsByProvince, {
+              provinceId: node.data.provinceId,
+              cityId: value,
+              schoolName: ''
+            }).then(({ list }) => {
+              const data = []
+              list.map(e => {
+                e.value = e.schoolId
+                e.label = e.schoolName
+                e.leaf = true
+                e.disabled = !!checked.find(n => n.schoolId == e.schoolId && n.cityId == e.cityId && n.provinceId == e.provinceId)
+                data.push(e)
+              })
+              resolve(data)
+            }).catch(res => { })
+          } else {
+            resolve([])
+          }
         }
       },
-      // 获取学校列表
-      getSchool() {
-        this.$get(this.api.querySchoolData).then(({ list }) => {
-          const result = []
-          list.map(e => {
-            e.value = e.schoolId
-            e.label = e.schoolName
-            e.leaf = true
-            result.push(e)
-          })
-          this.schools = result
-        }).catch(res => {})
-      },
-      // 范围模糊查询前置钩子
-      beforeFilter() {
-        return false
+      nameRepeat: false
+    };
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler (val) {
+        this.updateTime++
       },
-      // 范围筛选
-      rangeSearch(el) {
-        const val = el.target.value.trim()
-        const checked = this.rangeChecked
-        if (!val) {
-          this.rangeList = []
-          return false
+      deep: true
+    }
+  },
+  mounted () {
+    this.getClassification();
+    this.form.id && this.getData();
+    this.getSchool()
+  },
+  components: {
+    quill
+  },
+  methods: {
+    getClassification () {
+      this.$post(this.api.listClassification, {
+        pageNum: 1,
+        pageSize: 1000,
+        platformSource: Setting.platformSource
+      }).then(({ page }) => {
+        this.classificationList = page.records
+      }).catch(res => { })
+    },
+    getData () {
+      this.$post(`${this.api.findTheoreticalCourse}?id=${this.form.id}`).then(({ data }) => {
+        // 分类id处理
+        if (data.platformClassificationList) {
+          data.platformClassificationIds = data.platformClassificationList.map(e => e.classificationId)
+          delete data.platformClassificationList
         }
-        clearTimeout(this.rangeTimer)
-        this.rangeTimer = setTimeout(() => {
-          let result = this.schools.filter(e => {
-            if (e.label.includes(val)) {
-              e.disabled = !!checked.find(n => n.schoolId == e.schoolId)
-              return e
-            }
-          }) // 用学校列表做比对
-          this.rangeList = result
-        }, 100)
-      },
-      closeRange(i) {
-        this.rangeChecked.splice(i, 1)
-      },
-      // 范围确定
-      rangeSubmit() {
-        // 处理提交需要的id
-        const data = []
-        const checked = this.rangeChecked
-        const promises = []
-        checked.map(e => {
-          if (e.cityId && !e.schoolId) {
-            promises.push(new Promise((resolve, reject) => {
-              this.$get(this.api.getSchoolsByProvince, {
-                provinceId: e.provinceId,
-                cityId: e.cityId,
-                schoolName: ''
-              }).then(({ list }) => {
-                list.map(e => {
-                  data.push({
-                    provinceId: e.provinceId || '',
-                    cityId: e.cityId || '',
-                    schoolId: e.schoolId || '',
-                    type: e.schoolId ? 0 : 1
-                  })
-                })
-                resolve()
-              }).catch(res => {})
-            }))
-          } else {
-            data.push({
-              provinceId: e.provinceId || '',
-              cityId: e.cityId || '',
-              schoolId: e.schoolId || '',
-              type: e.schoolId ? 0 : 1
+        this.form = data
+
+        // 选择范围name
+        const rangeName = data.courseRangeList
+        if (rangeName) {
+          const range = []
+          const rangeChecked = []
+          rangeName.map(e => {
+            const name = e.type ? (e.cityName || e.provinceName) : e.schoolName
+            range.push(name)
+            rangeChecked.push({
+              value: e.type ? (e.cityId || e.provinceId) : e.schoolId,
+              label: name,
+              cityId: e.cityId,
+              provinceId: e.provinceId,
+              schoolId: e.schoolId,
             })
-          }
-        })
-        Promise.all(promises).then(_ => {
-          this.form.courseRangeList = data
-          console.log("🚀 ~ file: index.vue ~ line 343 ~ rangeSubmit ~ data", data)
-          // 处理显示的name
-          const name = []
-          checked.map(e => {
-            name.push(e.label)
           })
-          this.rangeName = name.join('、')
+          this.rangeName = range.join('，')
+
+          this.rangeChecked = rangeChecked
+        }
 
-          this.rangeVisible = false
+        this.uploadList.push({
+          name: "cover.jpg",
+          url: data.coverUrl
         })
-      },
-      // 名称判重
-      nameChange(val) {
-        this.$post(this.api.checkRepeatTheoreticalCourse, {
-          id: this.form.id,
-          courseName: val,
-          platformSource: this.form.platformSource
-        }).then(res => {
-          this.nameRepeat = false
-        }).catch(err => {
-          this.nameRepeat = true
+      }).catch(err => { })
+    },
+    // 选择范围
+    showRange () {
+      this.rangeVisible = true
+    },
+    // 范围勾选回调
+    rangeChange (val, e) {
+      const checked = this.$refs.range.getCheckedNodes()
+      const name = []
+      const { rangeChecked } = this
+      checked.map(e => {
+        rangeChecked.find(n => n.value === e.value && n.label == e.label) || name.push(e.data) // 未勾选的，则push
+      })
+      this.rangeChecked.push(...name)
+      console.log("🚀 ~ file: index.vue:306 ~ rangeChange ~ this.rangeChecked", this.rangeChecked)
+    },
+    // 范围展开收缩回调
+    rangeViChange (e) {
+      // 展开的时候清空搜索结果
+      if (e) {
+        this.rangeList = []
+      }
+    },
+    // 获取学校列表
+    getSchool () {
+      this.$get(this.api.querySchoolData).then(({ list }) => {
+        const result = []
+        list.map(e => {
+          e.value = e.schoolId
+          e.label = e.schoolName
+          e.leaf = true
+          result.push(e)
         })
-      },
-      handleExceed(files, fileList) { // 上传文件
-          util.warningMsg("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！");
-      },
-      uploadSuccess(res, file, fileList) {
-          this.form.coverUrl = res.data.filesResult.fileUrl
-      },
-      uploadError(err, file, fileList) {
-          this.$message({
-              message: "上传出错，请重试！",
-              type: "error",
-              center: true
-          });
-      },
-      beforeRemove(file, fileList) {
-          return this.$confirm(`确定移除 ${file.name}？`);
-      },
-      handleRemove(file, fileList) {
-          let fileName = this.form.coverUrl.replace('https://huoran.oss-cn-shenzhen.aliyuncs.com/', "");
-          this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-              this.form.coverUrl = ''
-          }).catch(res => {});
-      },
-      save() {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            if (this.nameRepeat) return util.errorMsg('当前课程名已存在!')
-            if (this.submiting) return false
-            const { form } = this
-            this.submiting = true
-            if (form.id) {
-                form.courseId = form.id
-                this.$post(this.api.updateTheoreticalCourse, form).then(res => {
-                    this.submiting = false;
-                    util.successMsg("修改成功");
-                    this.$router.back();
-                }).catch(err => {
-                    this.submiting = false;
-                });
-            } else {
-                this.$post(this.api.saveTheoreticalCourse, form).then(({ courseId }) => {
-                    this.submiting = false;
-                    this.$confirm("课程创建成功，是否马上进行课程内容设置？", "提示", {
-                        type: "success",
-                        confirmButtonText: "马上设置",
-                        cancelButtonText: "稍后操作"
-                    }).then(() => {
-                        this.$router.replace(`/setTheoreticalCourse?id=${courseId}`);
-                    }).catch(() => {
-                        this.$router.back();
-                    });
-                }).catch(err => {
-                    this.submiting = false;
-                });
-            }
+        this.schools = result
+      }).catch(res => { })
+    },
+    // 范围模糊查询前置钩子
+    beforeFilter () {
+      return false
+    },
+    // 范围筛选
+    rangeSearch (el) {
+      const val = el.target.value.trim()
+      const checked = this.rangeChecked
+      if (!val) {
+        this.rangeList = []
+        return false
+      }
+      clearTimeout(this.rangeTimer)
+      this.rangeTimer = setTimeout(() => {
+        let result = this.schools.filter(e => {
+          if (e.label.includes(val)) {
+            e.disabled = !!checked.find(n => n.schoolId == e.schoolId)
+            return e
           }
-        })
-      },
-      // 返回上一页
-      backPage() {
-        this.$router.back()
-      },
-      back() {
-        const { id } = this.form
-        const updateTime = this.updateTime
-        // 更改了信息才需要提示
-        if ((id && updateTime > 2) || (!id && updateTime)) {
-          this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.save()
-          }).catch(() => {
-            this.backPage()
-          })
+        }) // 用学校列表做比对
+        this.rangeList = result
+      }, 100)
+    },
+    closeRange (i) {
+      this.rangeChecked.splice(i, 1)
+    },
+    // 范围确定
+    rangeSubmit () {
+      // 处理提交需要的id
+      const data = []
+      const checked = this.rangeChecked
+      const promises = []
+      checked.map(e => {
+        if (e.cityId && !e.schoolId) {
+          promises.push(new Promise((resolve, reject) => {
+            this.$get(this.api.getSchoolsByProvince, {
+              provinceId: e.provinceId,
+              cityId: e.cityId,
+              schoolName: ''
+            }).then(({ list }) => {
+              list.map(e => {
+                data.push({
+                  provinceId: e.provinceId || '',
+                  cityId: e.cityId || '',
+                  schoolId: e.schoolId || '',
+                  type: e.schoolId ? 0 : 1
+                })
+              })
+              resolve()
+            }).catch(res => { })
+          }))
         } else {
-          this.backPage()
+          data.push({
+            provinceId: e.provinceId || '',
+            cityId: e.cityId || '',
+            schoolId: e.schoolId || '',
+            type: e.schoolId ? 0 : 1
+          })
+        }
+      })
+      Promise.all(promises).then(_ => {
+        this.form.courseRangeList = data
+        console.log("🚀 ~ file: index.vue ~ line 343 ~ rangeSubmit ~ data", data)
+        // 处理显示的name
+        const name = []
+        checked.map(e => {
+          name.push(e.label)
+        })
+        this.rangeName = name.join('、')
+
+        this.rangeVisible = false
+      })
+    },
+    // 名称判重
+    nameChange (val) {
+      this.$post(this.api.checkRepeatTheoreticalCourse, {
+        id: this.form.id,
+        courseName: val,
+        platformSource: this.form.platformSource
+      }).then(res => {
+        this.nameRepeat = false
+      }).catch(err => {
+        this.nameRepeat = true
+      })
+    },
+    handleExceed (files, fileList) { // 上传文件
+      util.warningMsg("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！");
+    },
+    handleRequest ({ file }) {
+      Oss.upload(file).then(res => {
+        this.form.coverUrl = res.url
+      })
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      });
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleRemove () {
+      Oss.del(this.form.coverUrl)
+      this.form.coverUrl = ''
+    },
+    save () {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.nameRepeat) return util.errorMsg('当前课程名已存在!')
+          if (this.submiting) return false
+          const { form } = this
+          this.submiting = true
+          if (form.id) {
+            form.courseId = form.id
+            this.$post(this.api.updateTheoreticalCourse, form).then(res => {
+              this.submiting = false;
+              util.successMsg("修改成功");
+              this.$router.back();
+            }).catch(err => {
+              this.submiting = false;
+            });
+          } else {
+            this.$post(this.api.saveTheoreticalCourse, form).then(({ courseId }) => {
+              this.submiting = false;
+              this.$confirm("课程创建成功，是否马上进行课程内容设置？", "提示", {
+                type: "success",
+                confirmButtonText: "马上设置",
+                cancelButtonText: "稍后操作"
+              }).then(() => {
+                this.$router.replace(`/setTheoreticalCourse?id=${courseId}`);
+              }).catch(() => {
+                this.$router.back();
+              });
+            }).catch(err => {
+              this.submiting = false;
+            });
+          }
         }
+      })
+    },
+    // 返回上一页
+    backPage () {
+      this.$router.back()
+    },
+    back () {
+      const { id } = this.form
+      const updateTime = this.updateTime
+      // 更改了信息才需要提示
+      if ((id && updateTime > 2) || (!id && updateTime)) {
+        this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.save()
+        }).catch(() => {
+          this.backPage()
+        })
+      } else {
+        this.backPage()
       }
     }
+  }
 };
 </script>
 
@@ -514,7 +559,7 @@ $avatar-width: 104px;
         overflow: hidden;
 
         &:hover {
-            border-color: #409EFF;
+            border-color: #409eff;
         }
 
         .uploader-default {
@@ -565,17 +610,18 @@ $avatar-width: 104px;
 /deep/ .d-inline-block {
     width: 216px;
 
-    .el-select, .el-input {
+    .el-select,
+    .el-input {
         width: 100%;
     }
 }
 .range-check {
-  display: inline-block;
-  margin: 0 0 10px 10px;
+    display: inline-block;
+    margin: 0 0 10px 10px;
 }
 /deep/.range-cas {
-  .el-tag {
-    display: none;
-  }
+    .el-tag {
+        display: none;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/theoreticalCourse/contentSettings/index.vue b/src/views/theoreticalCourse/contentSettings/index.vue
index 588e621..e23e015 100644
--- a/src/views/theoreticalCourse/contentSettings/index.vue
+++ b/src/views/theoreticalCourse/contentSettings/index.vue
@@ -157,6 +157,7 @@
             <el-form label-width="80px">
               <el-form-item label="资源添加">
                 <Upload :max-size="100000"
+                        :file-list="uploadList"
                         @beforeUpload="beforeUpload"
                         @onSuccess="uploadSuccess">
                   <template slot="tip">
@@ -185,6 +186,7 @@
                      @close="closeSwitch">
             <div style="text-align: center">
               <Upload :max-size="100000"
+                      :file-list="uploadList"
                       @beforeUpload="beforeUpload"
                       @onSuccess="uploadSuccess">
                 <template slot="tip">
@@ -499,35 +501,6 @@ export default {
         `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
       );
     },
-    // 自定义上传
-    handleRequest (data) {
-      const param = new FormData()
-      param.append('file', data.file)
-      const config = {
-        timeout: 10000000000,
-        headers: {
-          'Accept': '*/*',
-          'Content-Type': 'multipart/form-data',
-          token: sessionStorage.getItem("token")
-        },
-        // 获取上传进度，自带的组件上传进度不准确
-        onUploadProgress: progressEvent => {
-          const per = Number((progressEvent.loaded / progressEvent.total * 100).toFixed(2))
-          console.log("🚀 ~ file: contentSettings.vue ~ line 329 ~ handleRequest ~ per", per, this.progressPercent)
-          if (this.progressPercent <= 80) this.progressPercent = (per > 80) ? (Math.random() * 10 + 80).toFixed(2) : per
-        }
-      }
-      axios.post(this.api.fileupload, param, config).then(res => {
-        this.progressPercent = 100
-        this.showProgress = false
-        const { fileId, fileType, fileUrl, ossFileName } = res.data.data.filesResult
-        this.uploading = false
-        this.fileId = fileId
-        this.fileType = fileType
-        this.fileUrl = fileUrl
-        this.fileName = ossFileName
-      })
-    },
     uploadSuccess (file) {
       this.uploading = false;
       this.fileId = ''