diff --git a/src/views/active/activity.vue b/src/views/active/activity.vue
index 830774c..af4df59 100644
--- a/src/views/active/activity.vue
+++ b/src/views/active/activity.vue
@@ -132,13 +132,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="结束时间" prop="end_time">
-              <el-date-picker
-                style="width:100%"
-                v-model="form.end_time"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="选择活动结束时间">
-              </el-date-picker>
+              <el-time-select
+                  style="width:100%"
+                  placeholder="结束时间"
+                  v-model="form.end_time"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00',
+                  }">
+                </el-time-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -452,6 +455,7 @@
         get(obj.id).then(res => {
           let result = Object.assign(that.form, res);
           that.form = result;
+          that.form.end_time = result.end_time.substring(11,result.end_time.length);
           let _files = [];
           for (var mod of result.banners) {
             let m = Object.assign({}, mod);
@@ -481,8 +485,7 @@
       },
       submitForm(formName) {
         var that = this;
-        // console.log(that.form);
-        // return;
+        that.form.end_time = that.form.start_time.substring(0,10)+" "+that.form.end_time+":00";
         this.$refs[formName].validate((valid) => {
           if (valid) {
             if (that.form.id) {