Merge branch 'feature/3月迭代' of http://git.gicdev.com/gic-web/marketing-opeartion into dev

src/views/activity/component/CategoryDialog.vue

@@ -17,7 +17,7 @@
             </el-form-item>
             <div class="btn-wrap">
               <template v-if="item.isEdit">
-                <el-button type="text" @click="cancelEdit(idx)">取消</el-button>
+                <el-button type="text" @click="cancelEdit(idx)" style="color:#303133;">取消</el-button>
                 <el-button type="text" @click="saveEdit(idx)">保存</el-button>
               </template>
               <template v-else>

src/views/activity/component/NewActivity.vue

 <template>
-  <el-dialog custom-class="category-dialog" :visible.sync=" dialogVisible" :rules="rules"  class="category-dialog-wrap"
+  <el-dialog custom-class="category-dialog" :visible.sync=" dialogVisible" :rules="rules" class="category-dialog-wrap"
     width="600px" :close-on-click-modal="false" :close-on-press-escape="false">
     <div v-loading="loading">
       <el-row type="flex" justify="space-between">