点单功能的会员登录改完了

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

@@ -9,8 +9,18 @@
 					<VerticalLayout width="380" padding="0,0,0,0">
 						<HorizontalLayout name="btn_diandan_qingkong" height="60">
 							<Control bkimage="member_login.png" width="32" height="32" padding="10,14,0,0"></Control>
-							<Button name="btn_diandan_member_login" align="left" text="会员登录" height="38" width="100" padding="10,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							<Label name="diandan_page_member_info" text="" width="130" height="30" padding="10,10,10,10" visible="false"></Label>
+							
+							<Button name="btn_diandan_member_login" align="left" text="会员登录" height="38" width="135" padding="10,12,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+							
+							<VerticalLayout name="diandan_page_member_info" width="135" padding="10,5,10,5" visible="false">
+								<Label name="diandan_page_member_name" height="20" padding="0,0,0,0"></Label>
+								<HorizontalLayout padding="0,5,0,0">
+									<Button name="diandan_page_member_info_btn" text="信息" font="14" height="20" width="40" padding="0,0,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+									
+									<Button name="diandan_page_member_out_btn" text="退出" textcolor="#FFFF4500" font="14" height="20" width="40" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF4500" bkcolor="#FFFFFFFF"></Button>
+								</HorizontalLayout>
+							</VerticalLayout>							
+							
 							<Control></Control>
 							<Button name="btn_diandan_canpaihao" text="输入餐牌号" height="38" width="100" padding="0,10,0,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
 							<Control width="1" bkcolor="#FFEBE8E8" padding="5,15,15,15"></Control>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Window size="502,600" caption="0,0,0,36" roundcorner="4,4" >
+	<Font id="0" name="微软雅黑" size="22" />
+	
+	<VerticalLayout bkimage="shoukuan_bkg.png" >
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+			<Label name="memo_dlg_title" text="会员信息" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
+			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
+		</HorizontalLayout>
+		
+		<VerticalLayout padding="0,20,0,0">
+			<Label name="huiyuan_num" text="会员卡号：" heiht="30" padding="30,10,10,10"></Label>
+				
+			<HorizontalLayout height="30" padding="30,10,10,10">
+				<Label name="huiyuan_phone" text="手机号：" width="200" heiht="30" padding="0,0,0,0"></Label>
+				<Label name="huiyuan_mimazhifu" text="密码支付：" width="200" heiht="30" padding="30,0,0,0"></Label>
+			</HorizontalLayout>
+			
+			<Label name="huiyuan_yue" text="当前余额：" heiht="30" padding="30,10,10,10"></Label>
+			<Label name="huiyuan_name" text="会员姓名：" heiht="30" padding="30,10,10,10"></Label>
+			<Label name="huiyuan_sex" text="性别：" heiht="30" padding="30,10,10,10"></Label>
+			<Label name="huiyuan_address" text="地址：" heiht="30" padding="30,10,10,10"></Label>
+			<Label name="huiyuan_birthday" text="生日：" heiht="30" padding="30,10,10,10"></Label>
+			<Label name="huiyuan_levelname" text="会员级别：" heiht="30" padding="30,10,10,10"></Label>
+			<Label name="huiyuan_shitika" text="实体卡：" heiht="30" padding="30,10,10,10"></Label>
+			<Label name="huiyuan_status" text="会员状态：" heiht="30" padding="30,10,10,10"></Label>
+		</VerticalLayout>
+	</VerticalLayout>
+</Window>

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

@@ -1,46 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="700,434" caption="0,0,0,44" roundcorner="4,4" >
-	<Font id="0" name="微软雅黑" size="26" />
-	<Font id="1" name="微软雅黑" size="32" />
-	<Font id="2" name="微软雅黑" size="22" />
-	
+<Window size="800,660" caption="0,0,0,44" roundcorner="4,4" >
+	<Font id="0" name="微软雅黑" size="24" />
+	<Font id="1" name="微软雅黑" size="40" />
+	<Font id="2" name="微软雅黑" size="18" />
+	<Font id="3" name="微软雅黑" size="32" />
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
 		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
-			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
-			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
+			<Label name="shoukuan_version" text="会员登录" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
+			<Button name="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>
 		
-		<HorizontalLayout>
-			<VerticalLayout width="370">
-				<Label name="name" text="请输入会员手机号" height="30" width="250" padding="30,50,0,0" align="left"/>
-	
-				<Edit name="content" width="250" height="50" padding="30,30,0,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="1"/>
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" padding="0,20,0,0">			
+			<HorizontalLayout height="40" padding="0,0,0,0">
+				<VerticalLayout>
+					<Button name="shoukuan_btn_shoujihao" text="手机号+密码登录" textcolor="#FF43A947" font="2" heiht="38" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="shoukuan_btn_shoujihao_line" width="180" height="3" bkcolor="#FF43A947" padding="60,0,10,0"></Control>
+				</VerticalLayout>
 				
-				<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
+				<VerticalLayout>
+					<Button name="shoukuan_btn_saomazhifu" text="扫码登录" font="2" heiht="38" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="shoukuan_btn_saomazhifu_line" visible="false" width="180" height="3" bkcolor="#FF43A947" padding="60,0,10,0"></Control>
+				</VerticalLayout>
 				
-				<HorizontalLayout height="56" valign="center" padding="30,100,0,20">
-					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="250" padding="0,0,0,0" 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>
-			</VerticalLayout>
+				<VerticalLayout>
+					<Button name="shoukuan_btn_shitika" text="实体卡登录" font="2" heiht="38" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="shoukuan_btn_shitika_line" visible="false" width="180" height="3" bkcolor="#FF43A947" padding="60,0,10,0"></Control>
+				</VerticalLayout>
+			</HorizontalLayout>
 			
-			<HorizontalLayout width="330" height="406" bkcolor="#FFF3F3F3">
-				<Button name="jianpan_1" text="1" font="0" heiht="60" width="60" float="true" pos="10,0,110,90" 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,0,220,90" 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_3" text="3" font="0" heiht="60" width="60" float="true" pos="230,0,330,90" 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 name="fukuan_input_shoujihao_layout" padding="0,20,0,0">
+				<VerticalLayout height="230" padding="0,30,0,0">
+					<HorizontalLayout height="60">
+						<Label text="手机号：" font="2" float="true" pos="50,15,200,40"/>
+						<Edit name="shoujihao_edit" float="true" pos="153,12,370,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+					</HorizontalLayout>
 				
-				<Button name="jianpan_4" text="4" font="0" heiht="60" width="60" float="true" pos="10,100,110,190" 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_5" text="5" font="0" heiht="60" width="60" float="true" pos="120,100,220,190" 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_6" text="6" font="0" heiht="60" width="60" float="true" pos="230,100,330,190" 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 height="60">
+						<Label text="密码：" font="2" float="true" pos="50,15,200,40"/>
+						<Edit name="password_edit" password="true" float="true" pos="153,12,370,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+					</HorizontalLayout>
+					
+					<HorizontalLayout height="80" padding="0,30,0,0">
+						<Control></Control>
+						<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="350" padding="0,0,0,0" tooltip="点击这里确认登录" 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'" />
+						<Control></Control>
+					</HorizontalLayout>	
+				</VerticalLayout>
+			
+				<HorizontalLayout width="340" height="416" bkcolor="#FFF3F3F3" padding="0,0,20,0">
+					<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>
+					<Button name="jianpan_3" text="3" font="0" heiht="60" width="60" float="true" pos="230,10,330,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_4" text="4" font="0" heiht="60" width="60" float="true" pos="10,110,110,200" 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_5" text="5" font="0" heiht="60" width="60" float="true" pos="120,110,220,200" 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_6" text="6" font="0" heiht="60" width="60" float="true" pos="230,110,330,200" 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_7" text="7" font="0" heiht="60" width="60" float="true" pos="10,210,110,300" 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_8" text="8" font="0" heiht="60" width="60" float="true" pos="120,210,220,300" 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_9" text="9" font="0" heiht="60" width="60" float="true" pos="230,210,330,300" 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_qingkong" text="清空" font="0" heiht="60" width="60" float="true" pos="10,310,110,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_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>
+			</HorizontalLayout>	
+			
+			<VerticalLayout visible="false" name="fukuan_input_fukuanma_layout" height="220" padding="0,80,0,100">
+				<HorizontalLayout padding="0,20,0,0" height="129">
+					<Control></Control>
+					<Control bkimage="qrcode_attention.png" width="129" height="127"></Control>
+					<Control></Control>
+				</HorizontalLayout>
 				
-				<Button name="jianpan_7" text="7" font="0" heiht="60" width="60" float="true" pos="10,200,110,290" 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_8" text="8" font="0" heiht="60" width="60" float="true" pos="120,200,220,290" 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_9" text="9" font="0" heiht="60" width="60" float="true" pos="230,200,330,290" 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>
+				<Label text="请扫描顾客会员付款二维码" align="center" padding="0,30,0,0" height="40" font="0"></Label>
+			</VerticalLayout>
+
+			<VerticalLayout visible="false" name="fukuan_input_shitika_layout" height="220" padding="0,80,0,100">
+				<HorizontalLayout padding="0,20,0,0" height="129">
+					<Control></Control>
+					<Control bkimage="huiyuan_no.png" width="206" height="141"></Control>
+					<Control></Control>
+				</HorizontalLayout>
 				
-				<Button name="jianpan_qingkong" text="清空" font="0" heiht="60" width="60" float="true" pos="10,300,110,390" 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_0" text="0" font="0" heiht="60" width="60" float="true" pos="120,300,220,390" 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,300,330,390" 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>
+				<Label text="请刷会员实体卡进行付款" align="center" padding="0,30,0,0" height="40" font="0"></Label>
+			</VerticalLayout>			
+
+			<HorizontalLayout height="50" padding="0,20,0,0">
+				<Control></Control>
+				<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Control></Control>
+			</HorizontalLayout>			
+		</VerticalLayout>
+		
+		<VerticalLayout name="shoukuan_paying_layout" visible="false">
+			<HorizontalLayout name="shoukuan_paying_loading" height="24" padding="0, 150, 0, 20">
+				<Control></Control>
+				<VerticalLayout width="24">
+					<Control></Control>
+					<HorizontalLayout height="24">
+						<GifAnim bkimage="loading.gif" autosize="true"></GifAnim>
+					</HorizontalLayout>
+					<Control></Control>
+				</VerticalLayout>
+				<Control></Control>
 			</HorizontalLayout>
-		</HorizontalLayout>
+			
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求登录中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
+		</VerticalLayout>
 		
-	</VerticalLayout>
+		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
+			
+			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="登录成功：" font="3" textcolor="0xFF3CB371" align="center"></Label>
+			
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+		</VerticalLayout>
+		
+		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
+			<HorizontalLayout height="100" padding="0,20,0,0">
+				<Control></Control>
+				<Control bkimage="pay_fail.png" width="100" height="100" align="center"></Control>
+				<Control></Control>
+			</HorizontalLayout>
+			
+			<Label height="40" padding="0,120,0,20" name="shoukuan_pay_fail_money" text="登录失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
+			
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+		</VerticalLayout>
+    </VerticalLayout>
 </Window>

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -22,6 +22,7 @@
 #include "../wnd/CChengzhongWnd.h"
 #include "../wnd/CGuadanWnd.h"
 #include "../wnd/CNumInputWnd.h"
+#include "../wnd/CHuiyuanInfoShowWnd.h"
 
 #include "../print/CPosPrinter.h"
 
@@ -840,6 +841,14 @@ void CDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 	{
 		this->XianshiYouhui();
 	}
+	else if (name == L"diandan_page_member_out_btn")
+	{
+		this->ClickMemberLogout();
+	}
+	else if (name == L"diandan_page_member_info_btn")
+	{
+		this->ClickMemberInfoShow();
+	}
 }
 
 //处理option切换事件
@@ -2249,25 +2258,39 @@ void CDiandanPageUI::ClickMemberLogin()
 		pMemberLoginDlg->SetIcon(IDI_ICON_DUILIB);
 		pMemberLoginDlg->CenterWindow();
 
-		pMemberLoginDlg->SetTitle(L"会员登录");
-
 		UINT ret = pMemberLoginDlg->ShowModal();
 
 		if (ret == IDOK)
 		{
 			//这说明会员登录成功了
 			m_is_member = true;
-			m_member_name = pMemberLoginDlg->m_member_name;
+
+			m_member_name = pMemberLoginDlg->m_name;
 			m_member_level = pMemberLoginDlg->m_member_level;
 			m_member_level_name = pMemberLoginDlg->m_member_level_name;
 
+			m_member_id = pMemberLoginDlg->m_member_id;
+			m_card_no = pMemberLoginDlg->m_card_no;
+			m_balance = pMemberLoginDlg->m_balance;
+			m_phone = pMemberLoginDlg->m_phone;
+			m_birthday = pMemberLoginDlg->m_birthday;
+			m_sex = pMemberLoginDlg->m_sex;
+			m_address = pMemberLoginDlg->m_address;
+			m_is_card = pMemberLoginDlg->m_is_card;
+			m_point = pMemberLoginDlg->m_point;
+			m_open_no_card_payment = pMemberLoginDlg->m_open_no_card_payment;
+			m_pay_password = pMemberLoginDlg->m_pay_password;
+			m_freeze = pMemberLoginDlg->m_freeze;
+			m_card_identify = pMemberLoginDlg->m_card_identify;
+
+			CLabelUI* pMemberInfo = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_member_name")));
+			std::wstring memberInfo = L"会员：" + CLewaimaiString::UTF8ToUnicode(m_member_name);
+			pMemberInfo->SetText(memberInfo.c_str());
+
 			CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
 			pMemberLoginBtn->SetVisible(false);
 
-			CLabelUI* pMemberInfo = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_member_info")));
-			std::wstring memberInfo = CLewaimaiString::UTF8ToUnicode(m_member_name) + L"【" + CLewaimaiString::UTF8ToUnicode(m_member_level_name) + L"】";
-			pMemberInfo->SetText(memberInfo.c_str());
-			pMemberInfo->SetVisible(true);
+			this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(true);
 
 			this->UpdateJiesuanInfo();
 
@@ -2284,6 +2307,57 @@ void CDiandanPageUI::ClickMemberLogin()
 	}
 }
 
+//处理会员退出登陆
+void CDiandanPageUI::ClickMemberLogout()
+{
+	m_is_member = false;
+
+	CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
+	pMemberLoginBtn->SetVisible(true);
+
+	this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(false);
+
+	this->UpdateJiesuanInfo();
+}
+
+void CDiandanPageUI::ClickMemberInfoShow()
+{
+	if (m_is_show_modal_wnd == true)
+	{
+		return;
+	}
+
+	CHuiyuanInfoShowWnd* pMemberLoginDlg = new CHuiyuanInfoShowWnd();
+
+	if (pMemberLoginDlg != NULL)
+	{
+		m_is_show_modal_wnd = true;
+		m_curModalWnd = pMemberLoginDlg;
+
+		pMemberLoginDlg->Create(m_pManager->GetPaintWindow(), _T(""), UI_WNDSTYLE_DIALOG, WS_EX_WINDOWEDGE);
+		pMemberLoginDlg->SetIcon(IDI_ICON_DUILIB);
+		pMemberLoginDlg->CenterWindow();
+
+		pMemberLoginDlg->SetHuiyuanInfo(m_member_name, m_member_level, m_member_level_name, m_card_no, m_balance, m_phone, \
+			m_birthday, m_sex, m_address, m_is_card, m_point, m_open_no_card_payment, m_pay_password, m_freeze, m_card_identify);
+
+		UINT ret = pMemberLoginDlg->ShowModal();
+
+		if (ret == IDOK)
+		{
+			m_is_show_modal_wnd = false;
+			delete pMemberLoginDlg;
+		}
+		else
+		{
+			m_is_show_modal_wnd = false;
+			delete pMemberLoginDlg;
+
+			return;
+		}
+	}
+}
+
 void CDiandanPageUI::ClickZhekou()
 {
 	if (m_is_show_modal_wnd == true)
@@ -2946,6 +3020,13 @@ void CDiandanPageUI::StartHuiyuanShoukuan()
 		return;
 	}
 
+	if (m_is_member == false)
+	{
+		m_pMainWnd->ShowToast(L"请先登录会员再使用会员支付");
+
+		return;
+	}
+
 	CHuiyuanShoukuanWnd* pShoukuanWnd = new CHuiyuanShoukuanWnd();
 	if (pShoukuanWnd != NULL)
 	{

zhipuzi_pos_windows/page/CDiandanPageUI.h

@@ -115,6 +115,12 @@ public:
 	//处理会员登录
 	void ClickMemberLogin();
 
+	//处理会员退出登陆
+	void ClickMemberLogout();
+
+	//展示会员详情
+	void ClickMemberInfoShow();
+
 	//点击整单折扣
 	void ClickZhekou();
 
@@ -299,6 +305,22 @@ private:
 
 	double m_total_member_youhui; //会员商品优惠
 
+	//会员登录成功后返回的会员信息
+	std::string m_card_no;
+	std::string m_balance;
+	std::string m_phone;
+	std::string m_birthday;
+	std::string m_sex;
+	std::string m_address;
+	std::string m_is_card;
+	std::string m_point;
+	std::string m_open_no_card_payment;
+	std::string m_pay_password;
+	std::string m_freeze;
+	std::string m_card_identify;
+
+	std::string m_member_id;
+
 	bool m_is_member_zhekou = false;
 	std::string m_member_zhekou_value; //具体会员打几折
 	double m_member_zhekou_youhui; //会员店铺折扣优惠

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -2852,7 +2852,7 @@ void CZhengcanDiandanPageUI::ClickMemberLogin()
 		pMemberLoginDlg->SetIcon(IDI_ICON_DUILIB);
 		pMemberLoginDlg->CenterWindow();
 
-		pMemberLoginDlg->SetTitle(L"会员登录");
+		//pMemberLoginDlg->SetTitle(L"会员登录");
 
 		UINT ret = pMemberLoginDlg->ShowModal();
 
@@ -2860,17 +2860,17 @@ void CZhengcanDiandanPageUI::ClickMemberLogin()
 		{
 			//这说明会员登录成功了
 			m_is_member = true;
-			m_member_name = pMemberLoginDlg->m_member_name;
-			m_member_level = pMemberLoginDlg->m_member_level;
-			m_member_level_name = pMemberLoginDlg->m_member_level_name;
+			//m_member_name = pMemberLoginDlg->m_member_name;
+			//m_member_level = pMemberLoginDlg->m_member_level;
+			//m_member_level_name = pMemberLoginDlg->m_member_level_name;
 
 			CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
 			pMemberLoginBtn->SetVisible(false);
 
-			CLabelUI* pMemberInfo = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_member_info")));
-			std::wstring memberInfo = CLewaimaiString::UTF8ToUnicode(m_member_name) + L"【" + CLewaimaiString::UTF8ToUnicode(m_member_level_name) + L"】";
-			pMemberInfo->SetText(memberInfo.c_str());
-			pMemberInfo->SetVisible(true);
+			//CLabelUI* pMemberInfo = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_member_info")));
+			//std::wstring memberInfo = CLewaimaiString::UTF8ToUnicode(m_member_name) + L"【" + CLewaimaiString::UTF8ToUnicode(m_member_level_name) + L"】";
+			//pMemberInfo->SetText(memberInfo.c_str());
+			//pMemberInfo->SetVisible(true);
 
 			this->UpdateJiesuanInfo();
 

zhipuzi_pos_windows/wnd/CHuiyuanInfoShowWnd.cpp

@@ -0,0 +1,187 @@
+#include "../pch/pch.h"
+#include "CHuiyuanInfoShowWnd.h"
+
+LRESULT CHuiyuanInfoShowWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+	POINT pt;
+	pt.x = GET_X_LPARAM(lParam);
+	pt.y = GET_Y_LPARAM(lParam);
+	::ScreenToClient(*this, &pt);
+
+	RECT rcClient;
+	::GetClientRect(*this, &rcClient);
+
+	RECT rcCaption = m_pm.GetCaptionRect();
+	if (pt.x >= rcClient.left + rcCaption.left && pt.x < rcClient.right - rcCaption.right \
+		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
+	{
+		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
+		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		{
+			return HTCAPTION;
+		}
+	}
+
+	return HTCLIENT;
+}
+
+LRESULT CHuiyuanInfoShowWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+	SIZE szRoundCorner = m_pm.GetRoundCorner();
+	if (!::IsIconic(*this) && (szRoundCorner.cx != 0 || szRoundCorner.cy != 0))
+	{
+		CDuiRect rcWnd;
+		::GetWindowRect(*this, &rcWnd);
+		rcWnd.Offset(-rcWnd.left, -rcWnd.top);
+		rcWnd.right++;
+		rcWnd.bottom++;
+		HRGN hRgn = ::CreateRoundRectRgn(rcWnd.left, rcWnd.top, rcWnd.right, rcWnd.bottom, szRoundCorner.cx, szRoundCorner.cy);
+		::SetWindowRgn(*this, hRgn, TRUE);
+		::DeleteObject(hRgn);
+	}
+
+	bHandled = FALSE;
+	return 0;
+}
+
+LRESULT CHuiyuanInfoShowWnd::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	LRESULT lRes = 0;
+	BOOL bHandled = TRUE;
+	switch (uMsg)
+	{
+	case WM_CREATE:
+		lRes = OnCreate(uMsg, wParam, lParam, bHandled);
+		break;
+	case WM_NCACTIVATE:
+		lRes = OnNcActivate(uMsg, wParam, lParam, bHandled);
+		break;
+	case WM_NCCALCSIZE:
+		lRes = OnNcCalcSize(uMsg, wParam, lParam, bHandled);
+		break;
+	case WM_NCPAINT:
+		lRes = OnNcPaint(uMsg, wParam, lParam, bHandled);
+		break;
+	case WM_NCHITTEST:
+		lRes = OnNcHitTest(uMsg, wParam, lParam, bHandled);
+		break;
+	case WM_SIZE:
+		lRes = OnSize(uMsg, wParam, lParam, bHandled);
+		break;
+	default:
+		bHandled = FALSE;
+	}
+	if (bHandled)
+	{
+		return lRes;
+	}
+	if (m_pm.MessageHandler(uMsg, wParam, lParam, lRes))
+	{
+		return lRes;
+	}
+	return CWindowWnd::HandleMessage(uMsg, wParam, lParam);
+}
+
+LRESULT CHuiyuanInfoShowWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled)
+{
+	if (uMsg == WM_KEYDOWN)
+	{
+		if (wParam == VK_RETURN)
+		{
+			return true;
+		}
+		else if (wParam == VK_ESCAPE)
+		{
+			Close(IDCANCEL);
+			return true;
+		}
+	}
+	return false;
+}
+
+LRESULT CHuiyuanInfoShowWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+	LONG styleValue = ::GetWindowLong(*this, GWL_STYLE);
+	styleValue &= ~WS_CAPTION;
+	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
+
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	m_pm.Init(m_hWnd);
+
+	m_pm.AddPreMessageFilter(this);
+
+	CDialogBuilder builder;
+
+	CControlUI* pRoot = builder.Create(_T("huiyuan_info_show_wnd.xml"), (UINT)0, NULL, &m_pm);
+	ASSERT(pRoot && "Failed to parse XML");
+
+	// 把这些控件绘制到本窗口上
+	m_pm.AttachDialog(pRoot);
+
+	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中，用于处理Notify函数
+	m_pm.AddNotifier(this);
+
+	Init();
+
+	return 0;
+}
+
+void CHuiyuanInfoShowWnd::Notify(TNotifyUI& msg)
+{
+	if (msg.sType == _T("click"))
+	{
+		DuiLib::CDuiString senderName = msg.pSender->GetName();
+
+		if (senderName == _T("closebtn"))
+		{
+			Close(IDCANCEL);
+			return;
+		}
+	}
+}
+
+void CHuiyuanInfoShowWnd::Init()
+{
+
+}
+
+void CHuiyuanInfoShowWnd::SetHuiyuanInfo(std::string m_member_name, std::string m_member_level, std::string m_member_level_name, std::string m_card_no, std::string m_balance, std::string m_phone, \
+	std::string m_birthday, std::string m_sex, std::string m_address, std::string m_is_card, std::string m_point, std::string m_open_no_card_payment, std::string m_pay_password, std::string m_freeze, std::string m_card_identify)
+{
+	m_pm.FindControl(L"huiyuan_num")->SetText((L"会员卡号：" + CLewaimaiString::UTF8ToUnicode(m_card_no)).c_str());
+	m_pm.FindControl(L"huiyuan_phone")->SetText((L"手机号：" + CLewaimaiString::UTF8ToUnicode(m_phone)).c_str());
+
+	if (m_open_no_card_payment == "1")
+	{
+		m_pm.FindControl(L"huiyuan_mimazhifu")->SetText(L"密码支付：已开启");
+	}
+	else
+	{
+		m_pm.FindControl(L"huiyuan_mimazhifu")->SetText(L"密码支付：未开启");
+	}
+
+	m_pm.FindControl(L"huiyuan_name")->SetText((L"会员姓名：" + CLewaimaiString::UTF8ToUnicode(m_member_name)).c_str());
+	m_pm.FindControl(L"huiyuan_sex")->SetText((L"性别：" + CLewaimaiString::UTF8ToUnicode(m_sex)).c_str());
+	m_pm.FindControl(L"huiyuan_address")->SetText((L"地址：" + CLewaimaiString::UTF8ToUnicode(m_address)).c_str());
+	m_pm.FindControl(L"huiyuan_birthday")->SetText((L"生日：" + CLewaimaiString::UTF8ToUnicode(m_birthday)).c_str());
+	m_pm.FindControl(L"huiyuan_levelname")->SetText((L"会员级别：" + CLewaimaiString::UTF8ToUnicode(m_member_level_name)).c_str());
+	m_pm.FindControl(L"huiyuan_yue")->SetText((L"当前余额：" + CLewaimaiString::UTF8ToUnicode(m_balance)).c_str());
+
+	if (m_card_identify != "")
+	{
+		m_pm.FindControl(L"huiyuan_shitika")->SetText(L"实体会员卡：已绑定");
+	}
+	else
+	{
+		m_pm.FindControl(L"huiyuan_shitika")->SetText(L"实体会员卡：未绑定");
+	}
+
+	if (m_freeze == "0")
+	{
+		m_pm.FindControl(L"huiyuan_status")->SetText(L"会员状态：正常");
+	}
+	else
+	{
+		m_pm.FindControl(L"huiyuan_status")->SetText(L"会员状态：已冻结");
+	}
+}

zhipuzi_pos_windows/wnd/CHuiyuanInfoShowWnd.h

@@ -0,0 +1,72 @@
+#pragma once
+
+#include "../pch/pch.h"
+#include "CMainWnd.h"
+#include "CModalWnd.h"
+
+class CHuiyuanInfoShowWnd : public CModalWnd
+{
+public:
+	LPCTSTR GetWindowClassName() const
+	{
+		return _T("UIMemoWndFrame");
+	};
+
+	UINT GetClassStyle() const
+	{
+		return UI_CLASSSTYLE_DIALOG;
+	};
+
+	void OnFinalMessage(HWND /*hWnd*/)
+	{
+		//WindowImplBase::OnFinalMessage(hWnd);
+		m_pm.RemovePreMessageFilter(this);
+
+		//delete this;
+	};
+
+	void Init();
+
+	void SetHuiyuanInfo(std::string m_member_name, std::string m_member_level, std::string m_member_level_name, std::string m_card_no, std::string m_balance, std::string m_phone, \
+		std::string m_birthday, std::string m_sex, std::string m_address, std::string m_is_card, std::string m_point, std::string m_open_no_card_payment, std::string m_pay_password, std::string m_freeze, std::string m_card_identify);
+
+	void Notify(TNotifyUI& msg);
+
+	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+	{
+		if (::IsIconic(*this))
+		{
+			bHandled = FALSE;
+		}
+		return (wParam == 0) ? TRUE : FALSE;
+	}
+
+	LRESULT OnNcCalcSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+	{
+		return 0;
+	}
+
+	LRESULT OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+	{
+		return 0;
+	}
+
+	LRESULT OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
+
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
+public:
+	CPaintManagerUI m_pm;
+};

zhipuzi_pos_windows/wnd/CMemberLoginWnd.h

@@ -1,15 +1,19 @@
 #pragma once
 
 #include "../pch/pch.h"
-#include "CMainWnd.h"
 #include "CModalWnd.h"
 
 class CMemberLoginWnd : public CModalWnd
 {
 public:
+	CMemberLoginWnd()
+	{
+
+	}
+
 	LPCTSTR GetWindowClassName() const
 	{
-		return _T("UIMemoWndFrame");
+		return _T("UIShoukuanFrame");
 	};
 
 	UINT GetClassStyle() const
@@ -19,70 +23,93 @@ public:
 
 	void OnFinalMessage(HWND /*hWnd*/)
 	{
-		//WindowImplBase::OnFinalMessage(hWnd);
 		m_pm.RemovePreMessageFilter(this);
-
-		//delete this;
 	};
 
 	void Init();
 
-	std::string getContent();
-
-	void SetTitle(std::wstring title);
-
 	void Notify(TNotifyUI& msg);
 
 	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
-	LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-	{
-		if (::IsIconic(*this))
-		{
-			bHandled = FALSE;
-		}
-		return (wParam == 0) ? TRUE : FALSE;
-	}
+	LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
-	LRESULT OnNcCalcSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-	{
-		return 0;
-	}
+	LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
-	LRESULT OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-	{
-		return 0;
-	}
+	LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT OnNcCalcSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
 	LRESULT OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
 	LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
+	LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT OnLoginSuccess(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	LRESULT OnLoginFail(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
 	LRESULT HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
-	void StartYanzheng();
+	void SetCommonParams(std::map<string, string> params);
 
-	void ConfirmMember();
+	//点击确认，开始执行收款
+	void StartLogin();
 
-	//处理键盘捕捉结果
-	void HandleTextCapture(std::string content)
-	{
+	//开始退出
+	void StartClose();
 
-	}
+	//处理收款
+	void HandleLogin();
+
+	//处理键盘捕捉结果
+	void HandleTextCapture(std::string content);
 
 public:
 	CPaintManagerUI m_pm;
 
-	std::string m_content;
+	std::string m_fukuanma;
+	std::string m_shoujihao;
+	std::string m_password;
+
+	std::string m_card_identify;
+
+	//收款状态 0：未开始 1：请求发给服务器了，但是暂时还没得到反馈 2：查询密码中 3：成功 4：失败 5：正在取消支付
+	int m_shoukuan_status = 0;
+
+	std::wstring m_fail_message;
 
-	std::wstring m_errorInfo;
+	//窗口关闭的定时器时间
+	int m_timer_now = 2;
 
-	std::mutex m_qingqiu_mutex;
-	bool m_is_qingqiu = false;
+	std::map<string, string> m_commonParams;
 
-	std::string m_member_name;
+	int m_shoukuanModel = 2; //收款模式 1：会员扫码 2：手机号+密码 3 实体卡
+
+	int m_inputType = 1; //当前输入框 1：输入手机号 2：输入密码
+
+	//登录成功返回的字段
+	std::string m_card_no;
+	std::string m_balance;
+	std::string m_phone;
+	std::string m_name;
+	std::string m_birthday;
+	std::string m_sex;
+	std::string m_address;
+	std::string m_is_card;
+	std::string m_point;
+	std::string m_open_no_card_payment;
+	std::string m_pay_password;
+	std::string m_freeze;
 	std::string m_member_level;
 	std::string m_member_level_name;
-};
+
+	std::string m_member_id;
+};

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -229,6 +229,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="wnd\CHuiyuanInfoShowWnd.h" />
     <ClInclude Include="wnd\CHuiyuanBangkaWnd.h" />
     <ClInclude Include="wnd\CHuiyuanXiugaimimaWnd.h" />
     <ClInclude Include="wnd\CHuiyuanXiugaiziliaoWnd.h" />
@@ -347,6 +348,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="helper\CSystem.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="wnd\CHuiyuanInfoShowWnd.cpp" />
     <ClCompile Include="wnd\CHuiyuanBangkaWnd.cpp" />
     <ClCompile Include="wnd\CHuiyuanXiugaimimaWnd.cpp" />
     <ClCompile Include="wnd\CHuiyuanXiugaiziliaoWnd.cpp" />

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj.filters

@@ -363,6 +363,9 @@
     <ClInclude Include="wnd\CHuiyuanBangkaWnd.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="wnd\CHuiyuanInfoShowWnd.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch\pch.cpp">
@@ -686,6 +689,9 @@
     <ClCompile Include="wnd\CHuiyuanBangkaWnd.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="wnd\CHuiyuanInfoShowWnd.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="resource\zhipuzi.ico">