Merge remote-tracking branch 'origin/master'

src/views/components/course/userCourseCatalogDetails.vue

@@ -239,7 +239,7 @@
               </div>
           </div>
         </template>
-           
+
         </el-form-item>
         <el-form-item label="是否关联商品">
           <el-radio v-model="form.isProduct" :label=0>否</el-radio>
@@ -251,6 +251,12 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否启用倍速" prop="isSpeed">
+          <el-radio-group v-model="form.isSpeed">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="商品选择" v-if="form.isProduct === 1">
           <el-button size="small" type="primary" @click="chooseCourseProduct">选取商品</el-button>
           <el-table border width="100%" style="margin-top:5px;" :data="form.courseProducts">
@@ -826,6 +832,7 @@ export default {
         transcodeFileKey: null,
         isProduct: 0,
         isFirst: 0,
+        isSpeed: 0,
         listingStartTime: null,
         listingEndTime: null,
         randomRedPacketRules:null,
@@ -1150,24 +1157,24 @@ export default {
     handleAmountInput(rule, field) {
       let value = rule[field];
       if (value === null || value === undefined) return;
-      
+
       // 转换为字符串处理
       let str = value.toString();
-      
+
       // 移除除数字和小数点外的所有字符
       str = str.replace(/[^0-9.]/g, '');
-      
+
       // 只保留一个小数点
       const dotIndex = str.indexOf('.');
       if (dotIndex !== -1) {
         str = str.substring(0, dotIndex + 1) + str.substring(dotIndex + 1).replace(/\./g, '');
       }
-      
+
       // 限制小数点后最多两位
       if (dotIndex !== -1 && str.length > dotIndex + 3) {
         str = str.substring(0, dotIndex + 3);
       }
-      
+
       // 转换回数字并更新
       rule[field] = parseFloat(str) || 0;
     },
@@ -1196,7 +1203,7 @@ export default {
     validateMinAmount(rule, value, callback) {
       // debugger;
       // const maxAmount = this.form29.rules[].maxAmount
-      
+
       const index = rule.index;
       const maxAmount = this.form.randomRedPacketRulesArr[index].maxAmount;
 
@@ -1206,7 +1213,7 @@ export default {
         callback();
       }
     },
-      validateRules() {        
+      validateRules() {
       this.form.randomRedPacketRulesArr.forEach((rule) => {
         if (rule.minAmount === undefined || rule.minAmount < 0.01) {
           rule.minAmount = 0.01;

src/views/course/courseTrafficLog/index.vue

@@ -52,7 +52,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['course:courseTrafficLog:export']" >导出</el-button>
       </el-form-item>
     </el-form>
 
@@ -195,6 +195,7 @@ export default {
       });
     },
     handleQuery() {
+      this.queryParams.tabType = this.activeTab
       this.queryParams.pageNum = 1;
       this.getList();
     },