Merge branch 'feature/3-2迭代' into dev

* feature/3-2迭代:
  最小宽度
  优化

src/views/activity/component/holiday-category-dialog.vue

@@ -106,8 +106,7 @@ export default {
           });
           saveHolidayCategory(list)
             .then((res) => {
-              let code = res.code;
-              if (code === '0') this.$message.success('提交成功');
+              this.$message.success('提交成功');
               this.handleClose();
               this.$emit('refresh');
               this.loading = false;

src/views/activity/component/holiday-dialog.vue

 <template>
   <el-dialog title="编辑" :visible.sync="visible" width="600px" @close="onClose">
     <el-form :model="submitData" :rules="rules" ref="submitData" label-width="120px">
-      <el-form-item label="节日分类：" prop="categoryCode">
+      <el-form-item label="节日分类" prop="categoryCode">
         <el-select v-model="submitData.categoryCode" clearable placeholder="全部分类">
           <el-option v-for="item in categoryList" :key="item.activityCategoryId" :label="item.categoryName" :value="item.activityCategoryId"> </el-option>
         </el-select>
       </el-form-item>
 
-      <el-form-item label="节日名称：" prop="name">
+      <el-form-item label="节日名称" prop="name">
         <el-input v-model="submitData.name" placeholder="请输入节日名称，不超过 10 个字" maxlength="10" clearable></el-input>
       </el-form-item>
 
-      <el-form-item label="节日日期：" prop="customFlag">
+      <el-form-item label="节日日期" prop="customFlag">
         <el-radio v-model="submitData.customFlag" label="0">固定日期</el-radio>
         <el-radio v-model="submitData.customFlag" label="1">灵活日期</el-radio>
       </el-form-item>
 
-      <el-form-item label="选择日期：" prop="date" v-if="submitData.customFlag == 0">
+      <el-form-item label="选择日期" prop="date" v-if="submitData.customFlag == 0">
         <div>
           <el-radio v-model="submitData.dateType" label="1">
             <div style="display: inline-block">阳历</div>
@@ -36,7 +36,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="选择日期：" v-if="submitData.customFlag == 1">
+      <el-form-item label="选择日期" v-if="submitData.customFlag == 1">
         <el-row type="flex" align="middle">
           <el-form-item prop="month" style="margin-right: 10px">
             <el-select v-model="submitData.month" placeholder="请选择月份" class="selector-item">
@@ -58,7 +58,7 @@
         </el-row>
       </el-form-item>
 
-      <el-form-item label="排序号：" prop="sort">
+      <el-form-item label="排序号" prop="sort">
         <el-input v-model="submitData.sort" placeholder="请输入排序号，1-1000" max="1000" min="1" step="1" clearable></el-input>
       </el-form-item>
 

src/views/activity/holiday-manage.vue

@@ -15,12 +15,12 @@
     </el-row>
 
     <el-table :data="list" style="margin-top: 20px" v-loading="loading">
-      <el-table-column label="节日分类" width="200px" prop="categoryName"> </el-table-column>
-      <el-table-column label="节日名称" width="200px" prop="name"> </el-table-column>
-      <el-table-column label="节日日期" width="200px" prop="holidaysDate"> </el-table-column>
-      <el-table-column label="排序号" width="200px" prop="sort"> </el-table-column>
+      <el-table-column label="节日分类" min-width="200px" prop="categoryName"> </el-table-column>
+      <el-table-column label="节日名称" min-width="200px" prop="name"> </el-table-column>
+      <el-table-column label="节日日期" min-width="200px" prop="holidaysDate"> </el-table-column>
+      <el-table-column label="排序号" min-width="200px" prop="sort"> </el-table-column>
 
-      <el-table-column label="添加时间" width="220px">
+      <el-table-column label="添加时间" min-width="220px">
         <template slot-scope="{ row }">
           {{ row.updateTime | formatDate }}
         </template>