Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mingPayPc
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
fengzhaoyu
mingPayPc
Commits
50d5f0a4
Commit
50d5f0a4
authored
Oct 14, 2019
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文案修改
parent
31220c9d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
ConsumptionStatistics.vue
...ponents/pages/CanteenManagement/ConsumptionStatistics.vue
+2
-2
MenuManagement.vue
src/components/pages/CanteenManagement/MenuManagement.vue
+1
-1
AccountManagement.vue
src/components/pages/PaymentManagement/AccountManagement.vue
+3
-4
OperationLog.vue
src/components/pages/PaymentManagement/OperationLog.vue
+1
-1
No files found.
src/components/pages/CanteenManagement/ConsumptionStatistics.vue
View file @
50d5f0a4
...
...
@@ -60,7 +60,7 @@ export default {
scopedSlots
:
{
customRender
:
'productIcon'
}
},
{
title
:
'菜名'
,
dataIndex
:
'productName'
,
dataIndex
:
'productName'
},
{
title
:
'价格(元)'
,
dataIndex
:
'productPrice'
,
...
...
@@ -134,7 +134,7 @@ export default {
handleTableChange
(
pagination
,
filters
,
sorter
)
{
this
.
pagination
.
current
=
pagination
.
current
this
.
getStatisticalProductPage
()
}
,
}
}
}
</
script
>
...
...
src/components/pages/CanteenManagement/MenuManagement.vue
View file @
50d5f0a4
...
...
@@ -70,7 +70,7 @@
</div>
</div>
<div
class=
"item"
>
<label></label><div>
*请上传小于5M、16:9像素的PNG、JPG
图片
</div>
<label></label><div>
*请上传小于5M、16:9像素的PNG、JPG
横图
</div>
</div>
</a-modal>
</div>
...
...
src/components/pages/PaymentManagement/AccountManagement.vue
View file @
50d5f0a4
...
...
@@ -49,8 +49,8 @@
{{ cardNo }}
</span>
<span
slot=
"cardStatus"
slot-scope=
"cardStatus, record"
>
<a-badge
v-if=
"record.cardNo
!= ''
&& cardStatus !== 'UNACTIVE'"
status=
"success"
text=
"已绑卡"
/>
<a-badge
v-else-if=
"record.cardNo
!= ''
&& cardStatus === 'UNACTIVE'"
status=
"error"
text=
"已冻结"
/>
<a-badge
v-if=
"record.cardNo && cardStatus !== 'UNACTIVE'"
status=
"success"
text=
"已绑卡"
/>
<a-badge
v-else-if=
"record.cardNo && cardStatus === 'UNACTIVE'"
status=
"error"
text=
"已冻结"
/>
<a-badge
v-else
status=
"default"
text=
"未绑卡"
/>
</span>
<span
slot=
"status"
slot-scope=
"status"
>
...
...
@@ -349,8 +349,7 @@ export default {
this
.
rechargeData
.
orderPrice
=
this
.
form
.
getFieldsValue
().
orderPrice
this
.
rechargeData
.
remark
=
this
.
form
.
getFieldsValue
().
remark
this
.
rechargeData
.
orgId
=
localStorage
.
getItem
(
'orgId'
)
let
rechargeData
=
this
.
$qs
.
stringify
(
this
.
rechargeData
)
$http
.
get
(
`/mingpay/v1/isv/charge/charge?
${
rechargeData
}
`
).
then
((
res
)
=>
{
$http
.
post
(
`/mingpay/v1/isv/charge/charge`
,
this
.
rechargeData
).
then
((
res
)
=>
{
if
(
res
.
data
.
resultCode
===
0
)
{
this
.
form
.
resetFields
()
this
.
$message
.
success
(
res
.
data
.
data
.
message
)
...
...
src/components/pages/PaymentManagement/OperationLog.vue
View file @
50d5f0a4
...
...
@@ -31,7 +31,7 @@ export default {
},
{
title
:
'操作人'
,
dataIndex
:
'createBy'
,
scopedSlots
:
{
customRender
:
'createBy'
}
,
scopedSlots
:
{
customRender
:
'createBy'
}
},
{
title
:
'IP地址'
,
dataIndex
:
'remoteAddr'
...
...
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