1

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -17,14 +17,8 @@ void CMainWnd::Init()
     m_pRestoreBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("restorebtn")));
     m_pMinBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("minbtn")));
 
-    //初始化外卖订单列表
-    COptionUI* waimai_tab = static_cast<COptionUI*>(m_pm.FindControl(_T("main_waimai")));
-
-    if(waimai_tab->IsSelected())
-    {
-        OrderListUI* orderlist = static_cast<OrderListUI*>(m_pm.FindControl(_T("orderlist")));
-        orderlist->Refresh();
-    }
+    OrderListUI* orderlist = static_cast<OrderListUI*>(m_pm.FindControl(_T("orderlist")));
+    orderlist->Refresh();
 
     //初始化设置中心的状态
     InitSettingStatus();
@@ -52,6 +46,9 @@ LRESULT CMainWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl
 
 void CMainWnd::Notify(TNotifyUI& msg)
 {
+	CDuiString name = msg.pSender->GetName();
+	//::MessageBoxW(NULL, name, NULL, MB_OK);
+
     if(msg.sType == _T("windowinit"))
     {
         OnPrepare();
@@ -854,36 +851,8 @@ void CMainWnd::HandleSelectChangeMsg(TNotifyUI& msg)
 {
     CDuiString name = msg.pSender->GetName();
 
-    //先判断主页面的tab
-    if(name == _T("main_waimai"))
-    {
-        CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
-
-        if(pControl && pControl->GetCurSel() != 0)
-        {
-            pControl->SelectItem(0);
-        }
-    }
-    else if(name == _T("main_setting"))
-    {
-        CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
-
-        if(pControl && pControl->GetCurSel() != 2)
-        {
-            pControl->SelectItem(2);
-        }
-    }
-    else if(name == _T("main_contact"))
-    {
-        CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
-
-        if(pControl && pControl->GetCurSel() != 3)
-        {
-            pControl->SelectItem(3);
-        }
-    }
     //判断外卖的tab
-    else if(name == _T("waimai_open_switch") || name == _T("waimai_confirmed_switch") || name == _T("waimai_delivery_switch") || name == _T("waimai_success_switch") || name == _T("waimai_fail_switch") || name == _T("waimai_cancel_switch") || name == _T("waimai_refund_switch"))
+    if(name == _T("waimai_open_switch") || name == _T("waimai_confirmed_switch") || name == _T("waimai_delivery_switch") || name == _T("waimai_success_switch") || name == _T("waimai_fail_switch") || name == _T("waimai_cancel_switch") || name == _T("waimai_refund_switch"))
     {
         OrderListUI* orderlist = static_cast<OrderListUI*>(m_pm.FindControl(_T("orderlist")));
         //切换状态全部重新开始从第1页
@@ -951,8 +920,29 @@ void CMainWnd::HandleSelectChangeMsg(TNotifyUI& msg)
         CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("setting_switch")));
         pControl->SelectItem(5);
     }
+	if (name == _T("main_waimai"))
+	{
+		CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
+
+		if (pControl && pControl->GetCurSel() != 0)
+		{
+			pControl->SelectItem(0);
+		}
+	}
+	else if (name == _T("main_setting"))
+	{
+		CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
+
+		if (pControl && pControl->GetCurSel() != 2)
+		{
+			pControl->SelectItem(2);
+		}
+	}
 }
 
+/*
+ *用于下拉框和radio
+ **/
 void CMainWnd::HandleItemSelectMsg(TNotifyUI& msg)
 {
     CDuiString name = msg.pSender->GetName();
@@ -1485,17 +1475,6 @@ LRESULT CMainWnd::OnLoginOut(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan
 
 void CMainWnd::InitSettingStatus()
 {
-    //显示当前软件版本和登录账号信息
-    CLabelUI* name_version = static_cast<CLabelUI*>(m_pm.FindControl(_T("main_name_version")));
-    std::wstring wsShowName = L"智铺子收银系统 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion());
-
-    std::string last_login_username = CSetting::GetParam("last_login_username");
-    std::wstring wx_last_login_username = CLewaimaiString::UTF8ToUnicode(last_login_username);
-
-    wsShowName += L"（登录账号：" + wx_last_login_username + L"）";
-
-    name_version->SetText(wsShowName.c_str());
-
     CLabelUI* version = static_cast<CLabelUI*>(m_pm.FindControl(_T("setting_version")));
     version->SetText((L"版本号：" + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());