update: 样式修改

src/views/ecm/form.vue

@@ -457,7 +457,7 @@
               <el-input-number :disabled="!isAdd" controls-position="right" class="w150" :min="1" :max="90" step-strictly v-model="analyseConfig.marke_days"></el-input-number>
               <span class="ml10">天之内</span>
             </div>
-            <div style="margin-top:6px;color:#A5A7AD;font-size:12px;margin-left:164px">
+            <div style="margin-top:6px;color:#909399;font-size:12px;margin-left:164px;line-height:18px">
               最短 1 天，最长 90 天 (以自然日计算)
               <br />
               注：时间越长，会员的转化与此次营销的相关度越低，分析触达日期起&lt;31天内的转化数据更为合理，请酌情填写分析天数。

src/views/ecm/list.vue

@@ -25,7 +25,7 @@
       </el-tooltip>
     </div>
     <div v-show="showSearch" class="senior-search-content">
-      <el-form label-width="100px">
+      <el-form label-width="100px" style="margin-bottom:-7px">
         <el-form-item label="创建时间" class="inline-item">
           <el-date-picker style="width:350px" v-model="dateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="search"></el-date-picker>
         </el-form-item>
@@ -47,9 +47,7 @@
         <el-form-item label="选择数据对话" class="inline-item">
           <dm-activity-select ref="activity" class="vertical-middle" onlySelect width="350" :actId.sync="listParams.marketingActivityId" @actUpdate="search"></dm-activity-select>
         </el-form-item>
-        <el-form-item v-if="$store.state.marketing.isShowSelf" class="inline-item">
-          <el-checkbox class="vertical-middle" v-model="listParams.showSelfFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="search" />
-        </el-form-item>
+        <el-checkbox v-if="$store.state.marketing.isShowSelf" class="vertical-middle" style="margin-top:2px" v-model="listParams.showSelfFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="search" />
       </el-form>
     </div>
     <el-table tooltipEffect="dark" :data="tableList" style="width: 100%" element-loading-text="拼命加载中">
@@ -514,7 +512,7 @@ export default {
 .senior-search-content {
   border: 1px solid #dcdfe6;
   border-radius: 2px;
-  padding: 15px 24px;
+  padding: 15px 24px 0;
   margin-bottom: 20px;
 }
 .inline-item {

src/views/game/dzp/form.vue

@@ -317,6 +317,10 @@ export default {
       const backupCurrent = this.backupTableList[index];
       // 差值，如果奖品类型或是卡券改变直接给目标值，否则给差值  count >0增加库存，<0减少库存
       let count = 0;
+      if (!this.tableList.some(v => v.prizeType === 3)) {
+        this.$tips({ type: 'warning', message: `必须有一个奖项为谢谢参与` });
+        return;
+      }
       if (current.prizeType == 1) {
         // 积分
         count = backupCurrent.prizeType != 1 || backupCurrent.prizeIntegral != current.prizeIntegral ? current.prizeCount : current.prizeCount - backupCurrent.prizeCount;