From 5da753063128bc91a10416329c27675ad67d794a Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 7 Mar 2024 11:14:02 +0800
Subject: [PATCH] bug

---
 .../EventMarketing/activeNewlyweds/index.vue  | 21 ++++++++++---------
 .../impl/CardFuelRecordServiceImpl.java       |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index b2449058a..6bf07e664 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -10,12 +10,12 @@
             @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.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="是否在线" prop="isonline">
           <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
             <el-option label="在线" value="0"></el-option>
@@ -241,8 +241,8 @@
 
         <el-table-column label="活动状态 " align="center" prop="status" >
           <template slot-scope="scope">
-            <span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>启用</el-tag > </span>
-            <span style="cursor: pointer;" @click="jinyong(scope.row)" 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>
           </template>
         </el-table-column>
         <el-table-column label="赠送积分" align="center" prop="adaptUserType" >
@@ -568,7 +568,7 @@ export default {
       activeFullminusList: [],
       // 表单参数
       form: {
-        id:1,
+        id:"",
         tableDatas:[],
         courtesyReward:[],
         activeNewlywedsChildList:[],
@@ -880,7 +880,8 @@ export default {
       this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas);
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
+          console.log(this.form)
+          if (this.form.id) {
 
             updateActiveNewlyweds(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
index 9bd39092a..87961fe1d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
@@ -671,6 +671,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         cardFuelRecord.setStoreId(nowAccountInfo.getStoreId());
         List<CardFuelRecordCount> cardFuelRecordCounts = cardFuelRecordMapper.selectFuelRecordCount(cardFuelRecord);
+        int r =1;
         return cardFuelRecordCounts;
     }
 }