From c9f277771f2823b6489ffb9d2e2537786dc2621f Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Wed, 29 Nov 2023 16:52:59 +0800
Subject: [PATCH] =?UTF-8?q?11.29=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventMarketing/activeNewlyweds/index.vue  | 490 ++++++++++++------
 .../EventMarketing/activeRecommend/index.vue  |  20 +-
 2 files changed, 337 insertions(+), 173 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index 65353a26e..ddf295d2c 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -1,122 +1,6 @@
 <template>
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="活动名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入活动名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">
-          <el-option label="启用" value="0"></el-option>
-          <el-option label="禁用" value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="上线/下线">
-        <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否上线">
-          <el-option label="上线" value="0"></el-option>
-          <el-option label="已下线" value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-
-      </el-form-item>
-    </el-form>
-    </el-card>
-
-    <el-card style="margin-bottom: 20px">
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-
-          >新增</el-button>
-        </el-col>
-      </el-row>
-
-    <el-table v-loading="loading" :data="activeNewlywedsList"  :label-position="labelPosition"  @selection-change="handleSelectionChange">
-      <el-table-column
-        type="index"
-        align="center"
-        label="排序"
-      >
-      </el-table-column>
-      <el-table-column label="活动编号" align="center" prop="id" />
-      <el-table-column label="活动名称" align="center" prop="name" />
-      <el-table-column label="活动开始时间" align="center" prop="activeStartTime" width="180">
-        <template slot-scope="scope">
-          <span>{{scope.row.activeStartTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="活动结束时间" align="center" prop="activeEndTime" width="180">
-        <template slot-scope="scope">
-          <span>{{scope.row.activeEndTime}}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="有礼奖励" align="center" prop="courtesyReward" >
-        <template slot-scope="scope">
-          <div v-for="(item,index) in scope.row.courtesyReward ">
-            <div v-if="item == 0" >优惠券</div>
-            <div  v-if="item == 1">兑换券</div>
-          </div>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="活动码" align="center" prop="activeCode" >
-      <template slot-scope="scope">
-        <div style="cursor: pointer" @click="qrcodelook(scope.row.activeCode)">
-          <i class="el-icon-picture" ></i>
-        </div>
-      </template>
-      </el-table-column>
-      <el-table-column label="活动状态" align="center" prop="status" >
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 0"> <el-tag>进行中</el-tag> </span>
-          <span v-if="scope.row.status == 1"> <el-tag type="success">待生效</el-tag>  </span>
-          <span v-if="scope.row.status == 2"> <el-tag type="danger">已结束</el-tag> </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDeletexia(scope.row)"
-            v-if="scope.row.isonline == 0"
-          >下线</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    </el-card>
-
-    <!-- 添加或修改新人有礼活动对话框 -->
-    <el-dialog :title="title" :visible.sync="open"  width="45%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
         <el-form-item label="活动名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入活动名称" />
@@ -143,12 +27,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="有礼奖励" prop="courtesyReward" >
+        <el-form-item label="有礼奖励" prop="courtesyReward">
           <el-checkbox-group v-model="form.courtesyReward">
-
             <el-checkbox label="1" >赠送优惠券</el-checkbox>
             <el-checkbox label="2" >赠送兑换券</el-checkbox>
-
           </el-checkbox-group>
         </el-form-item>
         <!--        选择优惠券-->
@@ -162,12 +44,12 @@
               <el-table-column
                 prop="giftCardName"
                 label="卡券名称"
-                width="0">
+               >
               </el-table-column>
               <el-table-column
                 prop="giftCardType"
                 label="券类型"
-                width="80">
+                >
                 <template slot-scope="scope">
                   <span v-if="scope.row.giftCardType == 0" >油品券</span>
                   <span v-if="scope.row.giftCardType == 1"  >商品券</span>
@@ -177,7 +59,7 @@
               <el-table-column
                 prop="date"
                 label="券详情"
-                width="80">
+                >
                 <template slot-scope="scope">
                   <span>{{scope.row.giftCardDetail}}</span>
                 </template>
@@ -185,17 +67,17 @@
               <el-table-column
                 prop="date"
                 label="有效期（天）"
-                width="240">
+                >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                  <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                  <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                  <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="0" :max="9999"></el-input-number>天 </span>
+                  <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="0" :max="9999"></el-input-number>天 </span>
+                  <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="0" :max="9999"></el-input-number>天 </span>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="date"
                 label="数量"
-                width="240">
+                >
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>
@@ -226,12 +108,12 @@
               <el-table-column
                 prop="giftCardName"
                 label="卡券名称"
-                width="80">
+               >
               </el-table-column>
               <el-table-column
                 prop="date"
                 label="券类型"
-                width="80">
+               >
                 <template slot-scope="scope">
                   <span v-if="scope.row.giftCardType == 0" >油品券</span>
                   <span v-if="scope.row.giftCardType == 1"  >商品券</span>
@@ -241,7 +123,7 @@
               <el-table-column
                 prop="date"
                 label="券详情"
-                width="80">
+               >
                 <template slot-scope="scope">
                   <span>{{scope.row.giftCardDetail}}</span>
                 </template>
@@ -249,7 +131,7 @@
               <el-table-column
                 prop="date"
                 label="有效期（天）"
-                width="240">
+                >
                 <template slot-scope="scope">
                   <span  >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
                 </template>
@@ -257,7 +139,7 @@
               <el-table-column
                 prop="date"
                 label="数量"
-                width="240">
+               >
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>
@@ -287,13 +169,281 @@
         <el-form-item label="自定义规则" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入自定义规则" />
         </el-form-item>
+<!--        <div slot="footer" class="dialog-footer">-->
+<!--          <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--          <el-button @click="cancel">取 消</el-button>-->
+<!--        </div>-->
       </el-form>
+        <div>
+          <el-button type="primary" @click="submitForm">保存</el-button>
 
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+        </div>
+
+    </el-card>
+
+<!--    <el-card style="margin-bottom: 20px">-->
+<!--      <el-row :gutter="10" class="mb8">-->
+<!--        <el-col :span="1.5">-->
+<!--          <el-button-->
+<!--            type="primary"-->
+<!--            plain-->
+<!--            icon="el-icon-plus"-->
+<!--            size="mini"-->
+<!--            @click="handleAdd"-->
+
+<!--          >新增</el-button>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
+
+<!--    <el-table v-loading="loading" :data="activeNewlywedsList"  :label-position="labelPosition"  @selection-change="handleSelectionChange">-->
+<!--      <el-table-column-->
+<!--        type="index"-->
+<!--        align="center"-->
+<!--        label="排序"-->
+<!--      >-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="活动编号" align="center" prop="id" />-->
+<!--      <el-table-column label="活动名称" align="center" prop="name" />-->
+<!--      <el-table-column label="活动开始时间" align="center" prop="activeStartTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{scope.row.activeStartTime}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="活动结束时间" align="center" prop="activeEndTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{scope.row.activeEndTime}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="有礼奖励" align="center" prop="courtesyReward" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <div v-for="(item,index) in scope.row.courtesyReward ">-->
+<!--            <div v-if="item == 0" >优惠券</div>-->
+<!--            <div  v-if="item == 1">兑换券</div>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="活动码" align="center" prop="activeCode" >-->
+<!--      <template slot-scope="scope">-->
+<!--        <div style="cursor: pointer" @click="qrcodelook(scope.row.activeCode)">-->
+<!--          <i class="el-icon-picture" ></i>-->
+<!--        </div>-->
+<!--      </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="活动状态" align="center" prop="status" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.status == 0"> <el-tag>进行中</el-tag> </span>-->
+<!--          <span v-if="scope.row.status == 1"> <el-tag type="success">待生效</el-tag>  </span>-->
+<!--          <span v-if="scope.row.status == 2"> <el-tag type="danger">已结束</el-tag> </span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDeletexia(scope.row)"-->
+<!--            v-if="scope.row.isonline == 0"-->
+<!--          >下线</el-button>-->
+
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--    </el-table>-->
+
+<!--    <pagination-->
+<!--      v-show="total>0"-->
+<!--      :total="total"-->
+<!--      :page.sync="queryParams.pageNum"-->
+<!--      :limit.sync="queryParams.pageSize"-->
+<!--      @pagination="getList"-->
+<!--    />-->
+<!--    </el-card>-->
+
+    <!-- 添加或修改新人有礼活动对话框 -->
+<!--    <el-dialog :title="title" :visible.sync="open"  width="45%" append-to-body>-->
+<!--      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">-->
+<!--        <el-form-item label="活动名称" prop="name">-->
+<!--          <el-input v-model="form.name" placeholder="请输入活动名称" />-->
+<!--        </el-form-item>-->
+<!--        <el-row :gutter="20">-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="活动开始时间" prop="activeStartTime">-->
+<!--              <el-date-picker clearable-->
+<!--                              v-model="form.activeStartTime"-->
+<!--                              type="datetime"-->
+<!--                              value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                              placeholder="请选择活动开始时间">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="活动结束时间" prop="activeEndTime">-->
+<!--              <el-date-picker clearable-->
+<!--                              v-model="form.activeEndTime"-->
+<!--                              type="datetime"-->
+<!--                              value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                              placeholder="请选择活动结束时间">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-form-item label="有礼奖励" prop="courtesyReward" >-->
+<!--          <el-checkbox-group v-model="form.courtesyReward">-->
+
+<!--            <el-checkbox label="1" >赠送优惠券</el-checkbox>-->
+<!--            <el-checkbox label="2" >赠送兑换券</el-checkbox>-->
+
+<!--          </el-checkbox-group>-->
+<!--        </el-form-item>-->
+<!--        &lt;!&ndash;        选择优惠券&ndash;&gt;-->
+<!--        <div class="xh-box" v-if="form.courtesyReward && form.courtesyReward.indexOf('1')>-1  "   >-->
+<!--          <div class="box-bt"> <div >赠送卡券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button>  </div>-->
+<!--          <div style="margin: 10px 0px">-->
+<!--            <el-table-->
+<!--              :data="form.tableDatas"-->
+<!--              border-->
+<!--              style="width: 100%">-->
+<!--              <el-table-column-->
+<!--                prop="giftCardName"-->
+<!--                label="卡券名称"-->
+<!--                width="0">-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="giftCardType"-->
+<!--                label="券类型"-->
+<!--                width="80">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span v-if="scope.row.giftCardType == 0" >油品券</span>-->
+<!--                  <span v-if="scope.row.giftCardType == 1"  >商品券</span>-->
+<!--                  <span v-if="scope.row.giftCardType == 2"  >通用券</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="券详情"-->
+<!--                width="80">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span>{{scope.row.giftCardDetail}}</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="有效期（天）"-->
+<!--                width="240">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>-->
+<!--                  <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>-->
+<!--                  <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="数量"-->
+<!--                width="240">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="address"-->
+<!--                label="操作">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="text"-->
+<!--                    @click="deletedata(scope.row)"-->
+<!--                  >删除</el-button>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--            </el-table>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        &lt;!&ndash;        选择兑换券&ndash;&gt;-->
+<!--        <div class="xh-box" v-if="form.courtesyReward && form.courtesyReward.indexOf('2')>-1  "   >-->
+<!--          <div class="box-bt"> <div >选择兑换券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()" >新增</el-button>  </div>-->
+<!--          <div style="margin: 10px 0px">-->
+
+<!--            <el-table-->
+<!--              :data="tableDatas"-->
+<!--              border-->
+<!--              style="width: 100%">-->
+<!--              <el-table-column-->
+<!--                prop="giftCardName"-->
+<!--                label="卡券名称"-->
+<!--                width="80">-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="券类型"-->
+<!--                width="80">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span v-if="scope.row.giftCardType == 0" >油品券</span>-->
+<!--                  <span v-if="scope.row.giftCardType == 1"  >商品券</span>-->
+<!--                  <span v-if="scope.row.giftCardType == 2"  >通用券</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="券详情"-->
+<!--                width="80">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span>{{scope.row.giftCardDetail}}</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="有效期（天）"-->
+<!--                width="240">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span  >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="数量"-->
+<!--                width="240">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="address"-->
+<!--                label="操作"-->
+<!--              >-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="text"-->
+<!--                    @click="deletedhdata(scope.row)"-->
+<!--                  >删除</el-button>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--            </el-table>-->
+
+<!--          </div>-->
+<!--        </div>-->
+<!--        <el-form-item label="赠送积分" prop="points">-->
+<!--          <el-input-number v-model="form.points" controls-position="right"  :min="1" :max="99999"></el-input-number>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="赠送成长值" prop="growthValue">-->
+<!--          <el-input-number v-model="form.growthValue" controls-position="right"  :min="1" :max="9999999"></el-input-number>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="自定义规则" prop="remark">-->
+<!--          <el-input v-model="form.remark" placeholder="请输入自定义规则" />-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="">确 定</el-button>-->
+<!--        <el-button @click="cancel">取 消</el-button>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
 
 
     <!--    优惠券列表-->
@@ -513,7 +663,9 @@ export default {
       },
       // 表单参数
       form: {
+        id:1,
         tableDatas:[],
+        courtesyReward:[],
         activeNewlywedsChildList:[],
       },
       // 表单校验
@@ -543,17 +695,17 @@ export default {
     };
   },
   created() {
-    this.getList();
+    this.handleUpdate();
   },
   methods: {
     /** 查询新人有礼活动列表 */
     getList() {
-      this.loading = true;
-      listActiveNewlyweds(this.queryParams).then(response => {
-        this.activeNewlywedsList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
+      // this.loading = true;
+      // listActiveNewlyweds(this.queryParams).then(response => {
+      //   this.activeNewlywedsList = response.data.records;
+      //   this.total = response.data.total;
+      //   this.loading = false;
+      // });
     },
     getoilName(){
       getoilName().then(res=>{
@@ -590,7 +742,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+        id: 1,
         chainStoreId: null,
         storeId: null,
         name: null,
@@ -760,10 +912,9 @@ export default {
       this.title = "添加新人有礼活动";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getActiveNewlyweds(id).then(response => {
+    handleUpdate() {
+      this.reset()
+      getActiveNewlyweds(1).then(response => {
         this.form = response.data;
         this.form.tableDatas = response.data.activeNewlywedsChildList.filter(item => item.activeGift == '1')
         this.tableDatas = response.data.activeNewlywedsChildList.filter(item => item.activeGift == '2')
@@ -784,28 +935,41 @@ export default {
 
       });
     },
-    /** 提交按钮 */
     submitForm() {
       // this.form.activeNewlywedsChildList
       this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas);
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
-            updateActiveNewlyweds(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addActiveNewlyweds(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+          addActiveNewlyweds(this.form).then(response => {
+            this.$modal.msgSuccess("新增成功");
+            this.open = false;
+            this.handleUpdate();
+          });
         }
       });
     },
+    /** 提交按钮 */
+    // submitForm() {
+    //   // this.form.activeNewlywedsChildList
+    //   this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas);
+    //   this.$refs["form"].validate(valid => {
+    //     if (valid) {
+    //       if (this.form.id != null) {
+    //         updateActiveNewlyweds(this.form).then(response => {
+    //           this.$modal.msgSuccess("修改成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       } else {
+    //         addActiveNewlyweds(this.form).then(response => {
+    //           this.$modal.msgSuccess("新增成功");
+    //           this.open = false;
+    //           this.getList();
+    //         });
+    //       }
+    //     }
+    //   });
+    // },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
index ca90549ad..730d611c2 100644
--- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
@@ -43,12 +43,12 @@
               <el-table-column
                 prop="giftCardName"
                 label="卡券名称"
-                width="0">
+               >
               </el-table-column>
               <el-table-column
                 prop="giftCardType"
                 label="券类型"
-                width="80">
+               >
                 <template slot-scope="scope">
                   <span v-if="scope.row.giftCardType == 0" >油品券</span>
                   <span v-if="scope.row.giftCardType == 1"  >商品券</span>
@@ -58,7 +58,7 @@
               <el-table-column
                 prop="date"
                 label="券详情"
-                width="80">
+                >
                 <template slot-scope="scope">
                   <span>{{scope.row.giftCardDetail}}</span>
                 </template>
@@ -66,7 +66,7 @@
               <el-table-column
                 prop="date"
                 label="有效期（天）"
-                width="240">
+                >
                 <template slot-scope="scope">
                   <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
                   <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
@@ -76,7 +76,7 @@
               <el-table-column
                 prop="date"
                 label="数量"
-                width="240">
+                >
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>
@@ -109,12 +109,12 @@
               <el-table-column
                 prop="giftCardName"
                 label="卡券名称"
-                width="80">
+                >
               </el-table-column>
               <el-table-column
                 prop="date"
                 label="券类型"
-                width="80">
+                >
                 <template slot-scope="scope">
                   <span v-if="scope.row.giftCardType == 0" >油品券</span>
                   <span v-if="scope.row.giftCardType == 1"  >商品券</span>
@@ -124,7 +124,7 @@
               <el-table-column
                 prop="date"
                 label="券详情"
-                width="80">
+                >
                 <template slot-scope="scope">
                   <span>{{scope.row.giftCardDetail}}</span>
                   <!--                  <span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>-->
@@ -133,7 +133,7 @@
               <el-table-column
                 prop="date"
                 label="有效期（天）"
-                width="240">
+                >
                 <template slot-scope="scope">
                   <span  >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
 
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="date"
                 label="数量"
-                width="240">
+              >
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>