Merge remote-tracking branch 'origin/master'

src/components/VideoUpload/index.vue

@@ -102,7 +102,7 @@
       </el-form>
 
       <!-- 视频列表 -->
-      <el-table v-loading="libraryLoading" :data="libraryList" @row-click="handleLibrarySelect" highlight-current-row>
+      <el-table v-loading="libraryLoading" :data="libraryList" @row-click="handleLibrarySelect" highlight-current-row border>
         <el-table-column label="素材名称" align="center" prop="resourceName" />
         <el-table-column label="文件名称" align="center" prop="fileName" />
         <el-table-column label="缩略图" align="center">

src/views/components/course/userCourseCatalogDetails.vue

@@ -145,9 +145,9 @@
         <el-form-item label="视频描述" prop="description">
           <el-input v-model="form.description" type="textarea" :rows="2"  placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="轮次" prop="round">
-          <el-input v-model="form.round"  placeholder="请输入内容" />
-        </el-form-item>
+<!--        <el-form-item label="轮次" prop="round">-->
+<!--          <el-input v-model="form.round"  placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
         <el-form-item label="课程排序" prop="courseSort">
           <el-input-number v-model="form.courseSort" :min="1" ></el-input-number>
         </el-form-item>

src/views/system/config/config.vue

@@ -1099,6 +1099,17 @@
                </el-select>
              </template>
            </el-table-column>
+           <el-table-column label="小程序原始ID" align="center" prop="username">
+             <template slot-scope="scope" v-if="scope.row.type == 1">
+               <el-input v-model="scope.row.username" placeholder="请输入原始ID" :disabled="!scope.row.editing" />
+             </template>
+           </el-table-column>
+           <el-table-column label="小程序图标" align="center" prop="log">
+             <template slot-scope="scope" v-if="scope.row.type == 1">
+               <el-image v-if="!scope.row.editing && scope.row.log" :src="scope.row.log" :preview-src-list="[scope.row.log]" />
+               <image-upload v-if="scope.row.editing" v-model="scope.row.log" :file-type='["png", "jpg", "jpeg"]' :limit="1"/>
+             </template>
+           </el-table-column>
            <el-table-column label="AppId" align="center" prop="appid">
              <template slot-scope="scope">
                <el-input v-model="scope.row.appid" placeholder="请输入AppId" :disabled="!scope.row.editing" />