Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
3b4f5a8d
Commit
3b4f5a8d
authored
Sep 14, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式修改
parent
82c23101
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
19 deletions
+17
-19
payMall.vue
src/components/commonPage/payMall.vue
+16
-16
goodlist.vue
src/components/mall/goodlist.vue
+1
-2
admissionStatisticsDetails.vue
src/components/scenicSpot/admissionStatisticsDetails.vue
+0
-1
No files found.
src/components/commonPage/payMall.vue
View file @
3b4f5a8d
<
template
>
<div
class=
"templatePayURL"
style=
"margin-right: 10px;"
>
<div
style=
"color:red;font-size:16px;font-weight:bold;"
>
请不要刷新页面,否则无法支付成功,订单自动取消!支付成功将自动刷新页面!
</div>
<div>
<template
v-if=
"!isShowPic"
>
<div
style=
"margin: 15px 0;"
>
...
...
@@ -26,7 +27,6 @@
<p
class=
"fz12 color333"
>
倒计时
</p>
<p
style=
"color: #E95252; font-weight: bold; font-size: 12px; margin: 8px 0;"
>
{{
descMin
}}
分
{{
descSecond
}}
秒
</p>
</div>
<div
style=
"color:red;font-size:13px;margin-top:50px;"
>
请不要刷新页面,否则无法支付成功,订单自动取消!
</div>
</
template
>
</div>
</div>
...
...
@@ -90,21 +90,21 @@
OrderId
:
this
.
item
.
orderId
}
var
myPay
=
this
.
payWay
;
if
(
myPay
==
3
)
{
myPay
=
2
if
(
myPay
==
3
)
{
myPay
=
2
}
this
.
apipost
(
'OnlinePay_post_CheckOrderPay'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
var
data
=
res
.
data
.
data
;
let
mallMsg
=
{
OrderId
:
this
.
item
.
orderId
,
MerchantsNo
:
data
.
Pay_Order
,
User_Id
:
this
.
item
.
User_Id
,
Out_Trade_No
:
data
.
Trade_Order
,
Transaction_Id
:
data
.
Third_Order
,
PayWay
:
myPay
,
Money
:
this
.
item
.
TotalPrice
,
Remarks
:
"支付赞羊商品订单:"
+
this
.
item
.
orderId
let
mallMsg
=
{
OrderId
:
this
.
item
.
orderId
,
MerchantsNo
:
data
.
Pay_Order
,
User_Id
:
this
.
item
.
User_Id
,
Out_Trade_No
:
data
.
Trade_Order
,
Transaction_Id
:
data
.
Third_Order
,
PayWay
:
myPay
,
Money
:
this
.
item
.
TotalPrice
,
Remarks
:
"支付赞羊商品订单:"
+
this
.
item
.
orderId
}
this
.
mallapipost
(
"/api/AppletOrder/UpdateERPGoodsOrderInfo"
,
mallMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
@@ -113,11 +113,11 @@
this
.
$emit
(
'getGoodList'
);
clearInterval
(
this
.
timer2
);
clearInterval
(
this
.
timer
);
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
})
}
}
},
err
=>
{})
},
descTime
()
{
...
...
@@ -128,7 +128,6 @@
hr
=
hr
>
9
?
hr
:
'0'
+
hr
min
=
min
>
9
?
min
:
'0'
+
min
sec
=
sec
>
9
?
sec
:
'0'
+
sec
console
.
log
(
"min"
,
min
)
// 控制台打印
if
(
this
.
chaTime
>
0
)
{
if
(
hr
>
0
)
{
...
...
@@ -147,11 +146,12 @@
// 一秒后递归
},
//取消清除
clearCount
(){
clearCount
()
{
clearInterval
(
this
.
timer
)
}
},
};
</
script
>
<
style
>
.templatePayURL
.el-input--suffix
.el-input__inner
{
...
...
src/components/mall/goodlist.vue
View file @
3b4f5a8d
...
...
@@ -129,7 +129,7 @@
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"msg.total"
>
</el-pagination>
<el-dialog
title=
"下单"
:visible
.
sync=
"orderDialog"
custom-class=
"order_Dialog"
width=
"400px"
>
<div
style=
"margin-bottom:20px;"
>
<div
style=
"margin-bottom:20px;
font-size:16px;
"
>
{{currentGoodsObj.name}}
</div>
<el-form
label-width=
"80px"
size=
"small"
>
...
...
@@ -660,7 +660,6 @@
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
delete
this
.
AddressMsg
.
position
//删除position 不传到后台
console
.
log
(
"AddressMsg"
,
this
.
AddressMsg
);
this
.
mallapipost
(
"/api/AppletUser/ERPSetUserShippingAddress"
,
this
.
AddressMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
);
...
...
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @
3b4f5a8d
...
...
@@ -285,7 +285,6 @@
{
this
.
LineId
=
this
.
$route
.
query
.
LineId
;
}
console
.
log
(
"this.lineId"
,
this
.
LineId
);
this
.
GuestNum
=
this
.
$route
.
query
.
GuestNum
;
this
.
getList
();
},
...
...
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