Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pseer
gxpt_web
Commits
d22b201f
Commit
d22b201f
authored
Sep 09, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改后台管理系统
parent
0505e723
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
248 additions
and
152 deletions
+248
-152
index.vue
src/views/system/equityMembersOrder/index.vue
+57
-27
index.vue
src/views/system/equityMembersOrderConfig/index.vue
+5
-0
index.vue
src/views/system/monthlyCardLog/index.vue
+77
-77
index.vue
src/views/system/monthlyCardOrder/index.vue
+0
-0
index.vue
src/views/system/order/index.vue
+1
-1
index.vue
src/views/system/recharge/index.vue
+41
-19
index.vue
src/views/system/secondaryCardLog/index.vue
+2
-2
index.vue
src/views/system/secondaryCardOrder/index.vue
+65
-26
No files found.
src/views/system/equityMembersOrder/index.vue
View file @
d22b201f
...
...
@@ -17,30 +17,30 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!--
</el-form-item>
-->
<
el-form-item
label=
"商户订单号"
prop=
"outTradeNo"
>
<el-input
v-model=
"queryParams.outTradeNo"
clearable
placeholder=
"请输入商户订单号"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
el-form-item
label=
"终端流水号"
prop=
"terminalTrace"
>
<el-input
v-model=
"queryParams.terminalTrace"
clearable
placeholder=
"请输入终端流水号"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
el-form-item
label=
"支付时间"
prop=
"payTime"
>
<el-date-picker
v-model=
"queryParams.payTime"
clearable
placeholder=
"请选择支付时间"
type=
"date"
value-format=
"yyyy-MM-dd"
>
</el-date-picker
>
<
/el-form-item
>
<
!--
<el-form-item
label=
"商户订单号"
prop=
"outTradeNo"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.outTradeNo"-->
<!-- clearable-->
<!-- placeholder="请输入商户订单号"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<
!--
<el-form-item
label=
"终端流水号"
prop=
"terminalTrace"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.terminalTrace"-->
<!-- clearable-->
<!-- placeholder="请输入终端流水号"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<
!--
<el-form-item
label=
"支付时间"
prop=
"payTime"
>
--
>
<!--
<el-date-picker
v-model=
"queryParams.payTime"
--
>
<!-- clearable-->
<!-- placeholder="请选择支付时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">--
>
<!--
</el-date-picker>
--
>
<
!--
</el-form-item>
--
>
<el-form-item
label=
"会员昵称"
prop=
"nickName"
>
<el-input
v-model=
"queryParams.nickName"
...
...
@@ -55,6 +55,18 @@
placeholder=
"请输入会员手机号"
/>
</el-form-item>
<el-form-item
label=
"下单时间"
>
<el-date-picker
v-model=
"dateValue"
:default-time=
"['00:00:00', '23:59:59']"
end-placeholder=
"结束日期"
range-separator=
"至"
start-placeholder=
"开始日期"
type=
"daterange"
value-format=
"yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
icon=
"el-icon-search"
size=
"mini"
type=
"primary"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
...
...
@@ -114,14 +126,15 @@
<el-table
v-loading=
"loading"
:data=
"equityMembersOrderList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
align=
"center"
type=
"selection"
width=
"55"
/>
<!--
<el-table-column
align=
"center"
label=
"ID"
prop=
"id"
/>
-->
<el-table-column
align=
"center"
label=
"权益订单编号"
prop=
"equityOrderNo"
width=
"180"
/>
<el-table-column
align=
"center"
label=
"会员昵称"
prop=
"nickName"
/>
<el-table-column
align=
"center"
label=
"会员头像"
prop=
"avatar"
width=
"100"
>
<template
slot-scope=
"scope"
>
<image-preview
:height=
"50"
:src=
"scope.row.avatar"
:width=
"50"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"会员手机号"
prop=
"phone"
/>
<el-table-column
align=
"center"
label=
"权益订单编号"
prop=
"equityOrderNo"
width=
"190"
/>
<el-table-column
align=
"center"
label=
"会员手机号"
prop=
"phone"
width=
"110"
/>
<el-table-column
align=
"center"
label=
"订单金额"
prop=
"payPrice"
/>
<!-- <el-table-column align="center" label="权益会员订单配置id" prop="equityMembersConfigId"/>-->
<el-table-column
align=
"center"
label=
"支付类型"
prop=
"payType"
>
...
...
@@ -130,12 +143,20 @@
</
template
>
</el-table-column>
<!-- <el-table-column align="center" label="商户订单号" prop="outTradeNo"/>-->
<
el-table-column
align=
"center"
label=
"终端流水号"
prop=
"terminalTrace"
width=
"210"
/
>
<
!-- <el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/>--
>
<el-table-column
align=
"center"
label=
"支付状态"
prop=
"payStatus"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.order_pay_status"
:value=
"scope.row.payStatus"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"下单时间"
prop=
"createTime"
width=
"180"
>
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!-- </template>-->
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
:{s
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"center"
label
=
"支付时间"
prop
=
"payTime"
width
=
"180"
>
<!--
<
template
slot
-
scope
=
"scope"
>-->
<!--
<
span
>
{{
parseTime
(
scope
.
row
.
payTime
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
:{s
}
'
)
}}
<
/span>--
>
...
...
@@ -249,6 +270,7 @@ export default {
title
:
""
,
// 是否显示弹出层
open
:
false
,
dateValue
:
null
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
...
...
@@ -291,6 +313,13 @@ export default {
/** 查询权益会员订单列表 */
getList
()
{
this
.
loading
=
true
;
if
(
this
.
dateValue
&&
this
.
dateValue
.
length
>
0
)
{
this
.
queryParams
.
startDate
=
this
.
dateValue
[
0
];
this
.
queryParams
.
endDate
=
this
.
dateValue
[
1
];
}
else
{
this
.
queryParams
.
startDate
=
null
;
this
.
queryParams
.
endDate
=
null
;
}
listEquityMembersOrder
(
this
.
queryParams
).
then
(
response
=>
{
this
.
equityMembersOrderList
=
response
.
rows
;
this
.
total
=
response
.
total
;
...
...
@@ -331,6 +360,7 @@ export default {
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
dateValue
=
null
;
this
.
handleQuery
();
}
,
// 多选框选中数据
...
...
src/views/system/equityMembersOrderConfig/index.vue
View file @
d22b201f
...
...
@@ -102,6 +102,7 @@
<!--
<el-table-column
align=
"center"
label=
"ID"
prop=
"id"
/>
-->
<el-table-column
align=
"center"
label=
"配置名称"
prop=
"name"
/>
<!--
<el-table-column
align=
"center"
label=
"会员配置id"
prop=
"memberConfigId"
/>
-->
<el-table-column
align=
"center"
label=
"默认会员等级"
prop=
"defaultLevel"
/>
<el-table-column
align=
"center"
label=
"所需金额"
prop=
"requiredAmount"
/>
<el-table-column
align=
"center"
label=
"会员有效期"
prop=
"validityPeriod"
/>
<el-table-column
align=
"center"
label=
"赠送积分"
prop=
"giftPoints"
/>
...
...
@@ -144,6 +145,10 @@
<el-form-item
label=
"会员配置名称"
prop=
"name"
>
<el-input
v-model=
"form.name"
placeholder=
"请输入会员配置名称"
/>
</el-form-item>
<el-form-item
label=
"默认会员等级NP"
prop=
"defaultLevel"
>
<el-input-number
v-model=
"form.defaultLevel"
:max=
"100"
:min=
"0"
/>
<!-- <el-input v-model="form.requiredAmount" placeholder="请输入所需金额"/>-->
</el-form-item>
<el-form-item
label=
"所需金额"
prop=
"requiredAmount"
>
<el-input-number
v-model=
"form.requiredAmount"
:max=
"100"
:min=
"0"
/>
<!-- <el-input v-model="form.requiredAmount" placeholder="请输入所需金额"/>-->
...
...
src/views/system/monthlyCardLog/index.vue
View file @
d22b201f
<
template
>
<div
class=
"app-container"
>
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:inline=
"true"
:model=
"queryParams"
label-width=
"
68
px"
size=
"small"
>
<
el-form-item
label=
"用户月卡id"
prop=
"consumerMonthlyCardId"
>
<el-input
v-model=
"queryParams.consumerMonthlyCardId"
clearable
placeholder=
"请输入用户月卡id"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
el-form-item
label=
"用户ID"
prop=
"consumerId"
>
<el-input
v-model=
"queryParams.consumerId"
clearable
placeholder=
"请输入用户ID"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:inline=
"true"
:model=
"queryParams"
label-width=
"
100
px"
size=
"small"
>
<
!--
<el-form-item
label=
"用户月卡id"
prop=
"consumerMonthlyCardId"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.consumerMonthlyCardId"-->
<!-- clearable-->
<!-- placeholder="请输入用户月卡id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<
!--
<el-form-item
label=
"用户ID"
prop=
"consumerId"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.consumerId"-->
<!-- clearable-->
<!-- placeholder="请输入用户ID"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<el-form-item
label=
"用户手机号"
prop=
"phone"
>
<el-input
v-model=
"queryParams.phone"
...
...
@@ -25,30 +25,30 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<
el-form-item
label=
"使用时长"
prop=
"useDuration"
>
<el-input
v-model=
"queryParams.useDuration"
clearable
placeholder=
"请输入使用时长"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
el-form-item
label=
"剩余时长"
prop=
"residueDuration"
>
<el-input
v-model=
"queryParams.residueDuration"
clearable
placeholder=
"请输入剩余时长"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
el-form-item
label=
"删除标记:1-删除,0-正常"
prop=
"isDelete"
>
<el-input
v-model=
"queryParams.isDelete"
clearable
placeholder=
"请输入删除标记:1-删除,0-正常"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
!--
<el-form-item
label=
"使用时长"
prop=
"useDuration"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.useDuration"-->
<!-- clearable-->
<!-- placeholder="请输入使用时长"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<
!--
<el-form-item
label=
"剩余时长"
prop=
"residueDuration"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.residueDuration"-->
<!-- clearable-->
<!-- placeholder="请输入剩余时长"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<
!--
<el-form-item
label=
"删除标记:1-删除,0-正常"
prop=
"isDelete"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- clearable-->
<!-- placeholder="请输入删除标记:1-删除,0-正常"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<el-form-item>
<el-button
icon=
"el-icon-search"
size=
"mini"
type=
"primary"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
...
...
@@ -56,41 +56,41 @@
</el-form>
<el-row
:gutter=
"10"
class=
"mb8"
>
<
el-col
:span=
"1.5"
>
<el-button
v-hasPermi=
"['system:monthlyCardLog:add']"
icon=
"el-icon-plus"
plain
size=
"mini"
type=
"primary"
@
click=
"handleAdd"
>
新增
</el-button
>
<
/el-col
>
<
el-col
:span=
"1.5"
>
<el-button
v-hasPermi=
"['system:monthlyCardLog:edit']"
:disabled=
"single"
icon=
"el-icon-edit"
plain
size=
"mini"
type=
"success"
@
click=
"handleUpdate"
>
修改
</el-button
>
<
/el-col
>
<
el-col
:span=
"1.5"
>
<el-button
v-hasPermi=
"['system:monthlyCardLog:remove']"
:disabled=
"multiple"
icon=
"el-icon-delete"
plain
size=
"mini"
type=
"danger"
@
click=
"handleDelete"
>
删除
</el-button
>
<
/el-col
>
<
!--
<el-col
:span=
"1.5"
>
--
>
<!--
<el-button-->
<!-- v-hasPermi="['system:monthlyCardLog:add']"-->
<!-- icon="el-icon-plus"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!--
</el-button>
--
>
<
!--
</el-col>
--
>
<
!--
<el-col
:span=
"1.5"
>
--
>
<!--
<el-button-->
<!-- v-hasPermi="['system:monthlyCardLog:edit']"-->
<!-- :disabled="single"-->
<!-- icon="el-icon-edit"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- @click="handleUpdate"-->
<!-- >修改-->
<!--
</el-button>
--
>
<
!--
</el-col>
--
>
<
!--
<el-col
:span=
"1.5"
>
--
>
<!--
<el-button-->
<!-- v-hasPermi="['system:monthlyCardLog:remove']"-->
<!-- :disabled="multiple"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="handleDelete"-->
<!-- >删除-->
<!--
</el-button>
--
>
<
!--
</el-col>
--
>
<el-col
:span=
"1.5"
>
<el-button
v-hasPermi=
"['system:monthlyCardLog:export']"
...
...
@@ -106,7 +106,7 @@
</el-row>
<el-table
v-loading=
"loading"
:data=
"monthlyCardLogList"
@
selection-change=
"handleSelectionChange"
>
<
el-table-column
align=
"center"
type=
"selection"
width=
"55"
/
>
<
!--
<el-table-column
align=
"center"
type=
"selection"
width=
"55"
/>
--
>
<!--
<el-table-column
label=
"主键"
align=
"center"
prop=
"id"
/>
-->
<!--
<el-table-column
label=
"用户月卡id"
align=
"center"
prop=
"consumerMonthlyCardId"
/>
-->
<!--
<el-table-column
label=
"用户ID"
align=
"center"
prop=
"consumerId"
/>
-->
...
...
src/views/system/monthlyCardOrder/index.vue
View file @
d22b201f
This diff is collapsed.
Click to expand it.
src/views/system/order/index.vue
View file @
d22b201f
...
...
@@ -221,7 +221,7 @@
</el-row>
<el-table
v-loading=
"loading"
:data=
"orderList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
v-if=
"columns[0].visible"
align=
"center"
label=
"订单编号"
prop=
"orderNo"
width=
"1
5
0"
/>
<el-table-column
v-if=
"columns[0].visible"
align=
"center"
label=
"订单编号"
prop=
"orderNo"
width=
"1
8
0"
/>
<el-table-column
v-if=
"columns[1].visible"
label=
"订单类型"
align=
"center"
prop=
"orderType"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.store_order_type"
:value=
"scope.row.orderType"
/>
...
...
src/views/system/recharge/index.vue
View file @
d22b201f
<
template
>
<div
class=
"app-container"
>
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:inline=
"true"
:model=
"queryParams"
size=
"small"
>
<el-form-item
label=
"充值
记录
编号"
prop=
"rechargeNo"
>
<el-form-item
label=
"充值
订单
编号"
prop=
"rechargeNo"
>
<el-input
v-model=
"queryParams.rechargeNo"
clearable
placeholder=
"请输入充值
记录
编号"
placeholder=
"请输入充值
订单
编号"
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
...
...
@@ -56,13 +56,25 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"充值时间"
prop=
"rechargeDate"
>
<el-date-picker
v-model=
"queryParams.rechargeDate"
clearable
placeholder=
"请选择充值时间"
type=
"date"
<!--
<el-form-item
label=
"充值时间"
prop=
"rechargeDate"
>
-->
<!--
<el-date-picker
v-model=
"queryParams.rechargeDate"
--
>
<!-- clearable-->
<!-- placeholder="请选择充值时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!--
</el-date-picker>
-->
<!--
</el-form-item>
-->
<el-form-item
label=
"下单时间"
>
<el-date-picker
v-model=
"dateValue"
:default-time=
"['00:00:00', '23:59:59']"
end-placeholder=
"结束日期"
range-separator=
"至"
start-placeholder=
"开始日期"
type=
"daterange"
value-format=
"yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<!--
<el-form-item
label=
"删除标记:1-删除,0-正常"
prop=
"isDelete"
>
-->
<!--
<el-input-->
...
...
@@ -88,14 +100,14 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!--
</el-form-item>
-->
<
el-form-item
label=
"支付时间"
prop=
"payTime"
>
<el-date-picker
v-model=
"queryParams.payTime"
clearable
placeholder=
"请选择支付时间"
type=
"date"
value-format=
"yyyy-MM-dd"
>
</el-date-picker
>
<
/el-form-item
>
<
!--
<el-form-item
label=
"支付时间"
prop=
"payTime"
>
--
>
<!--
<el-date-picker
v-model=
"queryParams.payTime"
--
>
<!-- clearable-->
<!-- placeholder="请选择支付时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">--
>
<!--
</el-date-picker>
--
>
<
!--
</el-form-item>
--
>
<el-form-item>
<el-button
icon=
"el-icon-search"
size=
"mini"
type=
"primary"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
...
...
@@ -156,15 +168,16 @@
<el-table-column
align=
"center"
type=
"selection"
/>
<!--
<el-table-column
align=
"center"
label=
"主键"
prop=
"id"
/>
-->
<!--
<el-table-column
align=
"center"
label=
"商户平台唯一订单号"
prop=
"outTradeNo"
/>
-->
<el-table-column
align=
"center"
label=
"充值订单编号"
prop=
"rechargeNo"
width=
"180"
/>
<el-table-column
align=
"center"
label=
"用户昵称"
prop=
"nickName"
/>
<el-table-column
align=
"center"
label=
"用户头像"
prop=
"avatar"
width=
"100"
>
<template
slot-scope=
"scope"
>
<image-preview
:height=
"50"
:src=
"scope.row.avatar"
:width=
"50"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"用户手机号"
prop=
"phone"
width=
"1
6
0"
/>
<el-table-column
align=
"center"
label=
"充值记录编号"
prop=
"rechargeNo"
width=
"180"
/>
<
el-table-column
align=
"center"
label=
"终端流水号"
prop=
"terminalTrace"
width=
"210"
/
>
<el-table-column
align=
"center"
label=
"用户手机号"
prop=
"phone"
width=
"1
1
0"
/>
<
!-- <el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/>--
>
<el-table-column
align=
"center"
label=
"充值金额"
prop=
"rechargeAmount"
/>
<el-table-column
align=
"center"
label=
"支付方式"
prop=
"payType"
>
<
template
slot-scope=
"scope"
>
...
...
@@ -181,7 +194,7 @@
</el-table-column>
<!-- <el-table-column align="center" label="充值赠送优惠券ID" prop="consumerCouponIds"/>-->
<!-- <el-table-column align="center" label="充值配置表id" prop="rechargeConfId"/>-->
<el-table-column
align=
"center"
label=
"
充值
时间"
prop=
"rechargeDate"
width=
"180"
>
<el-table-column
align=
"center"
label=
"
下单
时间"
prop=
"rechargeDate"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
rechargeDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
:{s
}
'
)
}}
<
/span
>
<
/template
>
...
...
@@ -310,6 +323,7 @@ export default {
title
:
""
,
// 是否显示弹出层
open
:
false
,
dateValue
:
null
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
...
...
@@ -376,6 +390,13 @@ export default {
/** 查询充值记录列表 */
getList
()
{
this
.
loading
=
true
;
if
(
this
.
dateValue
&&
this
.
dateValue
.
length
>
0
)
{
this
.
queryParams
.
startDate
=
this
.
dateValue
[
0
];
this
.
queryParams
.
endDate
=
this
.
dateValue
[
1
];
}
else
{
this
.
queryParams
.
startDate
=
null
;
this
.
queryParams
.
endDate
=
null
;
}
listRecharge
(
this
.
queryParams
).
then
(
response
=>
{
this
.
rechargeList
=
response
.
rows
;
this
.
total
=
response
.
total
;
...
...
@@ -422,6 +443,7 @@ export default {
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
dateValue
=
null
;
this
.
handleQuery
();
}
,
// 多选框选中数据
...
...
src/views/system/secondaryCardLog/index.vue
View file @
d22b201f
...
...
@@ -121,8 +121,8 @@
</el-row>
<el-table
v-loading=
"loading"
:data=
"secondaryCardLogList"
@
selection-change=
"handleSelectionChange"
>
<
el-table-column
align=
"center"
type=
"selection"
width=
"55"
/
>
<
el-table-column
align=
"center"
label=
"主键"
prop=
"id"
/
>
<
!--
<el-table-column
align=
"center"
type=
"selection"
width=
"55"
/>
--
>
<
!--
<el-table-column
align=
"center"
label=
"主键"
prop=
"id"
/>
--
>
<!--
<el-table-column
label=
"用户次卡id"
align=
"center"
prop=
"consumerSecondaryCardId"
/>
-->
<!--
<el-table-column
label=
"用户ID"
align=
"center"
prop=
"consumerId"
/>
-->
<el-table-column
align=
"center"
label=
"用户昵称"
prop=
"nickName"
/>
...
...
src/views/system/secondaryCardOrder/index.vue
View file @
d22b201f
<
template
>
<div
class=
"app-container"
>
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:inline=
"true"
:model=
"queryParams"
label-width=
"100px"
size=
"small"
>
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:inline=
"true"
:model=
"queryParams"
size=
"small"
>
<el-form-item
label=
"订单编号"
prop=
"secondaryCardNo"
>
<el-input
v-model=
"queryParams.secondaryCardNo"
...
...
@@ -9,22 +9,22 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<
el-form-item
label=
"扫呗订单号"
prop=
"outTradeNo"
>
<el-input
v-model=
"queryParams.outTradeNo"
clearable
placeholder=
"请输入扫呗平台唯一订单号"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
el-form-item
label=
"商户订单号"
prop=
"terminalTrace"
>
<el-input
v-model=
"queryParams.terminalTrace"
clearable
placeholder=
"请输入商户订单号"
@
keyup
.
enter
.
native=
"handleQuery"
/
>
<
/el-form-item
>
<
!--
<el-form-item
label=
"扫呗订单号"
prop=
"outTradeNo"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.outTradeNo"-->
<!-- clearable-->
<!-- placeholder="请输入扫呗平台唯一订单号"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<
!--
<el-form-item
label=
"商户订单号"
prop=
"terminalTrace"
>
--
>
<!--
<el-input-->
<!-- v-model="queryParams.terminalTrace"-->
<!-- clearable-->
<!-- placeholder="请输入商户订单号"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />--
>
<
!--
</el-form-item>
--
>
<!--
<el-form-item
label=
"次卡购买金额"
prop=
"secondaryCardAmount"
>
-->
<!--
<el-input-->
<!-- v-model="queryParams.secondaryCardAmount"-->
...
...
@@ -57,13 +57,32 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"支付时间"
prop=
"payTime"
>
<el-date-picker
v-model=
"queryParams.payTime"
<el-form-item
label=
"会员昵称"
prop=
"nickName"
>
<el-input
v-model=
"queryParams.nickName"
clearable
placeholder=
"请选择支付时间"
type=
"date"
placeholder=
"请输入会员昵称"
/>
</el-form-item>
<!--
<el-form-item
label=
"支付时间"
prop=
"payTime"
>
-->
<!--
<el-date-picker
v-model=
"queryParams.payTime"
--
>
<!-- clearable-->
<!-- placeholder="请选择支付时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!--
</el-date-picker>
-->
<!--
</el-form-item>
-->
<el-form-item
label=
"下单时间"
>
<el-date-picker
v-model=
"dateValue"
:default-time=
"['00:00:00', '23:59:59']"
end-placeholder=
"结束日期"
range-separator=
"至"
start-placeholder=
"开始日期"
type=
"daterange"
value-format=
"yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<!--
<el-form-item
label=
"删除标记:1-删除,0-正常"
prop=
"isDelete"
>
-->
<!--
<el-input-->
...
...
@@ -129,15 +148,16 @@
<el-table
v-loading=
"loading"
:data=
"secondaryCardOrderList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
align=
"center"
type=
"selection"
width=
"55"
/>
<!--
<el-table-column
label=
"主键"
align=
"center"
prop=
"id"
/>
-->
<el-table-column
align=
"center"
label=
"订单编号"
prop=
"secondaryCardNo"
width=
"180"
/>
<el-table-column
align=
"center"
label=
"用户昵称"
prop=
"nickName"
/>
<el-table-column
align=
"center"
label=
"用户头像"
prop=
"avatar"
width=
"100"
>
<template
slot-scope=
"scope"
>
<image-preview
:height=
"50"
:src=
"scope.row.avatar"
:width=
"50"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"用户手机号"
prop=
"phone"
width=
"1
6
0"
/>
<el-table-column
align=
"center"
label=
"购买记录编号"
prop=
"secondaryCardNo"
width=
"180"
/>
<
el-table-column
align=
"center"
label=
"扫呗平台唯一订单号"
prop=
"outTradeNo"
width=
"210"
/
>
<el-table-column
align=
"center"
label=
"用户手机号"
prop=
"phone"
width=
"1
1
0"
/>
<
!-- <el-table-column align="center" label="扫呗平台唯一订单号" prop="outTradeNo" width="210"/>--
>
<!-- <el-table-column label="商户订单号" align="center" prop="terminalTrace" />-->
<el-table-column
align=
"center"
label=
"购买金额"
prop=
"secondaryCardAmount"
/>
<el-table-column
align=
"center"
label=
"次卡名称"
prop=
"confName"
/>
...
...
@@ -147,13 +167,23 @@
<!-- <el-table-column label="次卡配置表id" align="center" prop="secondaryCardConfId" />-->
<!-- <el-table-column label="次卡用户ID" align="center" prop="consumerId" />-->
<el-table-column
align=
"center"
label=
"支付方式"
prop=
"payType"
/>
<!-- <el-table-column align="center" label="支付方式" prop="payType"/>-->
<el-table-column
align=
"center"
label=
"支付类型"
prop=
"payType"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.store_pay_ways"
:value=
"scope.row.payType"
/>
</
template
>
</el-table-column>
<!-- <el-table-column label="状态:0-待支付,1-支付成功,2-退款中,3-退款完成" align="center" prop="payStatus" />-->
<el-table-column
align=
"center"
label=
"订单状态"
prop=
"payStatus"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.order_pay_status"
:value=
"scope.row.payStatus"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"下单时间"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
:{s
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"center"
label
=
"支付时间"
prop
=
"payTime"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
payTime
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
:{s
}
'
)
}}
<
/span
>
...
...
@@ -247,7 +277,7 @@ import {
export
default
{
name
:
"SecondaryCardOrder"
,
dicts
:
[
'order_pay_status'
],
dicts
:
[
'order_pay_status'
,
'store_pay_ways'
],
data
()
{
return
{
// 遮罩层
...
...
@@ -268,6 +298,7 @@ export default {
title
:
""
,
// 是否显示弹出层
open
:
false
,
dateValue
:
null
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
...
...
@@ -319,6 +350,13 @@ export default {
/** 查询次卡购买记录列表 */
getList
()
{
this
.
loading
=
true
;
if
(
this
.
dateValue
&&
this
.
dateValue
.
length
>
0
)
{
this
.
queryParams
.
startDate
=
this
.
dateValue
[
0
];
this
.
queryParams
.
endDate
=
this
.
dateValue
[
1
];
}
else
{
this
.
queryParams
.
startDate
=
null
;
this
.
queryParams
.
endDate
=
null
;
}
listSecondaryCardOrder
(
this
.
queryParams
).
then
(
response
=>
{
this
.
secondaryCardOrderList
=
response
.
rows
;
this
.
total
=
response
.
total
;
...
...
@@ -361,6 +399,7 @@ export default {
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
dateValue
=
null
;
this
.
handleQuery
();
}
,
// 多选框选中数据
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment