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"
>新增
@@ -241,8 +241,9 @@
- 在线
- 下线
+ 进行中
+ 待生效
+ 已结束
@@ -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));
}