Merge remote-tracking branch 'origin/master'

src/components/MinimizableDialog/index.vue

@@ -7,7 +7,6 @@
       :title="title"
       v-bind="$attrs"
       v-on="$listeners"
-      :before-close="handleClose"
     >
       <template #title>
         <span>{{ title }}</span>
@@ -99,10 +98,6 @@ export default {
       this.visibleSync = true;
       this.$emit("restore");
     },
-    handleClose(done) {
-      this.$emit("close");
-      done();
-    }
   }
 };
 </script>

src/utils/obs.js

@@ -6,7 +6,8 @@ export const uploadToOBS = async(file,progressCallback,type) =>  {
         const obsClient = new ObsClient({
           access_key_id: process.env.VUE_APP_OBS_ACCESS_KEY_ID,
           secret_access_key: process.env.VUE_APP_OBS_SECRET_ACCESS_KEY,
-          server: process.env.VUE_APP_OBS_SERVER
+          server: process.env.VUE_APP_OBS_SERVER,
+          timeout: 1200,
         });
         let fileName = file.name || ""
         const upload_file_name = new Date().getTime() + '.' + fileName.split(".")[fileName.split(".").length - 1];

src/views/system/config/config.vue

@@ -1006,6 +1006,19 @@
                <el-radio label="2">分公司</el-radio>
              </el-radio-group>
            </el-form-item>
+
+           <el-form-item label="是否开启看课评论">
+             <el-row>
+               <el-switch v-model="form18.isOpenComment"></el-switch>
+             </el-row>
+           </el-form-item>
+
+           <el-form-item label="可查看评论条数">
+             <el-tooltip class="item" effect="dark" content="在评论区可以查看的历史评论条数，默认200" placement="top-end">
+               <el-input-number  v-model="form18.viewCommentNum" :min="1"></el-input-number>
+             </el-tooltip>
+           </el-form-item>
+
            <div class="line"></div>
            <div style="float:right;margin-right:20px">
              <el-button type="primary" @click="submitForm18">提交</el-button>
@@ -1277,6 +1290,7 @@ export default {
       form17:{
       },
       form18:{
+        isOpenComment: true
       },
       form19:{
       },