diff --git a/fuintAdmin/src/api/EventMarketing/activeRecommend.js b/fuintAdmin/src/api/EventMarketing/activeRecommend.js index cbaf12c49..9f6447558 100644 --- a/fuintAdmin/src/api/EventMarketing/activeRecommend.js +++ b/fuintAdmin/src/api/EventMarketing/activeRecommend.js @@ -45,7 +45,7 @@ export function addActiveRecommend(data) { export function updateActiveRecommend(data) { return request({ url: 'business/marketingActivity/activeRecommend', - method: 'put', + method: 'post', data: data }) } diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index ffc398b1c..8a8da070b 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -78,8 +78,8 @@ @@ -239,7 +239,6 @@ width="80"> {{scope.row.goodsName}} - - - - - + @@ -349,7 +344,7 @@ - + @@ -362,7 +357,7 @@ - + @@ -390,18 +385,15 @@ - - - - - - - - - + + + + + +
确 定 @@ -410,7 +402,10 @@
- +
+ + 搜索 +
+
+ +
+ + 搜索 +
+
@@ -520,7 +534,6 @@ - @@ -528,10 +541,11 @@ 选择 + >确定 + @@ -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() { diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index e7868b183..216d04e31 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -24,7 +24,7 @@ 搜索 - 重置 + @@ -63,8 +63,9 @@ @@ -76,13 +77,14 @@ @click="handleUpdate(scope.row)" >修改 - - - - - - - + 下线 + @@ -104,10 +106,10 @@
- 满 元 + 满 元
- 减元 + 打 折
@@ -115,8 +117,8 @@
-
- 新增 +
+ 新增
@@ -196,12 +198,12 @@ - - - - - - + + + + + +
确 定 @@ -213,6 +215,7 @@ diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue index b8c62ee5d..222eccab5 100644 --- a/fuintCashierWeb/src/views/cashier/index.vue +++ b/fuintCashierWeb/src/views/cashier/index.vue @@ -188,6 +188,9 @@
{{item.name}}
+
+
退出登录
+
@@ -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() { diff --git a/fuintCashierWeb/src/views/login/index.vue b/fuintCashierWeb/src/views/login/index.vue index 0a7f0dffb..a87274387 100644 --- a/fuintCashierWeb/src/views/login/index.vue +++ b/fuintCashierWeb/src/views/login/index.vue @@ -40,7 +40,7 @@
- Copyright © 2020-2023 www.fuint.cn 延禾技术 All Rights Reserved. + 深蓝数科
@@ -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) {