Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

src/components/Pagination/index.vue

@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 20, 30, 50,100,200,300]
       }
     },
     // 移动端页码按钮的数量端默认值5

src/views/components/course/userCourseCatalogDetails.vue

@@ -167,6 +167,12 @@
           <el-radio v-model="form.isProduct" :label=0>否</el-radio>
           <el-radio v-model="form.isProduct" :label=1>是</el-radio>
         </el-form-item>
+        <el-form-item label="是否先导课" prop="isFirst">
+          <el-radio-group v-model="form.isFirst">
+            <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">
@@ -687,6 +693,7 @@ export default {
         isTranscode: 0,
         transcodeFileKey: null,
         isProduct: 0,
+        isFirst: 0,
         listingStartTime: null,
         listingEndTime: null,
       };

src/views/system/config/config.vue

@@ -1616,10 +1616,10 @@
           <el-form-item label="apiV3密钥" prop="apiV3Key">
             <el-input v-model="form19.apiV3Key" label="请输入apiV3Key"></el-input>
           </el-form-item>
-           <el-form-item   label="公钥ID" prop="publicKeyId" v-if="form19.isNew==1">
+           <el-form-item   label="公钥ID" prop="publicKeyId">
             <el-input v-model="form19.publicKeyId" label="请输入公钥ID"></el-input>
           </el-form-item>
-           <el-form-item   label="公钥证书" prop="publicKeyPath" v-if="form19.isNew==1">
+           <el-form-item   label="公钥证书" prop="publicKeyPath">
             <el-input v-model="form19.publicKeyPath" label="请输入publicKeyPath"></el-input>
           </el-form-item>
           <el-form-item label="key路径" prop="privateKeyPath">

src/views/system/config/config2.vue

@@ -1147,10 +1147,10 @@
            <el-form-item   label="apiV3密钥" prop="apiV3Key">
              <el-input   v-model="form19.apiV3Key"  label="请输入apiV3Key"></el-input>
            </el-form-item>
-           <el-form-item   label="公钥ID" prop="publicKeyId" v-if="form19.isNew==1">
+           <el-form-item   label="公钥ID" prop="publicKeyId">
              <el-input   v-model="form19.publicKeyId"  label="请输入公钥ID"></el-input>
            </el-form-item>
-           <el-form-item   label="公钥证书" prop="publicKeyPath" v-if="form19.isNew==1">
+           <el-form-item   label="公钥证书" prop="publicKeyPath">
              <el-input   v-model="form19.publicKeyPath"  label="请输入publicKeyPath"></el-input>
            </el-form-item>
            <el-form-item   label="key路径" prop="privateKeyPath">