11.16
This commit is contained in:
@QQNZX
parent
f0342e4544
commit
dde0c7d4ee
@ -45,7 +45,7 @@ export function addActiveRecommend(data) {
|
||||
export function updateActiveRecommend(data) {
|
||||
return request({
|
||||
url: 'business/marketingActivity/activeRecommend',
|
||||
method: 'put',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
@ -78,8 +78,8 @@
|
||||
<el-table-column label="活动状态" align="center" prop="status" >
|
||||
<template slot-scope="scope">
|
||||
|
||||
<span v-if="scope.row.status == 0">启用</span>
|
||||
<span v-if="scope.row.status == 1">禁用</span>
|
||||
<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>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -239,7 +239,6 @@
|
||||
width="80">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.giftCardDetail}}</span>
|
||||
<!-- <span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@ -293,7 +292,6 @@
|
||||
<span>{{scope.row.goodsName}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
prop="count"
|
||||
label="数量"
|
||||
@ -302,7 +300,6 @@
|
||||
<el-input-number v-model="scope.row.goodsTotal" controls-position="right" :min="1" :max="9999"></el-input-number>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="操作"
|
||||
@ -316,10 +313,8 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
@ -336,7 +331,7 @@
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="柴油会员等级" prop="dieselUserLevel">
|
||||
<el-form-item v-if="form.adaptUserType == 2" label="柴油会员等级" prop="dieselUserLevel">
|
||||
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="请选择柴油会员等级">
|
||||
<el-option label="V1会员" value="1"></el-option>
|
||||
<el-option label="V2会员" value="2"></el-option>
|
||||
@ -349,7 +344,7 @@
|
||||
<el-option label="V9会员" value="9"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="汽油会员等级" prop="gasolineUserLevel">
|
||||
<el-form-item v-if="form.adaptUserType == 2" label="汽油会员等级" prop="gasolineUserLevel">
|
||||
<el-select v-model="form.gasolineUserLevel" multiple clearable placeholder="请选择汽油会员等级">
|
||||
<el-option label="V1会员" value="1"></el-option>
|
||||
<el-option label="V2会员" value="2"></el-option>
|
||||
@ -362,7 +357,7 @@
|
||||
<el-option label="V9会员" value="9"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="天然气会员等级" prop="naturalUserLevel">
|
||||
<el-form-item v-if="form.adaptUserType == 2" label="天然气会员等级" prop="naturalUserLevel">
|
||||
<el-select v-model="form.naturalUserLevel" multiple clearable placeholder="请选择天然气会员等级">
|
||||
<el-option label="V1会员" value="1"></el-option>
|
||||
<el-option label="V2会员" value="2"></el-option>
|
||||
@ -390,18 +385,15 @@
|
||||
<el-form-item label="限制次数" prop="limitAcount" v-if="form.participationAcount == 1">
|
||||
<el-input v-model="form.limitAcount" placeholder="请输入限制次数" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="赠送积分" prop="points">
|
||||
|
||||
<el-input-number v-model="form.points" controls-position="right" :min="1" :max="999999"></el-input-number>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否上线" prop="isonline">
|
||||
|
||||
<el-select v-model="form.isonline" 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="form.isonline" clearable placeholder="请选择参与次数类别">-->
|
||||
<!-- <el-option label="上线" value="0"></el-option>-->
|
||||
<!-- <el-option label="下线" value="1"></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
@ -410,7 +402,10 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
|
||||
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
<el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="getlistFavorable" >搜索</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
border
|
||||
@ -461,9 +456,21 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div><pagination
|
||||
v-show="ytotal>0"
|
||||
:total="ytotal"
|
||||
:page.sync="youhuiquan.pageNum"
|
||||
:limit.sync="youhuiquan.pageSize"
|
||||
@pagination="getlistFavorable"
|
||||
/></div>
|
||||
|
||||
</el-dialog>
|
||||
<!-- 兑换券列表-->
|
||||
<el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
<el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="getlistExchange" >搜索</el-button>
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
:data="tableDatadh"
|
||||
@ -513,6 +520,13 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div><pagination
|
||||
v-show="dtotal>0"
|
||||
:total="dtotal"
|
||||
:page.sync="duihuanquan.pageNum"
|
||||
:limit.sync="duihuanquan.pageSize"
|
||||
@pagination="getlistExchange"
|
||||
/></div>
|
||||
</el-dialog>
|
||||
<!-- 实物列表-->
|
||||
<el-dialog title="实物列表" :visible.sync="dialogTableVisiblesw">
|
||||
@ -520,7 +534,6 @@
|
||||
<el-form-item label="选择商品">
|
||||
<el-select v-model="shopdata.goodsId" placeholder="请选择商品" @change="swchange">
|
||||
<el-option :label="item.name" :value="item" v-for="(item,index) in tableDatasw" :key="item.id"></el-option>
|
||||
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="商品数量" prop="nmb" >
|
||||
@ -528,10 +541,11 @@
|
||||
|
||||
</el-form-item>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
|
||||
type="primary"
|
||||
@click="shwdata()"
|
||||
>选择</el-button>
|
||||
>确定</el-button>
|
||||
|
||||
</el-form>
|
||||
|
||||
</el-dialog>
|
||||
@ -555,6 +569,28 @@ export default {
|
||||
tableDatadh:[],//兑换券
|
||||
tableDatasw:[],//实物
|
||||
tableDatas:[],//公共选择区域
|
||||
//请求优惠券列表时的参数
|
||||
youhuiquan:{
|
||||
name:'',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
ytotal:0,
|
||||
//请求兑换券列表时的参数
|
||||
duihuanquan:{
|
||||
name:'',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
total:0
|
||||
},
|
||||
dtotal:0,
|
||||
//请求实物列表时的参数
|
||||
shiwu:{
|
||||
isRecovery:0,
|
||||
page: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
stotal:0,
|
||||
shopdata:{
|
||||
goodsId:'',
|
||||
count:0,
|
||||
@ -689,12 +725,13 @@ export default {
|
||||
},
|
||||
// 请求实物
|
||||
getlistLJGoods(){
|
||||
listLJGoods(this.listFavorablesw).then(res=>{
|
||||
this.tableDatasw = []
|
||||
listLJGoods(this.shiwu).then(res=>{
|
||||
if(res.code==200){
|
||||
console.log( res)
|
||||
this.dialogTableVisiblesw = true
|
||||
this.tableDatasw = res.data.records
|
||||
return
|
||||
this.stotal = res.data.total
|
||||
|
||||
|
||||
}
|
||||
@ -702,22 +739,24 @@ export default {
|
||||
},
|
||||
// 请求兑换券
|
||||
getlistExchange(){
|
||||
listExchange().then(res=>{
|
||||
this.tableDatadh = []
|
||||
listExchange(this.duihuanquan).then(res=>{
|
||||
if(res.code==200){
|
||||
this.dialogTableVisibledh = true
|
||||
this.tableDatadh = res.data.records
|
||||
|
||||
this.dtotal = res.data.total
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
// 请求优惠券
|
||||
getlistFavorable(){
|
||||
|
||||
listFavorable(this.listFavorable).then(res=>{
|
||||
this.tableData = []
|
||||
listFavorable(this.youhuiquan).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.dialogTableVisible = true
|
||||
this.tableData = res.data.records
|
||||
this.ytotal = res.data.total
|
||||
}
|
||||
|
||||
})
|
||||
@ -854,6 +893,12 @@ export default {
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.pdswidlist = []
|
||||
this.form.shiwudata= []
|
||||
this.pddhidlist= []
|
||||
this.tableDatas= []
|
||||
this.pdidlist= []
|
||||
this.form.tableDatas= []
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
@ -889,6 +934,12 @@ export default {
|
||||
updateTime: null,
|
||||
activeConsumptionChildList:[]
|
||||
};
|
||||
this.pdswidlist = []
|
||||
this.form.shiwudata= []
|
||||
this.pddhidlist= []
|
||||
this.tableDatas= []
|
||||
this.pdidlist= []
|
||||
this.form.tableDatas= []
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
@ -913,6 +964,7 @@ export default {
|
||||
this.open = true;
|
||||
this.title = "添加消费有礼活动";
|
||||
},
|
||||
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
@ -939,6 +991,32 @@ export default {
|
||||
|
||||
});
|
||||
},
|
||||
qiyong(row){
|
||||
getActiveConsumption(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.status = 1
|
||||
updateActiveConsumption(data).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
jinyong(row){
|
||||
getActiveConsumption(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.status = 0
|
||||
updateActiveConsumption(data).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
@ -63,8 +63,9 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="活动状态 " align="center" prop="status" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == 0" > 启用</span>
|
||||
<span v-if="scope.row.status == 1" > 禁用</span>
|
||||
<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>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
@ -76,13 +77,14 @@
|
||||
@click="handleUpdate(scope.row)"
|
||||
|
||||
>修改</el-button>
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDeletexia(scope.row)"-->
|
||||
<!-- v-if="scope.row.isonline == 0"-->
|
||||
<!-- >下线</el-button>-->
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDeletexia(scope.row)"
|
||||
v-if="scope.row.isonline == 0"
|
||||
>下线</el-button>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@ -104,10 +106,10 @@
|
||||
<el-form-item label="满减规则" prop="activeDiscountChildList">
|
||||
<div v-for="(item,index) in form.activeDiscountChildList" :key="index" style="width: 100%; display: flex;align-items: center; margin-bottom: 10px ">
|
||||
<div style="width: 25%;display: flex; align-items: center;margin-right: 20px " >
|
||||
<span>满</span><el-input v-model="item.amount" placeholder="多少" style="margin: 0px 10px" /> <span>元</span>
|
||||
<span>满</span> <el-input-number v-model="item.amount" :min="0" :max="99999" label="0"></el-input-number> <span>元</span>
|
||||
</div>
|
||||
<div style="width: 25%;display: flex; align-items: center;">
|
||||
<span>减</span><el-input v-model="item.discount" placeholder="多少" style="margin: 0px 10px" /><span>元</span>
|
||||
<span>打</span> <el-input-number v-model="item.discount" :min="0" :max="10" placeholder="1 ~ 9.9" label=""></el-input-number> <span>折</span>
|
||||
|
||||
</div>
|
||||
<div @click="deleteactiveDiscountChildList(index)">
|
||||
@ -115,8 +117,8 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div @click="addactiveDiscountChildList">
|
||||
<el-button type="primary" icon="el-icon-plus">新增</el-button>
|
||||
<div >
|
||||
<el-button type="primary" icon="el-icon-plus" @click="addactiveDiscountChildList">新增</el-button>
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
@ -196,12 +198,12 @@
|
||||
<el-form-item label="限制次数" prop="limitAcount" v-if="form.participationAcount ==1">
|
||||
<el-input-number v-model="form.limitAcount" placeholder="请输入限制次数" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否上线" prop="isonline">
|
||||
<el-select v-model="form.isonline" 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="form.isonline" clearable placeholder="请选择参与次数类别">-->
|
||||
<!-- <el-option label="上线" value="0"></el-option>-->
|
||||
<!-- <el-option label="下线" value="1"></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
@ -213,6 +215,7 @@
|
||||
|
||||
<script>
|
||||
import { listActiveDiscount, getActiveDiscount, delActiveDiscount, addActiveDiscount, updateActiveDiscount } from "@/api/EventMarketing/activeDiscount";
|
||||
import {getActiveConsumption, updateActiveConsumption} from "@/api/EventMarketing/activeConsumption";
|
||||
|
||||
export default {
|
||||
name: "ActiveDiscount",
|
||||
@ -391,6 +394,45 @@ export default {
|
||||
this.title = "修改折扣营销";
|
||||
});
|
||||
},
|
||||
handleDeletexia(row){
|
||||
getActiveDiscount(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.isonline = 1
|
||||
updateActiveDiscount(data).then(response => {
|
||||
this.$modal.msgSuccess("下线成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
qiyong(row){
|
||||
getActiveDiscount(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.status = 1
|
||||
updateActiveDiscount(data).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
jinyong(row){
|
||||
getActiveDiscount(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.status = 0
|
||||
updateActiveDiscount(data).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
@ -63,8 +63,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="活动状态 " align="center" prop="status" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == 0" > 启用</span>
|
||||
<span v-if="scope.row.status == 1" > 禁用</span>
|
||||
<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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
@ -76,6 +76,13 @@
|
||||
@click="handleUpdate(scope.row)"
|
||||
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDeletexia(scope.row)"
|
||||
v-if="scope.row.isonline == 0"
|
||||
>下线</el-button>
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
@ -105,10 +112,10 @@
|
||||
<el-form-item label="满减规则" prop="activeDiscountChildList">
|
||||
<div v-for="(item,index) in form.activeDiscountChildList" :key="index" style="width: 100%; display: flex;align-items: center; margin-bottom: 10px ">
|
||||
<div style="width: 25%;display: flex; align-items: center;margin-right: 20px " >
|
||||
<span>满</span><el-input v-model="item.amount" placeholder="多少" style="margin: 0px 10px" /> <span>元</span>
|
||||
<span>满</span> <el-input-number v-model="item.amount" :min="0" :max="9999" label="0"></el-input-number> <span>元</span>
|
||||
</div>
|
||||
<div style="width: 25%;display: flex; align-items: center;">
|
||||
<span>减</span><el-input v-model="item.deductionAmount" placeholder="多少" style="margin: 0px 10px" /><span>元</span>
|
||||
<span>减</span> <el-input-number v-model="item.deductionAmount" :min="0" :max="9999" label="0"></el-input-number> <span>元</span>
|
||||
|
||||
</div>
|
||||
<div @click="deleteactiveDiscountChildList(index)">
|
||||
@ -116,8 +123,8 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div @click="addactiveDiscountChildList">
|
||||
<el-button type="primary" icon="el-icon-plus">新增</el-button>
|
||||
<div>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="addactiveDiscountChildList">新增</el-button>
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
@ -197,12 +204,12 @@
|
||||
<el-form-item label="限制次数" prop="limitAcount" v-if="form.participationAcount ==1">
|
||||
<el-input-number v-model="form.limitAcount" placeholder="请输入限制次数" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否上线" prop="isonline">
|
||||
<el-select v-model="form.isonline" 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="form.isonline" clearable placeholder="请选择参与次数类别">-->
|
||||
<!-- <el-option label="上线" value="0"></el-option>-->
|
||||
<!-- <el-option label="下线" value="1"></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
@ -214,6 +221,7 @@
|
||||
|
||||
<script>
|
||||
import { listActiveFullminus, getActiveFullminus, delActiveFullminus, addActiveFullminus, updateActiveFullminus } from "@/api/EventMarketing/activeFullminus";
|
||||
import {getActiveDiscount, updateActiveDiscount} from "@/api/EventMarketing/activeDiscount";
|
||||
|
||||
export default {
|
||||
name: "ActiveFullminus",
|
||||
@ -388,6 +396,45 @@ export default {
|
||||
this.title = "修改满减营销";
|
||||
});
|
||||
},
|
||||
handleDeletexia(row){
|
||||
getActiveFullminus(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.isonline = 1
|
||||
updateActiveFullminus(data).then(response => {
|
||||
this.$modal.msgSuccess("下线成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
qiyong(row){
|
||||
getActiveFullminus(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.status = 1
|
||||
updateActiveFullminus(data).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
jinyong(row){
|
||||
getActiveFullminus(row.id).then(response => {
|
||||
// this.form = response.data;
|
||||
let data = response.data
|
||||
data.status = 0
|
||||
updateActiveFullminus(data).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
@ -281,7 +281,10 @@
|
||||
|
||||
<!-- 优惠券列表-->
|
||||
<el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
|
||||
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
<el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="getlistFavorable" >搜索</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
border
|
||||
@ -332,10 +335,20 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div><pagination
|
||||
v-show="ytotal>0"
|
||||
:total="ytotal"
|
||||
:page.sync="youhuiquan.pageNum"
|
||||
:limit.sync="youhuiquan.pageSize"
|
||||
@pagination="getlistFavorable"
|
||||
/></div>
|
||||
</el-dialog>
|
||||
<!-- 兑换券列表-->
|
||||
<el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">
|
||||
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
<el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="getlistExchange" >搜索</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableDatadh"
|
||||
border
|
||||
@ -384,6 +397,13 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div><pagination
|
||||
v-show="dtotal>0"
|
||||
:total="dtotal"
|
||||
:page.sync="duihuanquan.pageNum"
|
||||
:limit.sync="duihuanquan.pageSize"
|
||||
@pagination="getlistExchange"
|
||||
/></div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
title="二维码"
|
||||
@ -422,6 +442,21 @@ export default {
|
||||
dialogTableVisible:false,//优惠券
|
||||
dialogTableVisibledh:false,//兑换券
|
||||
tableDatas:[],
|
||||
//请求优惠券列表时的参数
|
||||
youhuiquan:{
|
||||
name:'',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
ytotal:0,
|
||||
//请求兑换券列表时的参数
|
||||
duihuanquan:{
|
||||
name:'',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
total:0
|
||||
},
|
||||
dtotal:0,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
@ -549,26 +584,33 @@ export default {
|
||||
updateBy: null,
|
||||
updateTime: null
|
||||
};
|
||||
this.pdidlist = []
|
||||
this.form.tableDatas = []
|
||||
this.pddhidlist = []
|
||||
this.tableDatas = []
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
||||
// 请求兑换券
|
||||
getlistExchange(){
|
||||
listExchange().then(res=>{
|
||||
this.tableDatadh = []
|
||||
listExchange(this.duihuanquan).then(res=>{
|
||||
if(res.code==200){
|
||||
this.dialogTableVisibledh = true
|
||||
this.tableDatadh = res.data.records
|
||||
|
||||
this.dtotal = res.data.total
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
// 请求优惠券
|
||||
getlistFavorable(){
|
||||
|
||||
listFavorable(this.listFavorable).then(res=>{
|
||||
this.tableData = []
|
||||
listFavorable(this.youhuiquan).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.dialogTableVisible = true
|
||||
this.tableData = res.data.records
|
||||
this.ytotal = res.data.total
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
@ -175,7 +175,6 @@
|
||||
<el-form-item label="新用户获得" prop="newuserGiftType">
|
||||
<el-radio-group v-model="ruleForm.newuserGiftType">
|
||||
<el-radio label="0">优惠券</el-radio>
|
||||
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<!-- 新用户-->
|
||||
@ -297,7 +296,10 @@
|
||||
</el-card>
|
||||
<!-- 优惠券列表 - 新用户获得 -->
|
||||
<el-dialog title="优惠券列表" :visible.sync="xdialogTableVisible">
|
||||
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
<el-input v-model="xyouhuiquan.name" placeholder="优惠券名称"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="xgetlistFavorable" >搜索</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="xylist"
|
||||
border
|
||||
@ -348,10 +350,20 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div><pagination
|
||||
v-show="xytotal>0"
|
||||
:total="xytotal"
|
||||
:page.sync="xyouhuiquan.pageNum"
|
||||
:limit.sync="xyouhuiquan.pageSize"
|
||||
@pagination="xgetlistFavorable"
|
||||
/></div>
|
||||
</el-dialog>
|
||||
<!-- 优惠券列表 - 邀请人获得 -->
|
||||
<el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
|
||||
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
<el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="getlistFavorable" >搜索</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="ylist"
|
||||
border
|
||||
@ -402,10 +414,20 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div><pagination
|
||||
v-show="ytotal>0"
|
||||
:total="ytotal"
|
||||
:page.sync="youhuiquan.pageNum"
|
||||
:limit.sync="youhuiquan.pageSize"
|
||||
@pagination="getlistFavorable"
|
||||
/></div>
|
||||
</el-dialog>
|
||||
<!-- 兑换券列表-->
|
||||
<el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">
|
||||
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
<el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="getlistExchange" >搜索</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="dlist"
|
||||
border
|
||||
@ -453,7 +475,16 @@
|
||||
>选择</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
<div><pagination
|
||||
v-show="dtotal>0"
|
||||
:total="dtotal"
|
||||
:page.sync="duihuanquan.pageNum"
|
||||
:limit.sync="duihuanquan.pageSize"
|
||||
@pagination="getlistExchange"
|
||||
/></div>
|
||||
|
||||
</el-dialog>
|
||||
<!-- 添加或修改推荐有礼对话框 -->
|
||||
|
||||
@ -468,6 +499,28 @@ export default {
|
||||
name: "ActiveRecommend",
|
||||
data() {
|
||||
return {
|
||||
//请求优惠券 - 新人 列表时的参数
|
||||
xyouhuiquan:{
|
||||
name:'',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
xytotal:0,
|
||||
//请求优惠券列表时的参数
|
||||
youhuiquan:{
|
||||
name:'',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
ytotal:0,
|
||||
//请求兑换券列表时的参数
|
||||
duihuanquan:{
|
||||
name:'',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
total:0
|
||||
},
|
||||
dtotal:0,
|
||||
imagePath:'http://192.168.0.196:8080/',
|
||||
// 上传地址
|
||||
uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
|
||||
@ -609,33 +662,43 @@ export default {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 获取优惠券
|
||||
getlistFavorable(){
|
||||
listFavorable().then(res=>{
|
||||
if(res.code == 200){
|
||||
this.dialogTableVisible = true
|
||||
this.ylist = res.data.records
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
// 获取优惠券 - 新人有礼
|
||||
xgetlistFavorable(){
|
||||
listFavorable().then(res=>{
|
||||
this.xylist = []
|
||||
listFavorable(this.xyouhuiquan).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.xdialogTableVisible = true
|
||||
this.xylist = res.data.records
|
||||
this.xytotal = res.data.total
|
||||
}
|
||||
})
|
||||
},
|
||||
// 获取兑换券
|
||||
// 请求优惠券
|
||||
getlistFavorable(){
|
||||
this.ylist = []
|
||||
listFavorable(this.youhuiquan).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.dialogTableVisible = true
|
||||
this.ylist = res.data.records
|
||||
this.ytotal = res.data.total
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
// 请求兑换券
|
||||
getlistExchange(){
|
||||
listExchange().then(res=>{
|
||||
this.dlist = []
|
||||
listExchange(this.duihuanquan).then(res=>{
|
||||
if(res.code==200){
|
||||
this.dialogTableVisibledh = true
|
||||
this.dlist = res.data.records
|
||||
this.dtotal = res.data.total
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
// 兑换券券列表选择
|
||||
Favorabledata(row){
|
||||
this.dialogTableVisibledh = false
|
||||
@ -784,7 +847,7 @@ export default {
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
id: 1,
|
||||
chainStoreId: null,
|
||||
storeId: null,
|
||||
activePictureUrl: null,
|
||||
@ -844,7 +907,7 @@ export default {
|
||||
this.ruleForm.activeRecommendChildList = this.ruleForm.ylist.concat(this.ruleForm.dlist,this.ruleForm.xylist);
|
||||
console.log(this.ruleForm.activeRecommendChildList)
|
||||
console.log(this.ruleForm)
|
||||
|
||||
this.ruleForm.id = 1
|
||||
this.$refs["ruleForm"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.ruleForm.id != null) {
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listRecord, getRecord, delRecord, addRecord, updateRecord,cardExchangeRecord } from "@/api/EventMarketing/cardExchangeRecord";
|
||||
import { listRecord,cardExchangeRecord } from "@/api/EventMarketing/cardExchangeRecord";
|
||||
export default {
|
||||
name: 'index',
|
||||
data(){
|
||||
|
||||
Binary file not shown.
52
fuintCashierWeb/src/api/online.js
Normal file
52
fuintCashierWeb/src/api/online.js
Normal file
@ -0,0 +1,52 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 领取记录列表
|
||||
export function listRecord(query) {
|
||||
return request({
|
||||
url: 'business/marketingActivity/cardExchangeRecord',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询兑换券领取记录详细
|
||||
export function getRecord(id) {
|
||||
return request({
|
||||
url: '/system/record/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增兑换券领取记录
|
||||
export function addRecord(data) {
|
||||
return request({
|
||||
url: 'business/marketingActivity/cardExchangeRecord',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改兑换券领取记录
|
||||
export function updateRecord(data) {
|
||||
return request({
|
||||
url: 'business/marketingActivity/cardExchangeRecord',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
// 核销
|
||||
export function cardExchangeRecord(data) {
|
||||
return request({
|
||||
url: 'business/marketingActivity/cardExchangeRecord',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除兑换券领取记录
|
||||
export function delRecord(id) {
|
||||
return request({
|
||||
url: '/system/record/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@ -1,66 +1,184 @@
|
||||
<template>
|
||||
<div class="app-center">
|
||||
<div class="wbai">
|
||||
<el-card class="box-card">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>卡券核销</span>
|
||||
<div style="width: 80% ;margin:0px 20px">
|
||||
<el-input v-model="input" placeholder="请输入会员手机号，兑换券核销码"></el-input>
|
||||
</div>
|
||||
<el-button type="primary" icon="el-icon-search">搜索</el-button>
|
||||
<div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bottom-di">
|
||||
<el-empty :image-size="200" description="请输入检索信息进行搜索~"></el-empty>
|
||||
</div>
|
||||
<div class="center">
|
||||
<el-card style="margin-bottom: 20px">
|
||||
<div style="display: flex; align-items: center">
|
||||
<div style="width: 5%;margin-right: 10px">卡券核销:</div>
|
||||
<div style="width: 80%;">
|
||||
<!-- 17615834396-->
|
||||
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号码"></el-input>
|
||||
</div>
|
||||
<div style="width: 10%;margin-left: 20px">
|
||||
<el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
|
||||
</div>
|
||||
|
||||
</el-card>
|
||||
</div>
|
||||
<div class="wrap-box">
|
||||
<div class="coupon-box" v-for="(item,index) in couponList" :key="index">
|
||||
<div class="box-top">
|
||||
<span>{{item.exchangeName}}</span>
|
||||
</div>
|
||||
<div class="box-title">{{item.name}}</div>
|
||||
<div class="box-hui"><span style="width: 35%">券码:</span> <span>{{item.ticketCode}}</span> </div>
|
||||
<div class="box-hui"><span style="width: 35%">有效期:</span> <span>{{item.outTime}}</span> </div>
|
||||
<div class="box-hui"><span style="width: 35%">获得方式:</span> <span>{{item.exchangeFrom}}</span> </div>
|
||||
<div class="anniu" @click="getcardExchangeRecord(item.id)" >
|
||||
<span>立即核销</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-empty :image-size="300" v-if="total == 0"></el-empty>
|
||||
|
||||
</div>
|
||||
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "WriteOff",
|
||||
data(){
|
||||
return{
|
||||
import { listRecord,cardExchangeRecord } from "@/api/online";
|
||||
export default {
|
||||
name: 'index',
|
||||
data(){
|
||||
return{
|
||||
queryParams : {
|
||||
pageNum: 1,
|
||||
pageSize: 999,
|
||||
cardExchangeId: null,
|
||||
mtStaffId: null,
|
||||
realName: null,
|
||||
staffMobile: null,
|
||||
mtUserId: null,
|
||||
name: null,
|
||||
mobile: null,
|
||||
photo: null,
|
||||
exchangeName: null,
|
||||
ticketCode: null,
|
||||
exchangeFrom: null,
|
||||
status: 0,
|
||||
outTime: null,
|
||||
cancelTime: null,
|
||||
startTime: null,
|
||||
endTime: null,
|
||||
},
|
||||
couponList:[],
|
||||
recordList:[],
|
||||
total:0,
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
getList() {
|
||||
if(!this.queryParams.mobile ){
|
||||
this.$message.error("输入框不能为空")
|
||||
return
|
||||
}
|
||||
this.loading = true;
|
||||
listRecord(this.queryParams).then(response => {
|
||||
this.couponList = response.data.records;
|
||||
this.total = response.data.total
|
||||
if( response.data.total == 0){
|
||||
this.$message.error("未找到兑换券")
|
||||
}else{
|
||||
|
||||
}
|
||||
}
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
getcardExchangeRecord(id){
|
||||
this.$confirm('是否确认核销?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
let data = {
|
||||
id:id,
|
||||
status:1
|
||||
}
|
||||
cardExchangeRecord(data).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.$message.success("核销成功")
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消核销'
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.app-center{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
}
|
||||
.clearfix{
|
||||
width: 100%;
|
||||
align-items: center;
|
||||
display: flex;
|
||||
.center{
|
||||
width: 95%;
|
||||
height: 100vh;
|
||||
margin: 10px;
|
||||
|
||||
}
|
||||
.wrap-box{
|
||||
width: 100%;
|
||||
flex-wrap: wrap;
|
||||
margin-top: 20px;
|
||||
display: flex;
|
||||
}
|
||||
.coupon-box{
|
||||
width: 200px;
|
||||
height: 250px;
|
||||
background: #ffffff;
|
||||
border: 1px solid #eef1f6;
|
||||
border-radius: 2px;
|
||||
margin: 10px;
|
||||
}
|
||||
.box-top{
|
||||
width: 100%;
|
||||
height: 100px;
|
||||
background: #00afff;
|
||||
color: white;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.box-title{
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
box-sizing: border-box;
|
||||
padding: 5px 15px;
|
||||
}
|
||||
.box-hui{
|
||||
box-sizing: border-box;
|
||||
padding: 0px 15px;
|
||||
color: #999999;
|
||||
display: flex;
|
||||
font-size: 12px;
|
||||
}
|
||||
.anniu{
|
||||
box-sizing: border-box;
|
||||
padding: 5px 15px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: #ecf5ff;
|
||||
color: #409EFF;
|
||||
width: 100px;
|
||||
border-radius: 6px;
|
||||
margin: 5px auto;
|
||||
cursor: pointer;
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
input{
|
||||
width: 90%;
|
||||
font-size: 18px;
|
||||
border: none;
|
||||
outline: none;
|
||||
background-color:transparent;
|
||||
}
|
||||
.wbai{
|
||||
width: 100%;
|
||||
}
|
||||
.bottom-di{
|
||||
width: 100%;
|
||||
height: 85vh;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -188,6 +188,9 @@
|
||||
<div class="app-left-box" v-for="(item,index) in tabarr" :class="{'bule': leftindex == index }" :key="index" @click="gocomponents(index,item.path)">
|
||||
<i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
|
||||
</div>
|
||||
<div class="app-left-box" @click="logout">
|
||||
<div style="cursor: pointer;margin-left: 10px">退出登录</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <homeindex v-if="leftindex == 0"></homeindex>-->
|
||||
@ -268,7 +271,7 @@ export default {
|
||||
{name:'积分',icon:'el-icon-s-data',path:'/Integral'},
|
||||
{name:'交班',icon: 'el-icon-s-flag',path:'/Handover'},
|
||||
],
|
||||
leftindex:'',
|
||||
leftindex:0,
|
||||
oilList:[
|
||||
{color:'#e5f0ff'},
|
||||
{color:'#fff2e5'},
|
||||
@ -669,8 +672,17 @@ export default {
|
||||
this.getCartList();
|
||||
}
|
||||
},
|
||||
logout() {
|
||||
this.$router.push( '/' );
|
||||
async logout() {
|
||||
this.$confirm('确定注销并退出系统吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
removeUserId();
|
||||
this.$store.dispatch('LogOut').then(() => {
|
||||
location.href = '/';
|
||||
})
|
||||
}).catch(() => {});
|
||||
},
|
||||
// 发起结算
|
||||
doSettlement() {
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
<button type="button" class="btn" @click="handleLogin()">立即登录</button>
|
||||
</div>
|
||||
<div class="tips">
|
||||
<span>Copyright © 2020-2023 <a target="_blank" href="https://www.fuint.cn">www.fuint.cn</a> 延禾技术 All Rights Reserved.</span>
|
||||
<span>深蓝数科</span>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
@ -137,8 +137,15 @@ export default {
|
||||
Cookies.remove("password");
|
||||
Cookies.remove('rememberMe');
|
||||
}
|
||||
console.log('/homeindex')
|
||||
app.$store.dispatch("Login", this.loginForm).then(() => {
|
||||
app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
|
||||
// app.$router.push({ path: "/homeindex" }).catch(()=>{});
|
||||
this.$router.push({
|
||||
path:"/homeindex",
|
||||
query:{
|
||||
id:0
|
||||
}
|
||||
})
|
||||
}).catch(() => {
|
||||
app.loading = false;
|
||||
if (app.captchaOnOff) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user