Merge branch 'feature/6/31' into dev

src/views/ecm/form.vue

@@ -69,7 +69,7 @@
           <div class="fz12 gray">选填，勾选后生效</div>
           <el-checkbox-group v-model="checked" :max="1">
             <div class="pb10" style="display:flex;">
-              <el-checkbox :disabled="!isAdd" class="w150" label="brithday_day" style="margin-right:0">会员生日前 </el-checkbox>
+              <el-checkbox :disabled="!isAdd" class="w150" label="brithday_day" style="margin-right:0">会员生日</el-checkbox>
               <el-select class="w100" :disabled="!isAdd" v-model="form.brithday_type" placeholder="请选择生日类型" @change="effectActionChange">
                 <el-option label="阳历生日" :value="1"></el-option>
                 <el-option label="阴历生日" :value="2"></el-option>

src/views/message/delDialog.vue

@@ -47,7 +47,7 @@ export default {
       const obj = {
         1: '短信群发',
         2: '智能营销',
-        3: 'ai营销',
+        3: 'AI营销',
         4: '导入群发',
         5: '扫码营销'
       };