Merge branch 'dev' into pre

src/components/lesson/dialog.vue

@@ -51,7 +51,7 @@
           </el-col>
         </el-row>
         <!--暂时注释-->
-        <!--<el-row>
+        <el-row>
           <el-col :span="24">
             <el-form-item label="已选课程">
               <div class="selected-block" v-for="(data, index) in selectedLessonList" :key="index">
@@ -61,31 +61,19 @@
                     <img class="directionIcon" :src="upSrc" v-if="index !== 0" @click="moveItem(index-1,index)"/>
                     <img class="directionIcon" :src="downSrc" v-if="index !== selectedLessonList.length - 1" @click="moveItem(index,index+1)"/>
                     <i class="el-icon-delete grey" @click="delLesson(data)"></i>
-                    &lt;!&ndash;<el-button type="info" icon="el-icon-sort-up" v-if="index !== 0" @click="moveItem(index-1,index)" round size="mini"></el-button>&ndash;&gt;
-                    &lt;!&ndash;<el-button type="info" icon="el-icon-sort-down" v-if="index !== selectedLessonList.length - 1" @click="moveItem(index,index+1)" round size="mini"></el-button>&ndash;&gt;
-                    &lt;!&ndash;<el-button type="text" class="button" v-if="index !== 0" @click="moveItem(index-1,index)">上移</el-button>&ndash;&gt;
-                    &lt;!&ndash;<el-button type="text" class="button" v-if="index !== selectedLessonList.length - 1" @click="moveItem(index,index+1)">下移</el-button>&ndash;&gt;
-                    &lt;!&ndash;<el-button type="danger" icon="el-icon-close" @click="delLesson(data)" circle size="mini"></el-button>&ndash;&gt;
+                    <!--<el-button type="info" icon="el-icon-sort-up" v-if="index !== 0" @click="moveItem(index-1,index)" round size="mini"></el-button>-->
+                    <!--<el-button type="info" icon="el-icon-sort-down" v-if="index !== selectedLessonList.length - 1" @click="moveItem(index,index+1)" round size="mini"></el-button>-->
+                    <!--<el-button type="text" class="button" v-if="index !== 0" @click="moveItem(index-1,index)">上移</el-button>-->
+                    <!--<el-button type="text" class="button" v-if="index !== selectedLessonList.length - 1" @click="moveItem(index,index+1)">下移</el-button>-->
+                    <!--<el-button type="danger" icon="el-icon-close" @click="delLesson(data)" circle size="mini"></el-button>-->
                   </div>
                 </el-card>
               </div>
             </el-form-item>
           </el-col>
-        </el-row>-->
+        </el-row>
         <el-row>
           <el-col :span="10">
-            <!--<el-form-item label="选择盒子">
-              <el-cascader
-                clearable
-                :value="selectedBox"
-                :options="showBoxList"
-                :show-all-levels="false"
-                @change="selectBox"
-                expand-trigger="hover"
-                :props="{label: 'name',value:'id',children:'children'}"
-              ></el-cascader>
-            </el-form-item>-->
-
                <el-form-item label="选择盒子">
                  <el-select filterable v-model="form.cargo" placeholder="请选择" clearable>
                    <el-option
@@ -96,10 +84,9 @@
                    </el-option>
                  </el-select>
                </el-form-item>
-
           </el-col>
         </el-row>
-        <!-- <el-row>
+       <!--  <el-row>
            <el-col :span="24">
              <el-form-item label="已选盒子">
                <div class="selected-block" v-for="(data,index) in selectedBoxList" :key="data.id">
@@ -165,7 +152,7 @@
                     title: '',
                     type: '',
                     text_category_ids: [],
-                    item_category_ids: [],
+                    // item_category_ids: [],
                     cargo: '',
                     cover: 0,
                 },
@@ -363,7 +350,7 @@
                                 title: '',
                                 type: '',
                                 text_category_ids: [],
-                                item_category_ids: [],
+                                // item_category_ids: [],
                                 cargo: '',
                                 cover: 0,
                             };
@@ -385,7 +372,7 @@
                                     title: resL.title,
                                     type: resL.type,
                                     text_category_ids: [],
-                                    item_category_ids: [],
+                                    // item_category_ids: [],
                                     cargo: cargo,
                                     cover: '',
                                 };