From 69c0516825ef14b286e798f8e826d7ce5581d5fc Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 7 Mar 2024 11:31:53 +0800
Subject: [PATCH] bug

---
 .../EventMarketing/activeNewlyweds/index.vue   | 18 ++++++++++++++----
 .../controller/ActiveNewlywedsController.java  |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index 6bf07e664..e3a6e6d7f 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -34,7 +34,7 @@
             plain
             icon="el-icon-plus"
             size="mini"
-            @click="open = true"
+            @click="addDatas"
           >新增</el-button>
         </el-col>
       </el-row>
@@ -241,8 +241,9 @@
 
         <el-table-column label="活动状态 " align="center" prop="status" >
           <template slot-scope="scope">
-            <span style="cursor: pointer;"  v-if="scope.row.status == 0"> <el-tag>在线</el-tag > </span>
-            <span style="cursor: pointer;"  v-if="scope.row.status == 1"> <el-tag type="danger">下线</el-tag>  </span>
+            <span style="cursor: pointer;"  v-if="scope.row.status == 0"> <el-tag>进行中</el-tag > </span>
+            <span style="cursor: pointer;"  v-if="scope.row.status == 1"> <el-tag type="danger">待生效</el-tag>  </span>
+            <span style="cursor: pointer;"  v-if="scope.row.status == 2"> <el-tag type="danger">已结束</el-tag>  </span>
           </template>
         </el-table-column>
         <el-table-column label="赠送积分" align="center" prop="adaptUserType" >
@@ -628,6 +629,15 @@ export default {
       })
 
     },
+    addDatas(){
+      this.open = true
+      this.form = {
+        id:"",
+        tableDatas:[],
+        courtesyReward:[],
+        activeNewlywedsChildList:[],
+      }
+    },
     qrcodelook(url) {
       this.loadingdialog = true
       this.centerDialogVisible = true
@@ -820,7 +830,7 @@ export default {
     Deleteshan(row){
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
-        return delActiveFullminus(ids);
+        return delActiveNewlyweds(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
index 189d92c96..9c288604e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
@@ -108,7 +108,7 @@ public class ActiveNewlywedsController extends BaseController {
      * @return
      */
     @DeleteMapping("delById/{ids}")
-    public ResponseObject delete(@PathVariable Long ids) {
+    public ResponseObject delete(@PathVariable Integer ids) {
         return getSuccessResult(this.activeNewlywedsService.removeById(ids));
     }