From 536428b2c2fcd45e5311f19a7526b52e5481504f Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 13 Jan 2024 15:16:57 +0800 Subject: [PATCH] bug --- fuintCashierWeb/src/api/cashier/oilorder.js | 8 + .../src/api/cashier/user/cardvaluechild.js | 45 + .../src/api/cashier/user/fixinglevel.js | 61 + .../src/api/cashier/userInfoOrder.js | 57 + fuintCashierWeb/src/api/cashier/usergrade.js | 7 + .../views/cashier/vipComponents/vipList.vue | 22 +- fuintCashierWeb/src/views/details/index.vue | 1654 +++++++++-------- .../details/userInfoOrder/balanceRecord.vue | 146 ++ .../details/userInfoOrder/cardValueChild.vue | 300 +++ .../details/userInfoOrder/couponList.vue | 112 ++ .../details/userInfoOrder/goodsOrder.vue | 73 + .../userInfoOrder/growthValueRecord.vue | 49 + .../views/details/userInfoOrder/oilOrder.vue | 85 + .../details/userInfoOrder/pointsRecord.vue | 69 + .../userInfoOrder/refuelMoneyRecord.vue | 50 + 15 files changed, 1961 insertions(+), 777 deletions(-) create mode 100644 fuintCashierWeb/src/api/cashier/user/cardvaluechild.js create mode 100644 fuintCashierWeb/src/api/cashier/user/fixinglevel.js create mode 100644 fuintCashierWeb/src/api/cashier/userInfoOrder.js create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/cardValueChild.vue create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/growthValueRecord.vue create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/oilOrder.vue create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue create mode 100644 fuintCashierWeb/src/views/details/userInfoOrder/refuelMoneyRecord.vue diff --git a/fuintCashierWeb/src/api/cashier/oilorder.js b/fuintCashierWeb/src/api/cashier/oilorder.js index 791e1ab39..f87c1df69 100644 --- a/fuintCashierWeb/src/api/cashier/oilorder.js +++ b/fuintCashierWeb/src/api/cashier/oilorder.js @@ -77,3 +77,11 @@ export function oilOrderList(data) { data: data }) } + +// 根据订单号模糊查询油品订单信息 +export function getOilOrderAllAmount(id) { + return request({ + url: '/business/oilOrder/getAllAmount/'+id, + method: 'get', + }) +} diff --git a/fuintCashierWeb/src/api/cashier/user/cardvaluechild.js b/fuintCashierWeb/src/api/cashier/user/cardvaluechild.js new file mode 100644 index 000000000..4fce8f88c --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/user/cardvaluechild.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 查询子卡信息列表 +export function listCardValueChild(id) { + return request({ + url: 'cardValudChildrens/listPC/'+id, + method: 'get', + }) +} + +// 根据id查询子卡信息 +export function cardValueChildInfo(id) { + return request({ + url: 'cardValudChildrens/'+id, + method: 'get', + }) +} + +// 添加子卡信息 +export function addCardValueChild(data) { + return request({ + url: 'cardValudChildrens', + method: 'post', + data: data, + }) +} + + +// 修改子卡信息 +export function editCardValueChild(data) { + return request({ + url: 'cardValudChildrens/edit', + method: 'put', + data: data, + }) +} + +// 查询子卡订单信息 +export function listCardValueChildOrder(query) { + return request({ + url: 'business/order/cardValueChildOrder/list', + method: 'get', + params:query, + }) +} diff --git a/fuintCashierWeb/src/api/cashier/user/fixinglevel.js b/fuintCashierWeb/src/api/cashier/user/fixinglevel.js new file mode 100644 index 000000000..16847943e --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/user/fixinglevel.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' + +// 查询固定等级列表 +export function listFixingLevel(query) { + return request({ + url: '/business/userManager/fixingLevel/list', + method: 'get', + params: query + }) +} + +// 根据id查询所有固定等级信息 +export function allFixingLevel() { + return request({ + url: '/business/userManager/fixingLevel/allFixingLevel', + method: 'get', + }) +} + +// 查询固定等级详细 +export function getFixingLevel(id) { + return request({ + url: '/business/userManager/fixingLevel/' + id, + method: 'get' + }) +} + +// 根据固定等级名称查询固定等级信息 +export function queryFixingLevel(data) { + return request({ + url: '/business/userManager/fixingLevel/getName', + method: 'post', + data: data + }) +} + +// 新增固定等级 +export function addFixingLevel(data) { + return request({ + url: '/business/userManager/fixingLevel', + method: 'post', + data: data + }) +} + +// 修改固定等级 +export function updateFixingLevel(data) { + return request({ + url: '/business/userManager/fixingLevel', + method: 'put', + data: data + }) +} + +// 删除固定等级 +export function delFixingLevel(id) { + return request({ + url: '/business/userManager/fixingLevel/' + id, + method: 'delete' + }) +} diff --git a/fuintCashierWeb/src/api/cashier/userInfoOrder.js b/fuintCashierWeb/src/api/cashier/userInfoOrder.js new file mode 100644 index 000000000..5d3fad283 --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/userInfoOrder.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + + +// 加油订单 +export function getOilOrderList(query) { + return request({ + url: 'business/oilOrder/userOrders2', + method: 'get', + params: query + }) + } + +// 商品订单 +export function getMtOrderList(query) { + return request({ + url: 'business/order/getMtOrderList', + method: 'get', + params: query + }) + } + +// 余额记录 +export function getCardRecordList(query) { + return request({ + url: '/business/CardBalanceChange/getCardRecordList', + method: 'get', + params: query + }) + } + +// 屯油卡 +export function getFuelRecordList(query) { + return request({ + url: 'business/marketingActivity/cardFuelChange/getFuelRecordList', + method: 'get', + params: query + }) + } + +// 积分记录 +export function getIntegralDetailList(query) { + return request({ + url: 'business/integral/integralDetail/queryByPageUni2', + method: 'get', + params: query + }) + } + +// 卡券列表 +export function getCardFavorableList(query) { + return request({ + url: 'business/marketingActivity/cardFavorableRecord/getCardFavorableList', + method: 'get', + params: query + }) + } +// 成长值记录 diff --git a/fuintCashierWeb/src/api/cashier/usergrade.js b/fuintCashierWeb/src/api/cashier/usergrade.js index 5757a43cd..f2c733743 100644 --- a/fuintCashierWeb/src/api/cashier/usergrade.js +++ b/fuintCashierWeb/src/api/cashier/usergrade.js @@ -60,3 +60,10 @@ export function delUserGrade(id) { method: 'delete' }) } +// 查询会员等级详细 +export function getUserGradeInfo(id) { + return request({ + url: '/business/userManager/userGrade/userGradeInfo/' + id, + method: 'get' + }) +} diff --git a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue index 4b38789fb..2c7d2f041 100644 --- a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue +++ b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue @@ -1,24 +1,12 @@