Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_vip
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
fmp_vip
Commits
b6bc3ced
Commit
b6bc3ced
authored
Jul 20, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 使用accept()或reject()代替close(). 2. 初始化积分相关变量.
parent
dd7fdb79
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
task/fmtask.cpp
+2
-2
task/taskfund.cpp
+1
-1
task/tasklogin.cpp
+2
-2
task/taskpay.cpp
+1
-1
windows/fmmsgwnd.cpp
+1
-1
windows/fmviporder.h
+2
-2
windows/fmvipwnd.cpp
+1
-1
No files found.
task/fmtask.cpp
View file @
b6bc3ced
...
@@ -61,7 +61,7 @@ void FMTask::stopTask()
...
@@ -61,7 +61,7 @@ void FMTask::stopTask()
preTask
->
stopTask
();
preTask
->
stopTask
();
}
}
if
(
_window
!=
nullptr
)
{
if
(
_window
!=
nullptr
)
{
_window
->
close
();
_window
->
accept
();
_window
=
nullptr
;
_window
=
nullptr
;
}
}
...
@@ -93,7 +93,7 @@ void FMTask::showWindow()
...
@@ -93,7 +93,7 @@ void FMTask::showWindow()
if
(
_window
!=
nullptr
)
{
if
(
_window
!=
nullptr
)
{
_window
->
initWnd
(
this
->
session
());
_window
->
initWnd
(
this
->
session
());
int
ret
=
_window
->
exec
();
int
ret
=
_window
->
exec
();
if
(
ret
==
-
1
)
{
if
(
ret
!=
1
)
{
setError
(
FM_API_WINDOWCLOSE
);
setError
(
FM_API_WINDOWCLOSE
);
}
}
}
}
...
...
task/taskfund.cpp
View file @
b6bc3ced
...
@@ -55,5 +55,5 @@
...
@@ -55,5 +55,5 @@
//void TaskFund::onFund()
//void TaskFund::onFund()
//{
//{
// sendToServer();
// sendToServer();
// _window->
close
();
// _window->
accept
();
//}
//}
task/tasklogin.cpp
View file @
b6bc3ced
...
@@ -56,7 +56,7 @@ void TaskLogin::onLogin()
...
@@ -56,7 +56,7 @@ void TaskLogin::onLogin()
bool
isOk
=
sendToServer
();
bool
isOk
=
sendToServer
();
if
(
!
isOk
)
{
if
(
!
isOk
)
{
if
(
_window
!=
nullptr
)
{
if
(
_window
!=
nullptr
)
{
_window
->
close
();
_window
->
accept
();
}
}
return
;
return
;
}
}
...
@@ -83,7 +83,7 @@ void TaskLogin::onLogin()
...
@@ -83,7 +83,7 @@ void TaskLogin::onLogin()
session
()
->
addData
(
PosProps
.
Amount
,
getServerJsonValue
(
PosProps
.
Amount
).
toInt
());
session
()
->
addData
(
PosProps
.
Amount
,
getServerJsonValue
(
PosProps
.
Amount
).
toInt
());
session
()
->
addData
(
PosProps
.
Score
,
getServerJsonValue
(
PosProps
.
Score
).
toInt
());
session
()
->
addData
(
PosProps
.
Score
,
getServerJsonValue
(
PosProps
.
Score
).
toInt
());
_window
->
close
();
_window
->
accept
();
}
}
if
(
_window
!=
nullptr
)
{
if
(
_window
!=
nullptr
)
{
_window
->
resetWnd
();
_window
->
resetWnd
();
...
...
task/taskpay.cpp
View file @
b6bc3ced
...
@@ -162,5 +162,5 @@ void TaskPay::packagePOSRsp()
...
@@ -162,5 +162,5 @@ void TaskPay::packagePOSRsp()
void
TaskPay
::
onPay
()
void
TaskPay
::
onPay
()
{
{
sendToServer
();
sendToServer
();
_window
->
close
();
_window
->
accept
();
}
}
windows/fmmsgwnd.cpp
View file @
b6bc3ced
...
@@ -88,5 +88,5 @@ void FMMsgWnd::LoginSuccess(const QString &account, const QString &name, const Q
...
@@ -88,5 +88,5 @@ void FMMsgWnd::LoginSuccess(const QString &account, const QString &name, const Q
void
FMMsgWnd
::
on_btn_confirm_clicked
()
void
FMMsgWnd
::
on_btn_confirm_clicked
()
{
{
this
->
close
();
this
->
accept
();
}
}
windows/fmviporder.h
View file @
b6bc3ced
...
@@ -53,7 +53,7 @@ private:
...
@@ -53,7 +53,7 @@ private:
OrderInfo
()
OrderInfo
()
{
{
_amountStr
=
_needPayStr
=
""
;
_amountStr
=
_needPayStr
=
""
;
_amount
=
_score
=
_needPay
=
_maxWillPay
=
_payAmountScore
=
_payAmountCoupon
=
0
;
_amount
=
_score
=
_
payScore
=
_
needPay
=
_maxWillPay
=
_payAmountScore
=
_payAmountCoupon
=
0
;
}
}
OrderInfo
(
QString
amountStr
,
int
score
,
QString
needPayStr
)
OrderInfo
(
QString
amountStr
,
int
score
,
QString
needPayStr
)
{
{
...
@@ -64,7 +64,7 @@ private:
...
@@ -64,7 +64,7 @@ private:
_needPay
=
_needPayStr
.
toInt
()
/
100
.
0
;
_needPay
=
_needPayStr
.
toInt
()
/
100
.
0
;
_score
=
score
;
_score
=
score
;
_maxWillPay
=
_payAmountScore
=
_payAmountCoupon
=
0
;
_
payScore
=
_
maxWillPay
=
_payAmountScore
=
_payAmountCoupon
=
0
;
setMaxWillPay
();
setMaxWillPay
();
}
}
...
...
windows/fmvipwnd.cpp
View file @
b6bc3ced
...
@@ -26,7 +26,7 @@ FMVipWnd::~FMVipWnd()
...
@@ -26,7 +26,7 @@ FMVipWnd::~FMVipWnd()
void
FMVipWnd
::
on_close_btn_clicked
()
void
FMVipWnd
::
on_close_btn_clicked
()
{
{
this
->
done
(
-
1
);
this
->
reject
(
);
}
}
bool
FMVipWnd
::
close
()
bool
FMVipWnd
::
close
()
...
...
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