Merge branch 'pre'

src/components/resources/menuDialog.vue

@@ -5,9 +5,9 @@
       <el-form-item label="名称" label-width="100px">
         <el-input v-model="form.name"></el-input>
       </el-form-item>
-      <el-form-item label="英文名称" v-if="dialogObj.list == 'list2'" label-width="100px">
+      <!--<el-form-item label="英文名称" v-if="dialogObj.list == 'list2'" label-width="100px">
         <el-input v-model="form.english_name"></el-input>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="封面" label-width="100px">
         <el-upload
           class="upload-demo"
@@ -20,7 +20,7 @@
           :file-list="imgList">
         </el-upload>
       </el-form-item>
-      <el-form-item label="课时英文名称" v-if="dialogObj.list == 'list3'" label-width="100px">
+      <!--<el-form-item label="课时英文名称" v-if="dialogObj.list == 'list3'" label-width="100px">
         <el-input v-model="form.english_name"></el-input>
       </el-form-item>
       <el-form-item label="课时封面" v-if="dialogObj.list == 'list3'" label-width="100px">
@@ -34,7 +34,7 @@
           :limit="1"
           :file-list="imgList1">
         </el-upload>
-      </el-form-item>
+      </el-form-item>-->
     </el-form>
     <span slot="footer" class="dialog-footer">
     <el-button @click="dialogObj.show = false">取 消</el-button>
@@ -57,7 +57,7 @@
           pid:'',
           cover:'',
           type:0,
-          english_name: '',
+          // english_name: '',
           sub_cover: ''
         }
       }
@@ -71,7 +71,7 @@
               pid:this.dialogObj.pid,
               cover:'',
               type:0,
-              english_name: '',
+              // english_name: '',
               sub_cover: ''
             };
             this.imgList = [];
@@ -83,7 +83,7 @@
               pid:this.dialogObj.that.pid,
               cover:this.dialogObj.that.cover,
               type:0,
-              english_name: this.dialogObj.that.english_name,
+              // english_name: this.dialogObj.that.english_name,
               sub_cover:this.dialogObj.that.sub_cover
             };
             this.imgList = [];