1

bin/Win32/Debug/zhipuzi_pos_windows/skin/chufang_printer_setting.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="800,600" caption="0,0,0,36" roundcorner="4,4" shadowsize="3" showshadow="true">
-	<VerticalLayout bkimage="file='Dialog_BG1.png' corner='4,50,4,4'">
-		<HorizontalLayout height="40" inset="10,2,10,0">
-			<Label name="chufang_setting_title" text="新建厨房打印机" width="100" />
-			<Control />
-			<Button name="chufang_setting_closebtn" padding="0,4,0,0" width="22" height="22" tooltip="关闭" normalimage="file='Login_TopBar_Close_Btn.png'" hotimage="file='Login_TopBar_Close_Btn_Hover.png'" pushedimage="file='Login_TopBar_Close_Btn_Click.png'"/>
+<Window size="800,600" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
+	<VerticalLayout bkimage="shoukuan_bkg.png" >
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+			<Label name="chufang_setting_title" text="新建厨房打印机" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
+			<Button name="chufang_setting_closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
-		<VerticalLayout inset="15,0,15,15" vscrollbar="true" >
+
+		<VerticalLayout inset="10,0,0,10" vscrollbar="true" >
 			<Control height="20" />
 
 			<HorizontalLayout height="56">

bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_page.xml

@@ -9,18 +9,13 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-			<VerticalLayout width="420" bkcolor="#FFFFFFFF">
-				<Label text="请输入会员手机号" heiht="30" padding="43,20,10,10"></Label>
-				
-				<HorizontalLayout height="50">
-					<Button name="huiyuan_page_shoujihao_edit" text="请输入会员手机号搜索" width="220" height="50" padding="43,0,0,10" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+			<VerticalLayout width="420" bkcolor="#FFFFFFFF">				
+				<Edit name="huiyuan_page_shoujihao_edit" tipvalue="请输入会员手机号搜索" width="390" height="50" padding="15,25,15,15" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+					
+				<Button name="huiiyuan_page_sousuo_btn" width="390" height="50" padding="15,0,15,15" text="搜索" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
 
-					<!--
-					<Edit name="huiyuan_page_shoujihao_edit" tooltip="请输入会员手机号搜索" width="220" height="50" padding="43,0,0,10" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					-->
-					<Button name="huiiyuan_page_sousuo_btn" width="120" height="40" padding="15,0,0,0" text="搜索" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
-				</HorizontalLayout>
 				
+				<!--
 				<HorizontalLayout width="340" height="416" bkcolor="#FFF3F3F3" padding="40,15,40,10">
 					<Button name="jianpan_1" text="1" font="0" heiht="60" width="60" float="true" pos="10,10,110,100" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
 					<Button name="jianpan_2" text="2" font="0" heiht="60" width="60" float="true" pos="120,10,220,100" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
@@ -38,14 +33,15 @@
 					<Button name="jianpan_0" text="0" font="0" heiht="60" width="60" float="true" pos="120,310,220,400" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
 					<Button name="jianpan_x" text="X" font="0" heiht="60" width="60" float="true" pos="230,310,330,400" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
 				</HorizontalLayout>
+				-->
 				
-				<Control></Control>
-				
-				<Label name="errorinfo" text="" width="400" height="26" padding="43,10,10,10" textcolor="#FFFF0000" visible="false" align="center"></Label>
+				<Label name="errorinfo" text="" font="16" width="400" height="26" padding="10,15,10,10" textcolor="#FFFF0000" visible="false" align="center"></Label>
 				
+				<Control></Control>
+
 				<HorizontalLayout height="60" width="420" padding="0,0,0,30">
 					<Control></Control>
-					<Button name="huiyuan_page_add_btn" width="380" height="60" text="添加会员" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+					<Button name="huiyuan_page_add_btn" width="380" height="50" text="添加会员" textcolor="#FFFFFFFF" normalimage="file='btn_red_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_red_dianji.png' corner='5,5,5,5'" />
 					<Control></Control>
 				</HorizontalLayout>
 			</VerticalLayout>
@@ -67,7 +63,7 @@
 				<Control></Control>
 			</HorizontalLayout>
 
-			<VerticalLayout name="huiyuan_info_layout" padding="15,0,0,0" bordercorner="10,10" bkcolor="#FFFFFFFF" visible="false">
+			<VerticalLayout name="huiyuan_info_layout" padding="0,0,0,0" bordercorner="10,10" bkcolor="#FFFFFFFF" visible="false">
 				<Label name="huiyuan_num" text="会员卡号：" heiht="30" padding="30,10,10,10"></Label>
 				
 				<HorizontalLayout height="30" padding="30,10,10,10">

bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_chufang_print.xml

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44" padding="0,30,0,20">
-		<Button name="setting_new_chufang_printer_btn" align="center" width="200" height="38" padding="0,3,0,3" text="新建厨房打印机" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+	<HorizontalLayout height="44" padding="0,15,0,20">
+		<Button name="setting_new_chufang_printer_btn" align="center" width="200" height="44" padding="0,3,0,3" text="新建厨房打印机" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 	</HorizontalLayout>
-	<List name="setting_chufang_printer_list" bordersize="1" bordercolor="#FF000000" itemlinecolor="#FF000000" vscrollbar="true" hscrollbar="true">
-		<ListHeader />
-		<ListHeaderItem text="打印机名称" width="180" align="center" />
-		<ListHeaderItem text="IP地址" width="150" align="center" />
-		<ListHeaderItem text="打印机规格" width="150" align="center" />
-		<ListHeaderItem text="商品分单打印" width="150" align="center" />
-		<ListHeaderItem text="按商品分类打印" width="150" align="center" />
-		<ListHeaderItem text="关联商品分类" width="300" align="center" />
-		<ListHeaderItem text="操作" width="200" align="center"/>
+
+	<List name="setting_chufang_printer_list" bordersize="1" bordercolor="#FFC1C1C1" itemlinecolor="#FF000000" vscrollbar="true" hscrollbar="true">
+		<ListHeader inset="10,0,0,0" height="42">
+			<ListHeaderItem text="打印机名称" width="120" align="center" />
+			<ListHeaderItem text="IP地址" width="150" align="center" />
+			<ListHeaderItem text="打印机规格" width="100" align="center" />
+			<ListHeaderItem text="商品分单打印" width="100" align="center" />
+			<ListHeaderItem text="按商品分类打印" width="100" align="center" />
+			<ListHeaderItem text="关联商品分类" width="180" align="center" />
+			<ListHeaderItem text="操作" width="100" align="center"/>
+		</ListHeader>
 	</List> 
 </Window>

bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_chufang_printer_item.xml

@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <Window> 
-	<ListContainerElement name="setting_chufang_printer_item" height="80"> 
-		<HorizontalLayout> 
-			<Label name="setting_chufang_printer_item_name" width="180" height="80" align="center"/> 
-			<Label name="setting_chufang_printer_item_ip" width="150" align="center"/> 
-			<Label name="setting_chufang_printer_guige" width="150" align="center"/>
-			<Label name="setting_chufang_printer_fendan" width="150" align="center"/> 
-			<Label name="setting_chufang_printer_item_fenlei" width="150" align="center"/> 
-			<HorizontalLayout width="300" height="80" valign="center">
-				<Label name="setting_chufang_printer_item_fenlei_ids" width="200" wordbreak="true" align="center" valign="center"/> 
-			</HorizontalLayout>
-			<HorizontalLayout name="setting_chufang_printer_caozuo" width="200" align="center">
-				<Control></Control>
-				<Button name="setting_chufang_printer_item_update_btn" align="center" width="26" height="27" padding="20,25,0,0" normalimage="file='Setting_Btn.png'" hotimage="file='Setting_Btn_Hover.png'" pushedimage="file='Setting_Btn_Active.png'" />
-				<Button name="setting_chufang_printer_item_delete_btn" align="center" width="18" height="18" padding="20,29,0,0" normalimage="file='Delete_Members_Icon.png'" hotimage="file='Delete_Members_Icon_Hover.png'" pushedimage="file='Delete_Members_Icon_Click.png'" />
-				<Control></Control>
-			</HorizontalLayout>
-		</HorizontalLayout> 
+	<ListContainerElement name="setting_chufang_printer_item" width="890" height="80"> 
+		<Label name="setting_chufang_printer_item_name" width="120" height="80" align="center"/> 
+		<Label name="setting_chufang_printer_item_ip" width="150" align="center"/> 
+		<Label name="setting_chufang_printer_guige" width="100" align="center"/>
+		<Label name="setting_chufang_printer_fendan" width="100" align="center"/> 
+		<Label name="setting_chufang_printer_item_fenlei" width="100" align="center"/> 
+		<HorizontalLayout width="180" height="80" valign="center">
+			<Label name="setting_chufang_printer_item_fenlei_ids" width="180" wordbreak="true" align="center" valign="center"/> 
+		</HorizontalLayout>
+		<HorizontalLayout name="setting_chufang_printer_caozuo" width="100" align="center">
+			<Control></Control>
+			<Button name="setting_chufang_printer_item_update_btn" align="center" width="26" height="27" padding="10,25,0,0" normalimage="file='Setting_Btn.png'" hotimage="file='Setting_Btn_Hover.png'" pushedimage="file='Setting_Btn_Active.png'" />
+			<Button name="setting_chufang_printer_item_delete_btn" align="center" width="18" height="18" padding="10,29,0,0" normalimage="file='Delete_Members_Icon.png'" hotimage="file='Delete_Members_Icon_Hover.png'" pushedimage="file='Delete_Members_Icon_Click.png'" />
+			<Control></Control>
+		</HorizontalLayout>
 	</ListContainerElement> 
 </Window>

bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_xianshi.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<HorizontalLayout height="30" padding="0,15,0,0">
-		<Label text="商品显示风格" width="260"/>
+		<Label text="商品显示风格" width="180"/>
 		<HorizontalLayout padding="30,0,30,0" width="90" height="30">
 			<CheckBox name="xianshi_setting_youtu" group="setting_xianshi_type" selected="true" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
 			<Label name="xianshi_setting_youtu_name" text="有图模式一" width="300" padding="10,0,0,0"/>

zhipuzi_pos_windows/page/CAIxuexiPageUI.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
-
-#include "../wnd/CModalWnd.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"

zhipuzi_pos_windows/page/CBaobiaoPageUI.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
-
-#include "../wnd/CModalWnd.h"
+#include "../ui/CBasePageUI.h"
 
 class CBaobiaoPageUI : public CBasePageUI
 {
@@ -53,10 +51,6 @@ private:
 	//是否正在请求服务器
 	bool m_is_handle = false;
 
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	std::string m_init_time;
 	std::string m_end_time;
 

zhipuzi_pos_windows/page/CCaigouPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -10,8 +10,6 @@
 #include "../control/CDiandanFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CCaigouPageUI : public CBasePageUI
 {
 public:

zhipuzi_pos_windows/page/CDiandanPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -11,8 +11,6 @@
 #include "../control/CFoodtypeOptionUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CDiandanPageUI : public CBasePageUI
 {
 public:
@@ -358,7 +356,6 @@ private:
 
 	//模态对话框有关的
 	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
 
 	//结算页面总的支付方式数量
 	int m_nZhiufuNum;

zhipuzi_pos_windows/page/CDianneiOrderInfoPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CDiandanOrder.h"
 

zhipuzi_pos_windows/page/CDianneiOrderListPageUI.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 class DianneiOrderListStatus
 {

zhipuzi_pos_windows/page/CGengduoPageUI.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
-
-#include "../wnd/CModalWnd.h"
+#include "../ui/CBasePageUI.h"
 
 class CGengduoPageUI : public CBasePageUI
 {
@@ -63,10 +61,6 @@ private:
 	//是否正在请求服务器
 	bool m_is_handle = false;
 
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	std::string m_changyongString;
 	std::string m_gengduoString;
 

zhipuzi_pos_windows/page/CHuiyuanPageUI.cpp

@@ -40,7 +40,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 
 	if (senderName == L"jianpan_1")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"1";
@@ -49,7 +49,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_2")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"2";
@@ -58,7 +58,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_3")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"3";
@@ -67,7 +67,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_4")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"4";
@@ -76,7 +76,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_5")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"5";
@@ -85,7 +85,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_6")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"6";
@@ -94,7 +94,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_7")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"7";
@@ -103,7 +103,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_8")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"8";
@@ -112,7 +112,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_9")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"9";
@@ -121,7 +121,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_0")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason += L"0";
@@ -130,7 +130,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_x")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason = wsReason.substr(0, wsReason.length() - 1);
@@ -139,7 +139,7 @@ void CHuiyuanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (senderName == L"jianpan_qingkong")
 	{
-		CButtonUI* pContent = static_cast<CButtonUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
+		CEditUI* pContent = static_cast<CEditUI*>(this->FindSubControl(_T("huiyuan_page_shoujihao_edit")));
 		std::wstring wsReason = pContent->GetText();
 
 		wsReason.clear();

zhipuzi_pos_windows/page/CHuiyuanPageUI.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
-
-#include "../wnd/CModalWnd.h"
+#include "../ui/CBasePageUI.h"
 
 class CHuiyuanPageUI : public CBasePageUI
 {
@@ -90,8 +88,4 @@ private:
 	std::string m_md5_password;
 
 	std::string m_freeze;
-
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
 };

zhipuzi_pos_windows/page/CJiaobanPageUI.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
-
-#include "../wnd/CModalWnd.h"
+#include "../ui/CBasePageUI.h"
 
 class CJiaobanPageUI : public CBasePageUI
 {
@@ -54,10 +52,6 @@ private:
 	//是否正在请求服务器
 	bool m_is_handle = false;
 
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	std::string m_init_time;
 	std::string m_end_time;
 

zhipuzi_pos_windows/page/CKucunPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -10,8 +10,6 @@
 #include "../control/CDiandanFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CKucunPageUI : public CBasePageUI
 {
 public:

zhipuzi_pos_windows/page/CSaomashouyinPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -10,8 +10,6 @@
 #include "../control/CDiandanFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CSaomashouyinPageUI : public CBasePageUI
 {
 public:

zhipuzi_pos_windows/page/CSettingPageUI.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 class CSettingPageUI : public CBasePageUI
 {

zhipuzi_pos_windows/page/CShangpinCreatePageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -9,8 +9,6 @@
 
 #include "../zhipuzi/CDiandanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CShangpinCreatePageUI : public CBasePageUI
 {
 public:
@@ -53,10 +51,6 @@ private:
 	void ShowError(std::wstring msg);
 
 private:
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	//商品字段
 	std::string m_name;
 	std::string m_xuhao;

zhipuzi_pos_windows/page/CShangpinPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -10,8 +10,6 @@
 #include "../control/CDiandanFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CShangpinPageUI : public CBasePageUI
 {
 public:
@@ -86,10 +84,6 @@ private:
 	//当前点击的哪个商品
 	CDiandanFoodItemUI* m_cur_click_food_item;
 
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	//当前控件的实际宽度
 	int m_nPageWidth;
 

zhipuzi_pos_windows/page/CShangpinUpdatePageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -9,8 +9,6 @@
 
 #include "../zhipuzi/CDiandanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CShangpinUpdatePageUI : public CBasePageUI
 {
 public:
@@ -63,10 +61,6 @@ private:
 	void ShowError(std::wstring msg);
 
 private:
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	CFood m_foodinfo;
 
 	//商品字段

zhipuzi_pos_windows/page/CShoukuanOrderInfoPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CShoukuanOrder.h"
 

zhipuzi_pos_windows/page/CShoukuanOrderListPageUI.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 class ShoukuanOrderListStatus
 {

zhipuzi_pos_windows/page/CShoukuanPageUI.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
-
-#include "../wnd/CModalWnd.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CShoukuanOrder.h"
 
@@ -120,10 +118,6 @@ private:
 
 	bool m_is_zidingyizhifu_init = false;
 
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	//结算页面总的支付方式数量
 	int m_nZhiufuNum;
 

zhipuzi_pos_windows/page/CWaimaiOrderInfoPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CWaimaiOrder.h"
 

zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../control/CWaimaiOrderItemUI.h"
 

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -10,8 +10,6 @@
 #include "../control/CDiandanFoodItemUI.h"
 #include "../zhipuzi/CZhengcanOrder.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CZhengcanDiandanPageUI : public CBasePageUI
 {
 public:
@@ -367,10 +365,6 @@ private:
 	//餐牌
 	std::string m_renshu;
 
-	//模态对话框有关的
-	bool m_is_show_modal_wnd = false;
-	CModalWnd* m_curModalWnd;
-
 	//结算页面总的支付方式数量
 	int m_nZhiufuNum;
 

zhipuzi_pos_windows/page/CZhengcanOrderInfoPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CZhengcanOrder.h"
 

zhipuzi_pos_windows/page/CZhengcanOrderListPageUI.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 class ZhengcanOrderListStatus
 {

zhipuzi_pos_windows/page/CZhengcanPageUI.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../zhipuzi/CFood.h"
 #include "../zhipuzi/CFoodtype.h"
@@ -9,8 +9,6 @@
 
 #include "../control/CZhengcanTableItemUI.h"
 
-#include "../wnd/CModalWnd.h"
-
 class CZhengcanPageUI : public CBasePageUI
 {
 public:

zhipuzi_pos_windows/page/CBasePageUI.h → zhipuzi_pos_windows/ui/CBasePageUI.h

@@ -2,6 +2,8 @@
 
 #include "../pch/pch.h"
 
+#include "../ui/CModalWnd.h"
+
 class CMainWnd;
 
 class CBasePageUI : public CContainerUI
@@ -45,4 +47,8 @@ public:
 
 protected:
 	CMainWnd* m_pMainWnd;
+
+	//模态对话框有关的
+	bool m_is_show_modal_wnd = false;
+	CModalWnd* m_curModalWnd;
 };

zhipuzi_pos_windows/wnd/CModalWnd.cpp → zhipuzi_pos_windows/ui/CModalWnd.cpp

@@ -1,5 +1,5 @@
 #include "../pch/pch.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 CModalWnd::CModalWnd()
 {
@@ -10,6 +10,7 @@ CModalWnd::~CModalWnd()
 	CSystem::HideSystemKeyboard();
 }
 
+//派生类调用CModalWnd::Notify()，在这里处理键盘弹出和收起的逻辑
 void CModalWnd::Notify(DuiLib::TNotifyUI& msg)
 {
 	const std::wstring senderClassName = msg.pSender->GetClass();

zhipuzi_pos_windows/wnd/CModalWnd.h → zhipuzi_pos_windows/ui/CModalWnd.h

@@ -6,9 +6,7 @@ class CModalWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
 public:
 	CModalWnd();
 	
-	~CModalWnd()
-	{
-	}
+	~CModalWnd();
 
 	void Notify(DuiLib::TNotifyUI& msg) override;
 

zhipuzi_pos_windows/wnd/CAttentionWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 /**
  * 封装一个提醒确认的弹框

zhipuzi_pos_windows/wnd/CCanpaiWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CCanpaiWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CChengzhongWnd.h

@@ -3,7 +3,7 @@
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "../helper/CSerialPort.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CChengzhongWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CChufangSettingWnd.cpp

@@ -348,6 +348,8 @@ void CChufangSettingWnd::Notify(TNotifyUI& msg)
 			return;
 		}
 	}
+
+	CModalWnd::Notify(msg);
 }
 
 LRESULT CChufangSettingWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

zhipuzi_pos_windows/wnd/CChufangSettingWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 #include "../tool/CSqlite3.h"
 

zhipuzi_pos_windows/wnd/CDiandanNatureWnd.h

@@ -8,7 +8,7 @@
 #include "../zhipuzi/CDiandanOrder.h"
 #include "../zhipuzi/CZhengcanOrder.h"
 
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CDiandanNatureWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CFulikaShoukuanWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CGuadanWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 #include "../zhipuzi/CDiandanOrder.h"
 

zhipuzi_pos_windows/wnd/CHuiyuanAddWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CHuiyuanAddWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CHuiyuanBangkaWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CHuiyuanBangkaWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CHuiyuanChongzhiWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CHuiyuanInfoShowWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CHuiyuanInfoShowWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CHuiyuanShoukuanWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CHuiyuanXiugaimimaWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CHuiyuanXiugaimimaWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CHuiyuanXiugaiziliaoWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CHuiyuanXiugaiziliaoWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CImageAttentionWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CImageAttentionWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CMainWnd.h

@@ -5,7 +5,7 @@
 #include "../control/CWaimaiOrderItemUI.h"
 #include "../zhipuzi/CWaimaiOrder.h"
 
-#include "../page/CBasePageUI.h"
+#include "../ui/CBasePageUI.h"
 
 #include "../ui/CTouchWindowBase.h"
 

zhipuzi_pos_windows/wnd/CMemberLoginWnd.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CMemberLoginWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CMemoWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CMemoWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CMessageboxWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CMessageboxWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CNumInputWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 /**
  * 封装一个通用的数字输入弹框

zhipuzi_pos_windows/wnd/CSaomaCikaWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CSaomaCikaWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CSaomaQuanyikaWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CSaomaShangpinquanWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CSaomaYouhuiquanWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CShangpinNewTypeWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CShangpinNewTypeWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CShangpinSaomaluruWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CShangpinSaomaluruWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CThirdDeliverySelectWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CThirdDeliverySelectWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CWaimaiOrderFailReasonWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CWaimaiOrderFailReasonWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CModalWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CWeixinzhifuShoukuanWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CXianjinShoukuanWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CYouhuiShowWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CYouhuiShowWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CZhengcanKaitaiWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CZhengcanKaitaiWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CZhengcanRenshuWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CZhengcanRenshuWnd : public CModalWnd
 {

zhipuzi_pos_windows/wnd/CZhengcanSaomadiancanWnd.h

@@ -2,7 +2,7 @@
 
 #include "../pch/pch.h"
 #include "CMainWnd.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CZhengcanPageUI;
 

zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CModalWnd.h"
+#include "../ui/CModalWnd.h"
 
 class CZidingyiShoukuanWnd : public CModalWnd
 {

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -305,7 +305,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="print\CPosPrinter.h" />
     <ClInclude Include="worker\CPosPrinterWorker.h" />
     <ClInclude Include="wnd\CGuadanWnd.h" />
-    <ClInclude Include="wnd\CModalWnd.h" />
+    <ClInclude Include="ui\CModalWnd.h" />
     <ClInclude Include="wnd\CChengzhongWnd.h" />
     <ClInclude Include="helper\CSerialPort.h" />
     <ClInclude Include="wnd\CZidingyiShoukuanWnd.h" />
@@ -330,7 +330,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="control\CDiandanNatureItemUI.h" />
     <ClInclude Include="wnd\CDiandanNatureWnd.h" />
     <ClInclude Include="control\CFoodtypeOptionUI.h" />
-    <ClInclude Include="page\CBasePageUI.h" />
+    <ClInclude Include="ui\CBasePageUI.h" />
     <ClInclude Include="page\CWaimaiOrderListPageUI.h" />
     <ClInclude Include="page\CDiandanPageUI.h" />
     <ClInclude Include="helper\CLewaimaiJson.h" />
@@ -434,7 +434,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClCompile Include="print\CPosPrinter.cpp" />
     <ClCompile Include="worker\CPosPrinterWorker.cpp" />
     <ClCompile Include="wnd\CGuadanWnd.cpp" />
-    <ClCompile Include="wnd\CModalWnd.cpp" />
+    <ClCompile Include="ui\CModalWnd.cpp" />
     <ClCompile Include="wnd\CChengzhongWnd.cpp" />
     <ClCompile Include="helper\CSerialPort.cpp" />
     <ClCompile Include="wnd\CZidingyiShoukuanWnd.cpp" />

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj.filters

@@ -96,7 +96,7 @@
     <ClInclude Include="page\CSettingPageUI.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="page\CBasePageUI.h">
+    <ClInclude Include="ui\CBasePageUI.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="control\CFoodtypeOptionUI.h">
@@ -177,7 +177,7 @@
     <ClInclude Include="wnd\CChengzhongWnd.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="wnd\CModalWnd.h">
+    <ClInclude Include="ui\CModalWnd.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="wnd\CGuadanWnd.h">
@@ -542,7 +542,7 @@
     <ClCompile Include="wnd\CChengzhongWnd.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="wnd\CModalWnd.cpp">
+    <ClCompile Include="ui\CModalWnd.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="wnd\CGuadanWnd.cpp">