Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FMVip_Today
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
FMVip_Today
Commits
298b1ad8
Commit
298b1ad8
authored
Sep 17, 2016
by
NitefllWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.loading和弹窗修改为模态窗口。
2.不再判断用户是否可支付。 3.修复支付金额的类型转换错误。
parent
8dde5e63
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
11 deletions
+8
-11
FMVip/fmmsgwnd.cpp
+1
-1
FMVip/fmvipdispatcher.cpp
+2
-5
FMVip/fmvipfund.cpp
+1
-1
FMVip/fmviplogin.cpp
+1
-1
FMVip/fmviporder.cpp
+1
-1
FMVip/fmviporder.h
+1
-1
FMVip/fmvipwnd.cpp
+1
-1
No files found.
FMVip/fmmsgwnd.cpp
View file @
298b1ad8
...
...
@@ -29,7 +29,7 @@ void FMMsgWnd::show(InfoType type, const QString &info)
break
;
}
ui
->
info_lbl
->
setText
(
info
);
this
->
exec
();
QDialog
::
exec
();
}
void
FMMsgWnd
::
on_ok_btn_clicked
()
...
...
FMVip/fmvipdispatcher.cpp
View file @
298b1ad8
...
...
@@ -236,12 +236,9 @@ void FMVipDispatcher::pay()
FMVipForward
::
instance
()
->
addSessionData
(
"needPay"
,
QString
::
number
(
needPay
));
FMVipForward
::
instance
()
->
addSessionData
(
"standard_amount"
,
QString
::
number
(
standard_amount
));
int
canPay
=
FMVipForward
::
instance
()
->
sessionDataInt
(
"canPay"
);
//
int canPay = FMVipForward::instance()->sessionDataInt("canPay");
if
(
canPay
!=
1
)
{
onDoPost
();
}
else
if
(
!
_vindow
)
{
if
(
!
_vindow
)
{
FMVipOrder
*
order
=
new
FMVipOrder
;
connect
(
order
,
SIGNAL
(
destroyed
(
QObject
*
)),
SLOT
(
onFinished
()));
connect
(
order
,
SIGNAL
(
doPost
()),
SLOT
(
onDoPost
()));
...
...
FMVip/fmvipfund.cpp
View file @
298b1ad8
...
...
@@ -49,6 +49,6 @@ void FMVipFund::on_fund_btn_clicked()
ui
->
fund_btn
->
setEnabled
(
false
);
setIsBusy
(
true
);
emit
doPost
();
setIsBusy
(
true
);
}
FMVip/fmviplogin.cpp
View file @
298b1ad8
...
...
@@ -39,8 +39,8 @@ void FMVipLogin::on_login_btn_clicked()
ui
->
login_btn
->
setEnabled
(
false
);
ui
->
login_edit
->
setEnabled
(
false
);
setIsBusy
(
true
);
emit
doPost
();
setIsBusy
(
true
);
}
void
FMVipLogin
::
on_login_result
(
QNetworkReply
*
reply
)
...
...
FMVip/fmviporder.cpp
View file @
298b1ad8
...
...
@@ -67,8 +67,8 @@ void FMVipOrder::on_pay_btn_clicked()
ui
->
pay_btn
->
setEnabled
(
false
);
ui
->
pay_chk
->
setEnabled
(
false
);
setIsBusy
(
true
);
emit
doPost
();
setIsBusy
(
true
);
}
void
FMVipOrder
::
on_pay_chk_clicked
(
bool
checked
)
...
...
FMVip/fmviporder.h
View file @
298b1ad8
...
...
@@ -62,7 +62,7 @@ private:
QString
getPayAmountStr
(
QString
amountStr
)
{
int
payAmount
=
amountStr
.
toInt
()
*
100
;
double
payAmount
=
amountStr
.
toDouble
()
*
100
;
return
QString
::
number
(
payAmount
);
}
...
...
FMVip/fmvipwnd.cpp
View file @
298b1ad8
...
...
@@ -50,7 +50,7 @@ void FMVipWnd::setIsBusy(const bool isBusy)
{
if
(
isBusy
)
{
loadingWindow
->
show
();
loadingWindow
->
exec
();
}
else
{
loadingWindow
->
hide
();
}
...
...
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