dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-07 11:14:02 +08:00
parent d9d69baff5
commit 5da7530631
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -10,12 +10,12 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态"> <!-- <el-form-item label="状态">-->
<el-select v-model="queryParams.status" clearable placeholder="请选择活动状态"> <!-- <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">-->
<el-option label="启用" value="0"></el-option> <!-- <el-option label="启用" value="0"></el-option>-->
<el-option label="禁用" value="1"></el-option> <!-- <el-option label="禁用" value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="是否在线" prop="isonline"> <el-form-item label="是否在线" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线"> <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
<el-option label="在线" value="0"></el-option> <el-option label="在线" value="0"></el-option>
@ -241,8 +241,8 @@
<el-table-column label="活动状态 " align="center" prop="status" > <el-table-column label="活动状态 " align="center" prop="status" >
<template slot-scope="scope"> <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;" 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 == 1"> <el-tag type="danger">下线</el-tag> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="赠送积分" align="center" prop="adaptUserType" > <el-table-column label="赠送积分" align="center" prop="adaptUserType" >
@ -568,7 +568,7 @@ export default {
activeFullminusList: [], activeFullminusList: [],
// 表单参数 // 表单参数
form: { form: {
id:1, id:"",
tableDatas:[], tableDatas:[],
courtesyReward:[], courtesyReward:[],
activeNewlywedsChildList:[], activeNewlywedsChildList:[],
@ -880,7 +880,8 @@ export default {
this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas); this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas);
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { console.log(this.form)
if (this.form.id) {
updateActiveNewlyweds(this.form).then(response => { updateActiveNewlyweds(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -671,6 +671,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
cardFuelRecord.setStoreId(nowAccountInfo.getStoreId()); cardFuelRecord.setStoreId(nowAccountInfo.getStoreId());
List<CardFuelRecordCount> cardFuelRecordCounts = cardFuelRecordMapper.selectFuelRecordCount(cardFuelRecord); List<CardFuelRecordCount> cardFuelRecordCounts = cardFuelRecordMapper.selectFuelRecordCount(cardFuelRecord);
int r =1;
return cardFuelRecordCounts; return cardFuelRecordCounts;
} }
} }