|
|
@@ -736,8 +736,15 @@ void CDiandanPageUI::HandleItemSelectMsg(TNotifyUI& msg)
|
|
|
void CDiandanPageUI::HandleTextChangedMsg(TNotifyUI& msg)
|
|
|
{
|
|
|
CDuiString name = msg.pSender->GetName();
|
|
|
+}
|
|
|
|
|
|
+//处理扫码枪捕捉到的扫码信息
|
|
|
+void CDiandanPageUI::HandleTextCapture(std::string content)
|
|
|
+{
|
|
|
+ //能收到这个消息,说明当前没有弹框,如果弹框了消息会被弹框本身拦截不会到MainWnd
|
|
|
+ string a = content;
|
|
|
|
|
|
+ ::MessageBox(NULL, L"111", L"222", MB_OK);
|
|
|
}
|
|
|
|
|
|
void CDiandanPageUI::AddDiandanOrderItemShow(int index)
|
|
|
@@ -2361,7 +2368,7 @@ std::map<string, string> CDiandanPageUI::GetSendorderParams()
|
|
|
|
|
|
void CDiandanPageUI::StartWeixinzhifuShoukuan()
|
|
|
{
|
|
|
- if (m_is_show_shoukuan == true)
|
|
|
+ if (m_is_show_modal_wnd == true)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
@@ -2380,7 +2387,7 @@ void CDiandanPageUI::StartWeixinzhifuShoukuan()
|
|
|
pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
|
|
|
pShoukuanWnd->CenterWindow();
|
|
|
|
|
|
- m_is_show_shoukuan = true;
|
|
|
+ m_is_show_modal_wnd = true;
|
|
|
|
|
|
std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
|
|
|
std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
|
|
|
@@ -2413,13 +2420,13 @@ void CDiandanPageUI::StartWeixinzhifuShoukuan()
|
|
|
|
|
|
delete pShoukuanWnd;
|
|
|
|
|
|
- m_is_show_shoukuan = false;
|
|
|
+ m_is_show_modal_wnd = false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void CDiandanPageUI::StartHuiyuanShoukuan()
|
|
|
{
|
|
|
- if (m_is_show_shoukuan == true)
|
|
|
+ if (m_is_show_modal_wnd == true)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
@@ -2438,7 +2445,7 @@ void CDiandanPageUI::StartHuiyuanShoukuan()
|
|
|
pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
|
|
|
pShoukuanWnd->CenterWindow();
|
|
|
|
|
|
- m_is_show_shoukuan = true;
|
|
|
+ m_is_show_modal_wnd = true;
|
|
|
|
|
|
std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
|
|
|
std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
|
|
|
@@ -2471,14 +2478,14 @@ void CDiandanPageUI::StartHuiyuanShoukuan()
|
|
|
|
|
|
delete pShoukuanWnd;
|
|
|
|
|
|
- m_is_show_shoukuan = false;
|
|
|
+ m_is_show_modal_wnd = false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//开始进行现金收款
|
|
|
void CDiandanPageUI::StartXianjinShoukuan()
|
|
|
{
|
|
|
- if (m_is_show_shoukuan == true)
|
|
|
+ if (m_is_show_modal_wnd == true)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
@@ -2497,7 +2504,7 @@ void CDiandanPageUI::StartXianjinShoukuan()
|
|
|
pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
|
|
|
pShoukuanWnd->CenterWindow();
|
|
|
|
|
|
- m_is_show_shoukuan = true;
|
|
|
+ m_is_show_modal_wnd = true;
|
|
|
|
|
|
std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
|
|
|
std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
|
|
|
@@ -2530,13 +2537,13 @@ void CDiandanPageUI::StartXianjinShoukuan()
|
|
|
|
|
|
delete pShoukuanWnd;
|
|
|
|
|
|
- m_is_show_shoukuan = false;
|
|
|
+ m_is_show_modal_wnd = false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void CDiandanPageUI::StartFulikaShoukuan()
|
|
|
{
|
|
|
- if (m_is_show_shoukuan == true)
|
|
|
+ if (m_is_show_modal_wnd == true)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
@@ -2555,7 +2562,7 @@ void CDiandanPageUI::StartFulikaShoukuan()
|
|
|
pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
|
|
|
pShoukuanWnd->CenterWindow();
|
|
|
|
|
|
- m_is_show_shoukuan = true;
|
|
|
+ m_is_show_modal_wnd = true;
|
|
|
|
|
|
std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
|
|
|
std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
|
|
|
@@ -2588,13 +2595,13 @@ void CDiandanPageUI::StartFulikaShoukuan()
|
|
|
|
|
|
delete pShoukuanWnd;
|
|
|
|
|
|
- m_is_show_shoukuan = false;
|
|
|
+ m_is_show_modal_wnd = false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfpay_id)
|
|
|
{
|
|
|
- if (m_is_show_shoukuan == true)
|
|
|
+ if (m_is_show_modal_wnd == true)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
@@ -2613,7 +2620,7 @@ void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfp
|
|
|
pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
|
|
|
pShoukuanWnd->CenterWindow();
|
|
|
|
|
|
- m_is_show_shoukuan = true;
|
|
|
+ m_is_show_modal_wnd = true;
|
|
|
|
|
|
std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
|
|
|
std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
|
|
|
@@ -2649,7 +2656,7 @@ void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfp
|
|
|
|
|
|
delete pShoukuanWnd;
|
|
|
|
|
|
- m_is_show_shoukuan = false;
|
|
|
+ m_is_show_modal_wnd = false;
|
|
|
}
|
|
|
}
|
|
|
|