Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
takeout_sbk
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
yunpeng.song
takeout_sbk
Commits
f69bbf79
Commit
f69bbf79
authored
Feb 26, 2019
by
wuyang.zou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug: 处理录单异常订单,在订单详情界面,此时有新订单入机,会最小化主界面,但是订单详情界面仍然显示,此时在点击重新录单会导致外卖插件程序闪退;
parent
16452743
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
fmTakeout/detailForm.cpp
+1
-2
fmTakeout/mainForm.cpp
+4
-1
No files found.
fmTakeout/detailForm.cpp
View file @
f69bbf79
...
...
@@ -315,8 +315,7 @@ void DetailForm::on_detailBtn0_clicked()
QLOG_INFO
()
<<
QString
(
"[<<<<---DetailForm::on_detailBtn0_clicked: begin:--->>>>]"
)
<<
QString
(
"重新录单"
)
<<
m_orderObject
->
id
;
if
(
m_orderObject
)
{
emit
processReTryInputOrder
(
m_orderObject
->
id
);
this
->
close
();
//this->destroy();
this
->
hide
();
}
else
{
QLOG_ERROR
()
<<
QString
(
"[<<<<---DetailForm::on_detailBtn0_clicked: m_orderObject point is NULL--->>>>]"
);
}
...
...
fmTakeout/mainForm.cpp
View file @
f69bbf79
#
include
"mainForm.h"
#
include
"mainForm.h"
#include "QsLog.h"
#include "ui_mainForm.h"
#include "preDefine.h"
...
...
@@ -222,6 +222,9 @@ void MainForm::on_mainBtnHide_clicked()
hide
();
ui
->
mainEdtSearch
->
clear
();
m_padForm
->
hide
();
if
(
m_detailForm
){
m_detailForm
->
hide
();
}
showFloatForm
();
}
...
...
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