+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/integral/order/pointsCashier.vue b/fuintAdmin/src/views/integral/order/pointsCashier.vue
new file mode 100644
index 000000000..e69b0e5dd
--- /dev/null
+++ b/fuintAdmin/src/views/integral/order/pointsCashier.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单详情
+ 处理订单
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/integral/order/pointsMall.vue b/fuintAdmin/src/views/integral/order/pointsMall.vue
new file mode 100644
index 000000000..6a51a6dc0
--- /dev/null
+++ b/fuintAdmin/src/views/integral/order/pointsMall.vue
@@ -0,0 +1,201 @@
+
+
+ 统计
+
+
+ 笔数
+ 1234
+
+
+
+ 商品数量
+ 12334
+
+
+ 积分
+ 0
+
+
+ 支付总额
+ 0
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待处理/待发货
+
+ 已完成/已发货
+
+ 已拒绝/已退款
+
+
+
+
+
+
+
+
+
+
+ {{ props.row.orderNumber }}
+
+
+
+ {{ props.row.userNo }}
+
+
+ +
+ {{ props.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单详情
+ 处理订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties
index 1aa8a9b12..668ed2f0d 100644
--- a/fuintBackend/configure/dev/application.properties
+++ b/fuintBackend/configure/dev/application.properties
@@ -38,7 +38,7 @@ images.root=C:/fuintV3.0.1/fuintBackend/fuint-application/target/classes
images.path=/static/uploadImages/
# 上传图片服务器域名
-images.upload.url=http://localhost:8080
+images.upload.url=http://localhost:8008
# 上传图片允许的大小（单位：MB）
images.upload.maxSize=5
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
index de71c07e2..1b25f7c6b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
@@ -88,5 +88,17 @@ public class IntegralGiftController extends BaseController {
return getSuccessResult(this.integralGiftService.deleteById(id));
}
+ /**
+ * 单独修改商品的库存
+ * @param id
+ * @param editInventory
+ * @return
+ */
+ @GetMapping("updateInventory")
+ public ResponseObject updateInventory(@Param("id") Integer id,@Param("editInventory") Integer editInventory) {
+ return getSuccessResult(this.integralGiftService.updateInventory(id,editInventory));
+ }
+
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
new file mode 100644
index 000000000..aca5c0f61
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
@@ -0,0 +1,99 @@
+package com.fuint.business.integral.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.integral.entity.IntegralOrders;
+import com.fuint.business.integral.service.IntegralOrdersService;
+import com.fuint.business.integral.vo.IntegralOrdersVO;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 存储兑换订单信息(IntegralOrders)表控制层
+ *
+ * @author makejava
+ * @since 2023-11-07 13:59:23
+ */
+@RestController
+@RequestMapping("business/integral/integralOrders")
+public class IntegralOrdersController extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private IntegralOrdersService integralOrdersService;
+
+ /**
+ * 分页查询
+ *
+ * @param integralOrders 筛选条件
+ * @param pageNo 分页对象
+ * @return 查询结果
+ */
+ @GetMapping("queryByPage")
+ public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+ @Param("integralOrders") IntegralOrders integralOrders) {
+ Page page = new Page(pageNo, pageSize);
+ IPage+
+ +
-
@@ -41,10 +81,10 @@
+
+
会员登录
+
+
+
+
+ ![]()
+ 
+
+
+
+
+
+ {{ member.name }}
+ {{ member.mobile }} +
+ + {{ member.mobile }} +
+
+
+
+
+
+
+ 会员储值账户余额：{{ member.cardBalance }}
+积分余额：{{ member.points }}
+
+
+
+
+
+ 会员等级：{{ getGrade(member.gradeId) }}
+
+
+
+
+ 重置会员
+
-
油品:￥200.00
- 商品:￥0.52
- 合计: ￥200.52
+ 油品:￥{{ oilAmount }}
+ 商品:￥{{ goodsAmount }}
+ 合计: ￥{{ oilAmount + goodsAmount }}
满减活动
@@ -19,15 +59,15 @@
扫码支付
- 394.7
+ {{ oilAmount + goodsAmount }}
找零
- 394.7
+ 0
-
加油员
- 加油员名称
+ 加油员
+ {{ staff.realName }}
-
- ￥349.78
+ ￥{{ oilAmount + goodsAmount }}
优惠合计：5.74元
立即结算
+ 立即结算
-
订单笔数 3件
- 订单金额 ￥2.03
+ 订单笔数 {{ oilTotal }}件
+ 订单金额 ￥{{ oilAmount }}
-
@@ -109,16 +149,26 @@
新增订单
+ 新增订单
解锁
非油商品
-
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.retailPrice }}
+
+
+
- 商品
@@ -128,23 +178,37 @@
操作
-
商品名称
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.name }}
-
0.01
-
+
{{ item.retailPrice }}
+
+
+
-
商品数量 3件
- 商品总额 ￥2.03
+ 商品数量 {{ goodsTotal }}件
+ 商品总额 ￥{{ goodsAmount }}
-
-
{
+ response.data.num = 1
+ this.goodsAmount += response.data.retailPrice
+ this.goodsOrder.push(response.data);
+ this.goodsTotal += 1;
+ })
+ }
+ this.goods = ""
+ },
+ // 立即结算
+ settlement(){
+ this.dialogVisiblej = true
+ },
+ // 新增订单（重置）
+ resetting(){
+ this.oilOrder = [];
+ this.oilTotal = 0;
+ this.oilAmount = 0;
+ },
+ // 获取员工列表
getStaffList(){
queryStaffs().then( response => {
this.staffList = response.data
})
},
- // 订单信息
+ // 油品订单信息
getOilOrder(){
this.dialogVisibleamount = false
this.oilOrder.push(this.form)
+ if (this.select == "元"){
+ this.oilAmount = +this.form.amount + this.oilAmount;
+ }else {
+ this.oilAmount = +(this.form.oilPrice * this.form.amount) + this.oilAmount;
+ }
this.oilTotal += 1;
},
// 选择“元”或“L”
@@ -439,48 +659,24 @@
this.oilNameList = response.data;
})
},
+ // 根据手机号查询会员信息
getUser(){
- getUserVoMobile({mobile:this.userNo}).then( response => {
- this.member = response.data
- // console.log(this.member)
- })
- },
- querySearchAsync(queryString, cb) {
- var restaurants = this.goodsList;
- // console.log(queryString)
- this.goodsList.forEach(item => {
- item.indexOf(queryString)
- })
- },
- handleSelect(item) {
- // console.log(item);
- },
- // 查询商品信息
- queryGoods(val){
- // console.log(this.goods)
- let map = {
- page:1,
- pageSize:40,
- name:this.goods,
- isRecovery:0,
+ if(this.select1=="会员手机号"){
+ getUserVoMobile({mobile:this.userNo}).then( response => {
+ this.member = response.data
+ })
+ }else {
+ getUserVoName({name:this.userNo}).then( response => {
+ this.memberList = response.data
+ })
+ this.dialogVisibleMember = true;
}
- let map1 = {
- page:1,
- pageSize:40,
- goodsNo:this.goods,
- isRecovery:0,
- }
- listLJGoods(map).then( response => {
- if(response.data.records!=null){
- this.goodsList = response.data.records
- }
+ },
+ // 查询所有商品信息
+ getGoods(){
+ listgoods().then( response => {
+ this.goodsList = response.data
})
- listLJGoods(map1).then( response => {
- if(response.data.records!=null){
- this.goodsList = response.data.records
- }
- })
- // console.log(this.goodsList)
},
// 加油金额
refuel(id){
@@ -492,17 +688,24 @@
},
// 确定收款
collection(){
- let map = {
- authCode : this.authCode,
- orderNo : "0000055"
- }
- // console.log(map)
- fyPay(map).then( response => {
- // console.log(response)
+ // JSON.parse()
+ this.map.oilOrder = JSON.stringify(this.oilOrder);
+ this.map.goodsOrder = JSON.stringify(this.goodsOrder);
+ addLJGoods(this.map).then( response => {
+ console.log(response)
})
+ // let map = {
+ // authCode : this.authCode,
+ // orderNo : "0000055"
+ // }
+ // // console.log(map)
+ // fyPay(map).then( response => {
+ // // console.log(response)
+ // })
},
+ // 支付方式
payMethod(payType){
- // console.log(payType)
+ this.map.payType = payType;
},
// 获取支付方式
getPayList(){
@@ -526,7 +729,15 @@
.catch(_ => {});
},
handleChange(value) {
- // console.log(value);
+ let goods = this.goodsOrder;
+ let num = 0;
+ let amount = 0;
+ goods.forEach(item => {
+ num += item.num
+ amount += item.retailPrice*item.num
+ })
+ this.goodsTotal = num;
+ this.goodsAmount = amount;
},
handleClick(tab, event) {
let oilNum = ""
@@ -545,7 +756,7 @@
gocomponents(index){
this.leftindex = index
},
- }
+ },
}
From 2c9cbb0bc6a071bb1b305363cb652532f19285f6 Mon Sep 17 00:00:00 2001
From: user <2602926751@qq.com>
Date: Wed, 8 Nov 2023 09:18:49 +0800
Subject: [PATCH 3/3] 11.6
---
fuintAdmin/package.json | 1 +
.../src/api/EventMarketing/Writeoffrecords.js | 44 +
.../src/api/EventMarketing/cardExchange.js | 2 +-
.../api/EventMarketing/cardExchangeRecord.js | 8 +-
.../EventMarketing/Writeoffrecords/index.vue | 375 +++++++++
.../EventMarketing/cardExchange/index.vue | 756 ++++++++++--------
.../cardExchangeRecord/index.vue | 290 ++-----
.../views/EventMarketing/exchange/index.vue | 396 +++------
.../views/EventMarketing/giftBlock/index.vue | 2 -
.../src/views/EventMarketing/online/index.vue | 74 ++
10 files changed, 1105 insertions(+), 843 deletions(-)
create mode 100644 fuintAdmin/src/api/EventMarketing/Writeoffrecords.js
create mode 100644 fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
create mode 100644 fuintAdmin/src/views/EventMarketing/online/index.vue
diff --git a/fuintAdmin/package.json b/fuintAdmin/package.json
index fd692ebdc..1cdcf947e 100644
--- a/fuintAdmin/package.json
+++ b/fuintAdmin/package.json
@@ -55,6 +55,7 @@
"jsencrypt": "3.0.0-rc.1",
"nprogress": "0.2.0",
"qrcode": "^1.5.3",
+ "qrcodejs2": "0.0.2",
"quill": "1.3.7",
"save": "^2.9.0",
"screenfull": "5.0.2",
diff --git a/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js b/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js
new file mode 100644
index 000000000..85b350419
--- /dev/null
+++ b/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 核销记录列表
+export function listRecord(query) {
+ return request({
+ url: 'business/marketingActivity/cardExchangeRecord/list',
+ 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 delRecord(id) {
+ return request({
+ url: '/system/record/' + id,
+ method: 'delete'
+ })
+}
diff --git a/fuintAdmin/src/api/EventMarketing/cardExchange.js b/fuintAdmin/src/api/EventMarketing/cardExchange.js
index 919268b5d..702e82032 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchange.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchange.js
@@ -29,7 +29,7 @@ export function addExchange(data) {
// 修改兑换券
export function updateExchange(data) {
return request({
- url: '/system/exchange',
+ url: 'business/marketingActivity/cardExchange',
method: 'put',
data: data
})
diff --git a/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js b/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
index a8c78f376..c42209ca9 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
@@ -1,9 +1,9 @@
import request from '@/utils/request'
-// 查询兑换券领取记录列表
+// 领取记录列表
export function listRecord(query) {
return request({
- url: '/system/record/list',
+ url: 'business/marketingActivity/cardExchangeRecord',
method: 'get',
params: query
})
@@ -20,7 +20,7 @@ export function getRecord(id) {
// 新增兑换券领取记录
export function addRecord(data) {
return request({
- url: '/system/record',
+ url: 'business/marketingActivity/cardExchangeRecord',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@ export function addRecord(data) {
// 修改兑换券领取记录
export function updateRecord(data) {
return request({
- url: '/system/record',
+ url: 'business/marketingActivity/cardExchangeRecord',
method: 'put',
data: data
})
diff --git a/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue b/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
new file mode 100644
index 000000000..6be83fd82
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
@@ -0,0 +1,375 @@
+
+
+
清空
+ 清空
取单
挂单
@@ -160,38 +224,30 @@
:close-on-click-modal="false">
-
-
-
-
-
-
-
-
{{ item.name }}
- {{ item.mobile }}
+ {{ item.realName }}
+ {{ item.mobile }}
付款金额
+ 应收金额
- ￥300.00
-
- 汽油
-
+ ￥{{ oilAmount + goodsAmount }}
+
+
+ 合计金额：{{ oilAmount + goodsAmount }}元、优惠合计13.02元
- 赠送金额
-
+
@@ -306,9 +395,11 @@
import {getDicts} from "@/api/dict/data";
import {getOilNameList, getOilNumGun, getOilNumGunById, listOilNumGun} from "@/api/cashier/oilnumgun";
import {fyPay} from "@/api/cashier/pay";
- import {listLJGoods} from "@/api/cashier/ljgoods";
- import {getUserVoMobile} from "@/api/cashier/user";
- import {queryStaffs} from "@/api/cashier/staff";
+ import {getLJGoods, listgoods} from "@/api/cashier/ljgoods";
+ import {getUserVoMobile, getUserVoName} from "@/api/cashier/user";
+ import {queryStaffs, staffInfo} from "@/api/cashier/staff";
+ import {addLJGoods} from "@/api/cashier/oilorder";
+ import {getUserGrade} from "@/api/cashier/usergrade";
export default {
name: "homeindex",
@@ -316,8 +407,16 @@
return{
// 油品订单
oilOrder:[],
+ // 油品金额
+ oilAmount:0,
// 油品订单数
oilTotal:0,
+ // 商品订单
+ goodsOrder:[],
+ // 商品金额
+ goodsAmount:0,
+ // 商品订单数
+ goodsTotal:0,
// 加油金额
rise:[
{value:"￥100"},
@@ -327,6 +426,8 @@
],
// 会员信息
member:{},
+ // 会员列表信息
+ memberList:[],
select1:'会员手机号',
// 会员信息
userNo:"",
@@ -350,6 +451,7 @@
dialogVisiblej: false,
dialogVisiblevip:false,
dialogVisibleamount:false,
+ dialogVisibleMember:false,
activeName: '1',
tabarr:[
{name:'收银台',icon:'el-icon-s-platform'},
@@ -371,28 +473,146 @@
{color:'#ecfae5'},
{color:'#fafafa'}
],
+ restaurants:'',
num: 1,
// 油号名称
oilNameList:'',
// 员工列表
staffList:[],
+ isMember: false,
+ // 员工信息
+ staff:"",
+ map:{
+ // 油品订单
+ oilOrder:"",
+ // 商品订单
+ goodsOrder:"",
+ // 支付方式
+ payType:"",
+ // 油品订单金额
+ oilAmount:"",
+ // 商品订单金额
+ goodsAmount:"",
+ // 油品实付金额
+ oilActualPay:"",
+ // 商品实付金额
+ goodsActualPay:"",
+ // 付款用户
+ payUser:"",
+ // 油品优惠金额
+ oilDiscount:"",
+ // 商品优惠金额
+ goodsDiscount:"",
+ },
+ gradeName:"",
}
},
created() {
this.getPayList();
- this.queryGoods();
this.getOilName();
+ this.getGoods();
+ this.getStaffList();
+ this.getStaff();
},
methods:{
+ // 重置会员
+ resetMember(){
+ this.member = {};
+ this.isMember = false;
+ },
+ // 获取会员等级信息
+ getGrade(id){
+ getUserGrade(id).then( response => {
+ this.gradeName = response.data.name;
+ })
+ return this.gradeName;
+ },
+ // 选择会员
+ chooseUser(){
+ this.dialogVisiblevip = false
+ this.isMember = true;
+ },
+ // 选择会员信息
+ handleChoose(data){
+ this.member = data;
+ this.dialogVisibleMember = false;
+ },
+ // 清空商品订单列表
+ empty(){
+ this.goodsOrder = [];
+ this.goodsTotal = 0;
+ this.goodsAmount = 0;
+ },
+ // 获取当前账户信息
+ getStaff(){
+ staffInfo().then( response => {
+ this.staff = response.data
+ })
+ },
+ // 选择员工信息
+ chooseStaff(data){
+ this.staff = data;
+ },
+ // 删除商品列表信息
+ delGoods(index){
+ this.goodsOrder.splice(index,1)
+ },
+ // 添加商品列表信息
+ changeGoods(val){
+ let result = true;
+ let goods = this.goodsOrder
+ if (this.goodsOrder.length>0){
+ let amount = 0;
+ for (let i = 0; i
+
+
+
+ ![]()
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}
+
+
+
+
+ {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 未使用
+ 已使用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index da6a27248..48f1d993a 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -1,222 +1,190 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
+
+
+
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
-
-
-
- {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
-
-
-
-
+
+
+
+
+
+
+
新增
+
+
+
+ 修改
- 删除
-
-
-
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['system:exchange:edit']"
+ >修改
+
+
+
-
+
+
+
+
+
+ 在线
+ 下线
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+
+ 兑换券
+ 洗车券
+ 洗车卡
+
+
+
+
+ {{scope.row.validity}}天
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+
+ 下线
+
+ 上线
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+ 兑换券
+ 洗车券
+ 洗车卡
+
-
-
+ 天
+
-
-
-
-
-
-
-
+
+
+ 启用
+ 禁用
+
+
+
+
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
index 33d4e6846..88952fcdd 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
@@ -1,231 +1,113 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
搜索
- 重置
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
-
-
-
-
- {{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }}
-
-
+
+
+
+
+
+
+
{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}
-
+
- {{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
-
-
- 修改
- 删除
-
+
+
+ 未使用
+ 已使用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -315,7 +197,7 @@
+
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 64dfe2e25..91d9e1146 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -3,8 +3,6 @@
-
-
diff --git a/fuintAdmin/src/views/EventMarketing/online/index.vue b/fuintAdmin/src/views/EventMarketing/online/index.vue
new file mode 100644
index 000000000..e8b767af2
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/online/index.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+ 卡券核销:
+
+
+
+ 搜索
+
+
+