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

前端

Browse Source
This commit is contained in:
@QQNZX 2024-02-06 09:10:18 +08:00
parent 7c538e5aab
commit 33575a8e95
8 changed files with 1176 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/.env.development
View File

@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.0.178:8008/'
VUE_APP_SERVER_URL = 'http://192.168.0.196:8081/'

4
fuintAdmin/src/api/EventMarketing/SaveBlock.js
View File

@ -42,9 +42,9 @@ export function eitList(data) {
})
}
//删除列表
export function deleteList(id) {
export function deletedelById(id) {
return request({
url: 'business/marketingActivity/cardValue?idList='+id,
url: 'business/marketingActivity/cardValue/delById?id='+id,
method: 'delete',
})

14
fuintAdmin/src/views/EventMarketing/CardHolder/index.vue
View File

@ -2,48 +2,48 @@
<div class="app-container">
<!-- <el-card style="margin-bottom: 20px">-->
<!-- </el-card>-->
<div class="title">油卡</div>
<div class="title">电子油卡中心</div>
<div class="warp-box">
<div class="k-box" @click="goDetail(1)" >
<div class="img-box" id="img1">
<img src="https://club.liantuobank.com/assets/images/market/32.png" >
</div>
<div class="size-box">
<div class="box-title">储值卡</div>
<div class="box-title">电子储值卡</div>
<div class="js">因为为客户提供更优质的服务取得了突破性进展，“刷卡加油”引领成品油零售市场新潮流</div>
</div>
</div>
<div class="k-box" @click="goDetail(2)">
<div class="img-box" id="img2"> <img src="https://club.liantuobank.com/assets/images/market/12.png" > </div>
<div class="size-box">
<div class="box-title">礼品卡</div>
<div class="box-title">电子礼品卡</div>
<div class="js">顾客沉淀，充值可获指定奖励,满减提升商品销量和店铺流量 </div>
</div>
</div>
<div class="k-box" @click="goDetail(3)">
<div class="img-box" id="img3"> <img src="https://club.liantuobank.com/assets/images/market/11.png" > </div>
<div class="size-box">
<div class="box-title">囤油卡</div>
<div class="box-title">电子囤油卡</div>
<div class="js"> 使用便捷 交易安全 易于管理 节约费用 各地加油 积分增值服务 插卡加油 自动结算 </div>
</div>
</div>
</div>
<!-- 券-->
<div class="title">油券</div>
<div class="title">电子油券中心</div>
<div class="warp-box">
<div class="k-box" @click="goDetail(4)" >
<div class="img-box" id="img4">
<img src="https://club.liantuobank.com/assets/images/market/02.png" >
</div>
<div class="size-box">
<div class="box-title">优惠券</div>
<div class="box-title">电子优惠券</div>
<div class="js">因为为客户提供更优质的服务取得了突破性进展，“刷卡加油”引领成品油零售市场新潮流</div>
</div>
</div>
<div class="k-box" @click="goDetail(5)">
<div class="img-box" id="img5"> <img src="https://club.liantuobank.com/assets/images/market/26.png" > </div>
<div class="size-box">
<div class="box-title">兑换券</div>
<div class="box-title">电子兑换券</div>
<div class="js">顾客沉淀，充值可获指定奖励,满减提升商品销量和店铺流量 </div>
</div>
</div>

1005
fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

222
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -7,6 +7,7 @@
<el-radio-button label="1">已下线</el-radio-button>
</el-radio-group>
</el-card>
<el-card style="margin-bottom: 20px">
<div style="margin-bottom: 10px">
<el-alert
@ -16,55 +17,71 @@
</el-alert>
</div>
<div style="margin: 10px 0px">
<el-button type="primary" icon="el-icon-plus" @click="addblock()">新增储值卡</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addblock()">电子储值卡活动配置</el-button>
</div>
<div class="title_">
电子储值卡活动列表
</div>
<el-table
:data="tableData"
align="center"
style="width: 100%">
<el-table-column
prop="sort"
label="排序"
align="center"
width="110">
</el-table-column>
<el-table-column
prop="groupOriented"
label="面向群体"
label="电子储值卡活动适配对象"
align="center"
width="140">
<template slot-scope="scope">
<span v-if="scope.row.groupOriented == 1">普通群体</span>
<span v-if="scope.row.groupOriented == 2">等级会员</span>
</template>
</el-table-column>
<el-table-column label="活动信息">
<el-table-column label="活动信息" align="center">
<el-table-column
prop="rechargeBalance"
label="充值金额"
align="center"
width="120">
</el-table-column>
<el-table-column
prop="giftBalance"
label="赠送金额"
align="center"
width="120">
</el-table-column>
<el-table-column
prop="points"
label="赠送积分"
align="center"
width="120">
</el-table-column>
<el-table-column
prop="growthValue"
label="赠送成长值"
align="center"
width="120">
</el-table-column>
</el-table-column>
<el-table-column
prop="activeTime"
prop="startTime"
label="活动时间"
align="center"
width="200">
<template slot-scope="scope">
<span v-if="scope.row.activeTime == 1">不限时间</span>
<span v-if="scope.row.activeTime == 2">自定义时间</span>
<span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
</template>
</el-table-column>
<el-table-column
prop="activityProgress"
label="活动进度"
align="center"
width="100">
<template slot-scope="scope">
<span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span>
@ -73,22 +90,23 @@
</template>
</el-table-column>
<el-table-column
prop="paymentValue"
label="支付即充值"
prop="activityProgress"
label="上线/下线"
align="center"
width="100">
<template slot-scope="scope">
<span v-if="scope.row.paymentValue == 1"><el-tag>启用</el-tag></span>
<span v-if="scope.row.paymentValue == 2"><el-tag type="danger">禁用</el-tag></span>
<span v-if="scope.row.isonline == 0"> <el-tag>上线</el-tag></span>
<span v-if="scope.row.isonline == 1"> <el-tag>下线</el-tag></span>
</template>
</el-table-column>
<el-table-column
prop="activeStatus"
label="状态"
label="活动状态"
align="center"
width="80">
<template slot-scope="scope">
<!-- <span v-if="scope.row.activeStatus == 1"> <el-tag>在用</el-tag> </span>-->
<!-- <span v-if="scope.row.activeStatus == 2"> <el-tag type="success">挂失</el-tag> </span>-->
<!-- <span v-if="scope.row.activeStatus == 3"> <el-tag type="danger">停用</el-tag> </span>-->
<el-switch
v-model="scope.row.activeStatus"
:active-value="'1'"
@ -101,47 +119,66 @@
</template>
</el-table-column>
<el-table-column
prop="participationNo"
label="参与次数"
width="110">
<template slot-scope="scope">
<span v-if="scope.row.participationNo == 0">不限制次数</span>
<span v-if="scope.row.participationNo != 0">{{scope.row.participationNo}} 次</span>
</template>
prop="createTime"
label="创建时间"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="sort"
label="排序"
width="110">
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
prop="createBy"
label="操作人"
align="center"
width="150">
</el-table-column>
<el-table-column
prop="date"
label="操作"
align="center"
width="150">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <el-popconfirm-->
<!-- style="margin-left: 5px"-->
<!-- @confirm="handleDelete(scope.row)"-->
<!-- v-if="scope.row.isonline == '0'" title="这是一段内容确定下线吗？">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- slot="reference"-->
<!-- >下线</el-button>-->
<!-- </el-popconfirm>-->
<!-- <el-popconfirm-->
<!-- style="margin-left: 5px"-->
<!-- @confirm="handleDeletes(scope.row)"-->
<!-- v-if="scope.row.isonline == '1'" title="这是一段内容确定上线吗？">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- slot="reference"-->
<!-- >上线</el-button>-->
<!-- </el-popconfirm>-->
<el-popconfirm
style="margin-left: 5px"
@confirm="handleDelete(scope.row)"
v-if="scope.row.isonline == '0'" title="这是一段内容确定下线吗？">
@confirm="Deletesl(scope.row)"
title="这是一段内容确定删除吗？">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
slot="reference"
>下线</el-button>
>删除</el-button>
</el-popconfirm>
</template>
@ -157,19 +194,23 @@
/>
</el-card>
<el-drawer
title="添加-储值卡"
title="电子储值卡活动配置"
:visible.sync="dialog"
size="50%"
ref="drawer"
>
<div class="demo-drawer__content">
<el-form :model="form" :rules="rules" :inline="true" :label-position="labelPosition" >
<el-form-item label="面向群体" prop="groupOriented" :label-width="formLabelWidth" >
<el-radio-group v-model="form.groupOriented">
<el-radio label="1">不限群体</el-radio>
<el-radio label="2">会员等级</el-radio>
</el-radio-group>
</el-form-item>
<div style="display: flex;">
<div style="font-size: 14px;margin-right: 15px;padding-top: 8px;">电子储值卡活动适配对象</div>
<el-form-item label="" prop="groupOriented" :label-width="formLabelWidth" >
<el-radio-group v-model="form.groupOriented">
<el-radio label="1">不限群体</el-radio>
<el-radio label="2">会员等级</el-radio>
</el-radio-group>
</el-form-item>
</div>
<el-row :gutter="20">
<el-col :span="12"> <el-form-item label="会员等级" prop="region" :label-width="formLabelWidth" v-if="form.groupOriented == '2' " >
<el-select v-model="form.membershipLevel" multiple placeholder="会员等级" >
@ -227,23 +268,23 @@
<!-- <el-form-item label="参与次数" :label-width="formLabelWidth">
<el-input-number v-model="form.participationNo" controls-position="right" :min="1" :max="10"></el-input-number>
</el-form-item>-->
<div>
<el-form-item label="员工提成" :label-width="formLabelWidth" prop="employeeCommission">
<el-radio-group v-model="form.employeeCommission">
<el-radio label="1">仅会员首次充值提成</el-radio>
<el-radio label="2">会员每次充值提成</el-radio>
</el-radio-group>
</el-form-item>
</div>
<div>
<el-form-item label="提成类型" :label-width="formLabelWidth" prop="royaltyType">
<el-radio-group v-model="form.royaltyType">
<el-radio label="1">无</el-radio>
<el-radio label="2">按提成金额</el-radio>
<el-radio label="3">按充值金额*提成比例</el-radio>
</el-radio-group>
</el-form-item>
</div>
<!-- <div>-->
<!-- <el-form-item label="员工提成" :label-width="formLabelWidth" prop="employeeCommission">-->
<!-- <el-radio-group v-model="form.employeeCommission">-->
<!-- <el-radio label="1">仅会员首次充值提成</el-radio>-->
<!-- <el-radio label="2">会员每次充值提成</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-form-item label="提成类型" :label-width="formLabelWidth" prop="royaltyType">-->
<!-- <el-radio-group v-model="form.royaltyType">-->
<!-- <el-radio label="1">无</el-radio>-->
<!-- <el-radio label="2">按提成金额</el-radio>-->
<!-- <el-radio label="3">按充值金额*提成比例</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </div>-->
<el-form-item label="提成金额" v-if="form.royaltyType == 2" :label-width="formLabelWidth" prop="amountCommission">
<el-input v-model="form.amountCommission" autocomplete="off">
<template slot="append">元</template>
@ -282,13 +323,17 @@
<el-radio label="2">禁用</el-radio>
</el-radio-group>
</el-form-item>
</div>
<!-- <el-form-item label="支付储值" :label-width="formLabelWidth" prop="paymentValue">
<el-radio-group v-model="form.paymentValue">
<el-radio label="1">启用</el-radio>
<el-radio label="2">禁用</el-radio>
</el-radio-group>
</el-form-item>-->
<div>
<el-form-item label="上线/下线" :label-width="formLabelWidth" prop="activeStatus">
<el-radio-group v-model="form.isonline">
<el-radio label="0">上线</el-radio>
<el-radio label="1">下线</el-radio>
</el-radio-group>
</el-form-item>
</div>
<!-- <el-form-item label="排序" :label-width="formLabelWidth" prop="sort">
<el-input-number v-model="form.sort" controls-position="right" :min="1" :max="10"></el-input-number>
</el-form-item>-->
@ -439,7 +484,7 @@
<div class="demo-drawer__footer">
<el-button @click="cancelForm">取 消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')"
v-if="form.isonline == '0'" >
>
确定</el-button>
</div>
</div>
@ -577,7 +622,7 @@
</template>
<script>
import { getList,addList,eitList,deleteList,listUserGrade,mmc } from "@/api/EventMarketing/SaveBlock";
import { getList,addList,eitList,deleteList,listUserGrade,mmc,deletedelById } from "@/api/EventMarketing/SaveBlock";
import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
export default {
name: 'index',
@ -675,7 +720,7 @@
participationNo:0,
employeeCommission:'1',
royaltyType:'1',
isonline:0,
isonline:'0',
resource:'1',
activeTime:'1',
activeStatus:'1',
@ -866,7 +911,7 @@
paymentValue:'1',
cardValueChildList:[],
fringeBenefit:'',
isonline:0
isonline:'0'
}
this.youhuiquanlist =[]
this.duihuanquanlist =[]
@ -918,6 +963,46 @@
})
},
handleDeletes(data){
let resData = JSON.parse(JSON.stringify(data))
let ddata = {
isonline : "0",
id:resData.id
}
eitList(ddata).then(res=>{
if (res.code === 200){
this.$message({
message: '上线成功',
type: 'success'
});
this.getlist()
}else {
this.$message.error('修改失败');
}
})
},
Deletesl(data){
let resData = JSON.parse(JSON.stringify(data))
if(resData.isonline == 0){
this.$message({
message: '上线不能删除，需先下线',
type: 'success'
});
return
}
deletedelById(resData.id).then(res=>{
console.log(res)
})
},
// this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
// this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
submitForm(){
@ -1003,4 +1088,13 @@
box-sizing: border-box;
padding: 0px 20px;
}
.title_{
width: 100%;
display: flex;
align-items: center;
font-size: 20px;
font-weight: bold;
justify-content: center;
margin-bottom: 20px;
}
</style>

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

@ -41,6 +41,8 @@
@click="handleAdd"
>新增</el-button>
</el-col>
</el-row>

1
fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
View File

@ -77,7 +77,6 @@
<el-input-number v-model="days" :min="1" :max="999" label="描述文字"></el-input-number>
<div style="margin-left: 5px">天 <span style="color: red">(查找最近N天未进行消费的用户)</span> </div>
</div>
</el-form-item>
<!-- 选择优惠券-->

2
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -2,7 +2,7 @@
server.port=8008
env.profile=dev
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
env.properties.path=D:/code/oilSystem/fuintBackend/configure/
env.properties.path=D:/oil/oil/oilSystem/fuintBackend/configure/