bug

fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue

@@ -111,17 +111,17 @@
 <!--                      slot="reference"-->
 <!--                    >上线</el-button>-->
 <!--                  </el-popconfirm>-->
-                  <el-popconfirm
+<!--                  <el-popconfirm-->
-                    style="margin-left: 5px"
+<!--                    style="margin-left: 5px"-->
-                    @confirm="Deletesl(scope.row)"
+<!--                    title="确定删除这条活动配置吗？">-->
-                    title="确定删除这条活动配置吗？">
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
+                      @click="Deletesl(scope.row)"
                       slot="reference"
                     >删除</el-button>
-                  </el-popconfirm>
+<!--                  </el-popconfirm>-->
 
                 </template>
 
@@ -260,7 +260,7 @@
             </el-form-item>
             <div>
             <el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
-              <el-radio-group v-model="form.activeStatus">
+              <el-radio-group v-model="form.activeStatus" :disabled="isOnLine">
                 <el-radio label="1">启用</el-radio>
                 <el-radio label="2">禁用</el-radio>
               </el-radio-group>
@@ -269,7 +269,7 @@
             </div>
             <div>
               <el-form-item label="上线/下线" :label-width="formLabelWidth" prop="activeStatus">
-                <el-radio-group v-model="form.isonline">
+                <el-radio-group v-model="form.isonline" @input="changeIsOnline">
                   <el-radio label="0">上线</el-radio>
                   <el-radio label="1">下线</el-radio>
                 </el-radio-group>
@@ -575,6 +575,7 @@
 <script>
   import { getList,addList,eitList,deleteList,listUserGrade,mmc,deletedelById } from "@/api/EventMarketing/SaveBlock";
   import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
+  import {delLJGoods} from "@/api/convenienceStore/ljgoods";
   export default {
     name: 'index',
     data(){
@@ -660,6 +661,7 @@
           ],
 
         },
+        isOnLine:false,
         form: {
           sort:1,
           groupOriented:'1',
@@ -723,6 +725,14 @@
 
         })
       },
+      changeIsOnline(val){
+        if (this.form.isonline==1) {
+          this.form.activeStatus = '2'
+          this.isOnLine = true
+        }else {
+          this.isOnLine = false
+        }
+      },
       // 兑换券券列表选择
       Favorabledata(row){
         this.dialogTableVisibledh = false
@@ -839,7 +849,11 @@
           this.duihuanquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '2')
 
           this.dialog = true
-
+          if (this.form.isonline==1) {
+            this.isOnLine = true
+          }else {
+            this.isOnLine = false
+          }
         });
       },
 
@@ -868,6 +882,7 @@
         this.duihuanquanlist =[]
       },
       addblock(){
+        this.isOnLine = false
         this.vipname = []
         let data = {
           pageNo:1,
@@ -937,20 +952,22 @@
 
       },
       Deletesl(data){
-
         let resData =  JSON.parse(JSON.stringify(data))
         if(resData.isonline == 0){
           this.$message({
             message: '上线不能删除，需先下线',
-            type: 'success'
+            type: 'error'
           });
           return
         }
 
-        deletedelById(resData.id).then(res=>{
+        this.$modal.confirm('确定删除此条电子储值卡信息？').then(function() {
-          console.log(res)
+          return deletedelById(resData.id);
+        }).then(() => {
+          this.pageNo = 1
           this.getlist()
-        })
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
 
 
       },

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java

@@ -311,6 +311,8 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
             cardValue.setUpdateBy(TokenUtil.getNowAccountInfo().getRealName());
         }
         cardValue.setMembershipLevel(arrayToString(cardValueDTO.getMembershipLevel()));
+        cardValue.setActiveStatus(cardValueDTO.getActiveStatus());
+        cardValue.setIsonline(cardValueDTO.getIsonline());
         update =updateById(cardValue);
         //更新子表数据
         LambdaQueryWrapper<CardValueChild> queryWrapper = new LambdaQueryWrapper<>();

gasStation-uni/pagesMy/Recharge/Recharge.vue

@@ -114,6 +114,7 @@
 		methods: {
 			tapindex(index) {
 				this.tindex = index
+				this.query.pageNo = 1
 				this.list = []
 				if (index == 0) {
 					this.query.recordName = ''