diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue
index d6a53d5..86f4e69 100644
--- a/src/components/Crud/UD.operation.vue
+++ b/src/components/Crud/UD.operation.vue
@@ -5,7 +5,7 @@
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
         <el-button size="mini" type="text" @click="doCancel">取消</el-button>
-        <el-button :loading="crud.dataStatus[data.id].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
+        <el-button type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
       </div>
       <el-button slot="reference" :disabled="disabledDle" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />
     </el-popover>
diff --git a/src/components/file-upload/index.vue b/src/components/file-upload/index.vue
index 68880fa..9e68329 100644
--- a/src/components/file-upload/index.vue
+++ b/src/components/file-upload/index.vue
@@ -43,7 +43,7 @@ export default {
         res.push({ name: this.value, url: this.resourcesUrl + this.value, response: this.value })
       }
       this.$emit('input', this.value)
-      console.log('res' + res)
+      // console.log('res' + res)
       return res
     }
   },
diff --git a/src/views/course/addStudy.vue b/src/views/course/addStudy.vue
index e3e986f..2cbd08c 100644
--- a/src/views/course/addStudy.vue
+++ b/src/views/course/addStudy.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="110px">
-      <el-form-item label="分类">
+      <el-form-item label="课程分类">
         <el-cascader
           v-model="form.categoryId"
           :options="categoryList"
diff --git a/src/views/course/studyList.vue b/src/views/course/studyList.vue
index 7c20bd5..b074160 100644
--- a/src/views/course/studyList.vue
+++ b/src/views/course/studyList.vue
@@ -17,7 +17,7 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="columns.visible('id')" prop="id" label="id" />
-        <el-table-column v-if="columns.visible('categoryName')" prop="categoryName" label="分类" />
+        <el-table-column v-if="columns.visible('categoryName')" prop="categoryName" label="课程分类" />
         <el-table-column v-if="columns.visible('courseStartTime')" prop="courseStartTime" label="打榜时间" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.listStartTime)}} ~ {{parseTime(scope.row.listEndTime)}}</span>
@@ -49,22 +49,22 @@
           </template>
         </el-table-column>
         <el-table-column v-if="columns.visible('integral')" prop="integral" label="奖惩积分" />
-        <el-table-column label="操作" width="150px" align="center">
+        <el-table-column label="操作" width="170px" align="center">
           <template slot-scope="scope">
             <el-button  size="mini" type="primary" icon="el-icon-edit">
               <router-link :to="'/course/addStudy/'+scope.row.id">编辑</router-link>
             </el-button>
             <el-popover
-            :ref="scope.row.id"
-            placement="top"
-            width="180"
-          >
+              :ref="scope.row.id"
+              placement="top"
+              width="180"
+            >
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button type="primary" size="mini" @click="crud.doDelete(scope.row)">确定</el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
           </el-popover>
           </template>
         </el-table-column>
diff --git a/src/views/wechat/article/form.vue b/src/views/wechat/article/form.vue
index e365473..79b6401 100644
--- a/src/views/wechat/article/form.vue
+++ b/src/views/wechat/article/form.vue
@@ -1,6 +1,25 @@
 <template>
   <div class="app-container">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      
+      <el-form-item label="标题">
+        <el-input v-model="form.title" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="作者">
+        <el-input v-model="form.author" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="封面">
+        <MaterialList v-model="form.imageArr" style="width: 370px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="文章分类">
+        <el-cascader
+          v-model="form.categoryId"
+          :options="categoryList"
+          :show-all-levels="false"
+          :props="{ checkStrictly: true }"
+          @change="handleChange">
+        </el-cascader>
+      </el-form-item>
       <el-form-item label="收费类型" prop="chargeType">
         <el-radio-group v-model="form.chargeType">
           <el-radio :label="0">免费</el-radio>
@@ -14,14 +33,11 @@
       <el-form-item label="文章等级">
         <el-input-number v-model="form.level" :min="1" label="文章等级"></el-input-number>
       </el-form-item>
-      <el-form-item label="标题">
-        <el-input v-model="form.title" style="width: 370px;" />
+      <el-form-item label="音频">
+        <fileUpload  v-model="form.audio" @input="audioInput" @change="audioChange"></fileUpload>
       </el-form-item>
-      <el-form-item label="作者">
-        <el-input v-model="form.author" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="封面">
-        <MaterialList v-model="form.imageArr" style="width: 370px" type="image" :num="1" :width="150" :height="150" />
+      <el-form-item label="视频">
+        <fileUpload  v-model="form.video" @input="videoInput" @change="videoChange"></fileUpload>
       </el-form-item>
       <el-form-item label="简介">
         <el-input v-model="form.synopsis" style="width: 370px;" rows="5" type="textarea" />
@@ -49,8 +65,10 @@ import editor from '../../components/Editor'
 import yamedit from '@/components/YamlEdit'
 import MaterialList from '@/components/material'
 import UeditorWrap from 'vue-ueditor-wrap';
+import fileUpload from '@/components/file-upload';
+import { initData } from '@/api/data'
 export default {
-  components: { editor, picUpload, yamedit, MaterialList, UeditorWrap },
+  components: { editor, picUpload, yamedit, MaterialList, UeditorWrap,fileUpload },
   // props: {
   //   isAdd: {
   //     type: Boolean,
@@ -63,6 +81,7 @@ export default {
       form: {
         id: '',
         cid: '',
+        categoryId:'',
         chargeType:0,
         articleCharge:'',
         level:'',
@@ -93,12 +112,14 @@ export default {
         initialFrameWidth: '100%', // 初始容器宽度
         UEDITOR_HOME_URL: '/UEditor/',
         serverUrl: ''
-      }
+      },
+      categoryList:[]
     }
   },
   watch: {
   },
   created() {
+    this.getCategory();
     this.form.id = this.$route.params.id
     this.$nextTick(() => {
       //this.init()
@@ -112,6 +133,50 @@ export default {
     })
   },
   methods: {
+    audioInput(file){
+      this.form.audio = file;
+      // console.log('file',file)
+    },
+    audioChange(file){
+      this.form.audio = '';
+      // console.log('remove',file)
+    },
+    videoInput(file){
+      this.form.video = file;
+      // console.log('file',file)
+    },
+    videoChange(file){
+      this.form.video = '';
+      // console.log('remove',file)
+    },
+    getCategory(){
+      initData('/api/CourseCategory',this.getQueryParams()).then((res)=>{
+        // console.log(res)
+        res.content.forEach((item)=>{
+          item.label = item.categoryName
+          item.value = item.id
+          item.children = item.categoryList
+          item.categoryList.forEach((child)=>{
+            child.label = child.categoryName
+            child.value = child.id
+            child.children = child.categoryList
+          })
+        })
+        this.categoryList = res.content   
+      })
+    },
+    getQueryParams: function() {
+      return {
+        page: 1,
+        size: 10,
+        sort: ['id,desc'],
+      }
+    },
+    handleChange(value){
+      console.log(value)
+      this.form.categoryId = value[value.length-1];
+      this.form.cid = value[value.length-1];
+    },
     addCustomDialog () {
       window.UE.registerUI('yshop', function (editor, uiName) {
         let dialog = new window.UE.ui.Dialog({
@@ -194,6 +259,7 @@ export default {
         id: '',
         cid: '',
         chargeType:0,
+        categoryId:'',
         articleCharge:'',
         level:'',
         title: '',