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-11 15:06:04 +08:00
parent 446cab6fb5
commit 444cf4952d
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -854,7 +854,7 @@ export default {
},
Deleteshan(row){
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除此条新人有礼活动的信息？').then(function() {
return delActiveNewlyweds(ids);
}).then(() => {
this.getList();

49
fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
View File

@ -125,11 +125,15 @@
<!-- <span style="font-size: 20px">推荐有礼</span>-->
<!-- </div>-->
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
<el-form-item label="活动名称" prop="activeName">
<el-input v-model="ruleForm.activeName" placeholder="请输入活动名称" />
</el-form-item>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="left" class="demo-ruleForm" label-width="110px">
<el-row :gutter="20">
<el-col :span="20">
<el-form-item label="活动名称" prop="activeName">
<el-input style="width: 90%" v-model="ruleForm.activeName" placeholder="请输入活动名称" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="活动开始时间" prop="activeStartTime">
<el-date-picker clearable
@ -306,7 +310,7 @@
</el-form-item>
<!-- 新用户-->
<div class="xh-box" >
<div class="xh-box" style="margin-bottom: 20px" >
<div class="box-bt"> <div style="font-size: 16px;font-weight: bold" >新用户获得</div> <div><el-button type="primary" icon="el-icon-plus" @click="gethuodonglist()" >选择活动</el-button> </div> </div>
<div class="box-bt" style="margin-top: 15px" v-if="ruleForm.activeNewName">
<div style="font-size: 16px;font-weight: bold">活动名称：{{ruleForm.activeNewName}} </div>
@ -619,7 +623,12 @@
import { listActiveRecommend, getActiveRecommend, delActiveRecommend, addActiveRecommend, updateActiveRecommend,listFavorable,listExchange } from "@/api/EventMarketing/activeRecommend";
import ImageUpload from '@/components/ImageUpload'
import {getToken} from "@/utils/auth";
import {getActiveNewlyweds, listActiveNewlyweds, updateActiveNewlyweds} from "@/api/EventMarketing/activeNewlyweds";
import {
delActiveNewlyweds,
getActiveNewlyweds,
listActiveNewlyweds,
updateActiveNewlyweds
} from "@/api/EventMarketing/activeNewlyweds";
import {looklook, looklooklook} from "@/api/EventMarketing/activeConsumption";
export default {
name: "ActiveRecommend",
@ -771,10 +780,10 @@ export default {
{ required: true, message: '必填项不能为空', trigger: 'blur' },
],
activeStartTime: [
{ type: 'date', required: true, message: '必填项不能为空', trigger: 'change' },
{ required: true, message: '必填项不能为空', trigger: 'change' },
],
activeEndTime: [
{ type: 'date', required: true, message: '必填项不能为空', trigger: 'change' },
{ required: true, message: '必填项不能为空', trigger: 'change' },
],
activeRule:[
{ required: true, message: '必填项不能为空', trigger: 'blur' },
@ -1148,18 +1157,26 @@ export default {
});
},
handleDeletexia(row){
getActiveRecommend(row.id).then(response => {
// getActiveRecommend(row.id).then(response => {
//
// let data = response.data
// data.isonline = 1
// data.status = 2
// updateActiveRecommend(data).then(response => {
// this.$modal.msgSuccess("下线成功");
//
// this.getactivelist()
// });
//
// });
let data = response.data
data.isonline = 1
data.status = 2
updateActiveRecommend(data).then(response => {
this.$modal.confirm('是否确认下线此条推荐有礼活动的信息？').then(function() {
return updateActiveRecommend({id:row.id,isonline : 1,status : 2});
}).then(() => {
this.$modal.msgSuccess("下线成功");
this.getactivelist()
});
});
}).catch(() => {});
},
/** 提交按钮 */
submitForm() {

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

@ -273,6 +273,7 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
TAccount accountInfoById = accountService.getAccountInfoById(TokenUtil.getNowAccountInfo().getId());
if (ObjectUtil.isNotEmpty(accountInfoById)) activeRecommend.setCreateBy(accountInfoById.getRealName());
//柴油会员等级
if (ObjectUtil.isNotEmpty(activeRecommendDTO.getInviterGiftType()))
activeRecommend.setInviterGiftType(arrayToString(activeRecommendDTO.getInviterGiftType()));
if (activeRecommendDTO.getStatus().equals("0")) activeRecommend.setIsonline("0");
if (activeRecommendDTO.getStatus().equals("2")) activeRecommend.setIsonline("1");