完成会员实体卡相关的所有功能

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

@@ -11,66 +11,78 @@
 			<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 visible="true" name="shoukuan_before_pay_layout">
-			<VerticalLayout height="520" padding="0,20,0,0">			
-				<HorizontalLayout height="50" padding="0,0,0,0">
-					<Label name="huiyuan_chongzhi_curbalance" text="当前余额：" font="2" float="true" pos="30,12,250,40"/>
-				</HorizontalLayout>
-				
-				<HorizontalLayout height="50" padding="0,20,0,0">
-					<Label text="充值：" font="2" float="true" pos="30,12,180,40"/>
-					<Edit name="chongzhi_edit" float="true" pos="98,12,355,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
-					<Label text="元" font="2" float="true" pos="362,15,470,40"/>
-				</HorizontalLayout>
-				
-				<HorizontalLayout height="50" padding="0,35,0,0">
-					<Label text="快选：" font="2" float="true" pos="30,12,180,40"/>
-					<Button name="xianjin_kuaijie_50" font="4" text="50元" heiht="36" width="55" padding="100,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_100" font="4" text="100元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_200" font="4" text="200元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_500" font="4" text="500元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_1000" font="4" text="1000元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-				</HorizontalLayout>
-				
-				<HorizontalLayout height="50" padding="0,35,0,0">
-					<Label text="赠送：" font="2" float="true" pos="30,12,180,40"/>
-					<Edit name="zengsong_edit" float="true" pos="98,12,355,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
-					<Label text="元" font="2" float="true" pos="362,15,470,40"/>
-				</HorizontalLayout>
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" vscrollbar="true">
+			<HorizontalLayout height="400">
+				<VerticalLayout height="380" padding="0,20,0,0">		
+					<HorizontalLayout height="50" padding="0,0,0,0">
+						<Label name="huiyuan_chongzhi_curbalance" text="当前余额：" font="2" float="true" pos="30,12,250,40"/>
+					</HorizontalLayout>
+					
+					<HorizontalLayout height="50" padding="0,20,0,0">
+						<Label text="充值：" font="2" float="true" pos="30,12,180,40"/>
+						<Edit name="chongzhi_edit" float="true" pos="98,12,355,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+						<Label text="元" font="2" float="true" pos="362,15,470,40"/>
+					</HorizontalLayout>
+					
+					<HorizontalLayout height="50" padding="0,35,0,0">
+						<Label text="快选：" font="2" float="true" pos="30,12,180,40"/>
+						<Button name="xianjin_kuaijie_50" font="4" text="50元" heiht="36" width="55" padding="100,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
+						<Button name="xianjin_kuaijie_100" font="4" text="100元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
+						<Button name="xianjin_kuaijie_200" font="4" text="200元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
+						<Button name="xianjin_kuaijie_500" font="4" text="500元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
+						<Button name="xianjin_kuaijie_1000" font="4" text="1000元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
+					</HorizontalLayout>
+					
+					<HorizontalLayout height="50" padding="0,35,0,0">
+						<Label text="赠送：" font="2" float="true" pos="30,12,180,40"/>
+						<Edit name="zengsong_edit" float="true" pos="98,12,355,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+						<Label text="元" font="2" float="true" pos="362,15,470,40"/>
+					</HorizontalLayout>
 
-				<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>
+					<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>
 				
-				<Label text="支付方式" font="2" padding="30,40,0,15"/>
-
-				<HorizontalLayout width="180" height="100" padding="15,0,0,0">
-					<Button name="shoukuanBtn" text="" heiht="80" width="180" padding="15,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
-					<Control bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="85,10,109,32" mouse="false"></Control>
-					<Label text="微信支付/支付宝/云闪付" width="140" height="40" font="4" float="true" pos="20,35,180,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+				<HorizontalLayout width="340" 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>
+					
+					<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>
+					
+					<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>
+					
+					<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>
 				</HorizontalLayout>
-			</VerticalLayout>
+			</HorizontalLayout>
 			
-			<HorizontalLayout width="340" 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>
-				
-				<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>
-				
-				<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="支付方式" font="2" padding="30,10,0,15" height="30"/>
+					
+			<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+			
+			<HorizontalLayout name="huiyuan_chongzhi_jiesuan_zhifufangshi_layout">
+				<HorizontalLayout name="huiyuan_chongzhi_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
+					<Button name="huiyuan_chongzhi_jiesuan_zhifufangshi_weixinzhifu_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
+					<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
+					<Label name="zhifu_name" text="微信支付/支付宝/云闪付" multiline="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+				</HorizontalLayout>
 				
-				<Button name="jianpan_dian" 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>
+				<HorizontalLayout name="huiyuan_chongzhi_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
+					<Button name="huiyuan_chongzhi_jiesuan_zhifufangshi_xianjin_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
+					<Control name="zhifu_icon" bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="50,10,71,34" mouse="false"></Control>
+					<Label name="zhifu_name" text="现金支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+				</HorizontalLayout>
 			</HorizontalLayout>
-		</HorizontalLayout>
+		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_tishi_layout" visible="false">
 			<HorizontalLayout padding="0,100,0,0" height="129">

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

@@ -90,7 +90,7 @@
 				<HorizontalLayout height="75">
 					<Button name="huiiyuan_page_bangka_btn" width="130" height="45" padding="30,30,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'" />
 					<Button name="huiiyuan_page_guashi_btn" width="130" height="45" padding="30,30,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'" />
-					<Button name="huiiyuan_page_dongjie_btn" width="130" height="45" padding="30,30,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'" />
+					<Button name="huiiyuan_page_dongjie_btn" width="130" height="45" padding="30,30,0,0" 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'" />
 					<Button name="huiiyuan_page_jiedong_btn" width="130" height="45" padding="30,30,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>
 			</VerticalLayout>

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

@@ -19,12 +19,17 @@
 			<HorizontalLayout height="40" padding="0,20,0,0">
 				<VerticalLayout>
 					<Button name="shoukuan_btn_saomazhifu" 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_saomazhifu_line" height="3" bkcolor="#FF43A947" padding="70,0,150,0"></Control>
+					<Control name="shoukuan_btn_saomazhifu_line" width="180" height="3" bkcolor="#FF43A947" padding="60,0,10,0"></Control>
 				</VerticalLayout>
 				
 				<VerticalLayout>
 					<Button name="shoukuan_btn_shoujihao" text="手机号+密码支付" 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" visible="false" height="3" bkcolor="#FF43A947" padding="30,0,150,0"></Control>
+					<Control name="shoukuan_btn_shoujihao_line" visible="false" width="180" height="3" bkcolor="#FF43A947" padding="60,0,10,0"></Control>
+				</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>
 			
@@ -74,7 +79,17 @@
 					<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>			
+			</HorizontalLayout>	
+
+			<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>
+				
+				<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>

zhipuzi_pos_windows/page/CHuiyuanPageUI.cpp

@@ -496,17 +496,28 @@ void CHuiyuanPageUI::StartHuiyuanChongzhi()
 			order.balance_before = pShoukuanWnd->m_cur_balance;
 			order.balance_after = CLewaimaiString::DoubleToString(atof(m_balance.c_str()) + atof(order.chongzhi_value.c_str()) + atof(order.zengsong_value.c_str()), 2);
 
-			if (pShoukuanWnd->m_fukuanma_type == 1)
+			if (pShoukuanWnd->m_shoukuan_type == 1)
 			{
-				order.pay_type = "微信支付";
+				if (pShoukuanWnd->m_fukuanma_type == 1)
+				{
+					order.pay_type = "微信支付";
+				}
+				else if (pShoukuanWnd->m_fukuanma_type == 2)
+				{
+					order.pay_type = "支付宝";
+				}
+				else if (pShoukuanWnd->m_fukuanma_type == 2)
+				{
+					order.pay_type = "云闪付";
+				}
 			}
-			else if (pShoukuanWnd->m_fukuanma_type == 2)
+			else if (pShoukuanWnd ->m_shoukuan_type == 2)
 			{
-				order.pay_type = "支付宝";
+				order.pay_type = "现金支付";
 			}
-			else if (pShoukuanWnd->m_fukuanma_type == 2)
+			else if (pShoukuanWnd->m_shoukuan_type == 3)
 			{
-				order.pay_type = "云闪付";
+				order.pay_type = CLewaimaiString::UTF8ToANSI(pShoukuanWnd->m_zidingyi_name);
 			}
 			
 			CPosPrinter printer;
@@ -696,8 +707,8 @@ void CHuiyuanPageUI::StartGuashi()
 				int errcode = v_errcode.GetInt();
 				if (errcode != 0)
 				{
-					std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败：") + string(document["errmsg"].GetString());
-					std:wstring errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
+					std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"挂失会员失败：") + string(document["errmsg"].GetString());
+					std::wstring errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 					m_pMainWnd->ShowToast(errorInfo);
 
 					return;
@@ -738,27 +749,17 @@ void CHuiyuanPageUI::StartDongjie()
 		pXiugaiziliaoWnd->SetIcon(IDI_ICON_DUILIB);
 		pXiugaiziliaoWnd->CenterWindow();
 
-		pXiugaiziliaoWnd->SetTitle(L"会员挂失确认");
-		pXiugaiziliaoWnd->SetContent(L"确认挂失该会员卡吗，挂失后会员的实体会员卡将无法使用");
+		pXiugaiziliaoWnd->SetTitle(L"会员冻结确认");
+		pXiugaiziliaoWnd->SetContent(L"确认冻结该会员吗，冻结后该会员的功能暂时无法使用");
 
 		UINT ret = pXiugaiziliaoWnd->ShowModal();
 		if (ret == IDOK)
 		{
 			std::map<string, string> params;
-			params["card_no"] = m_member_card_no;
-			params["name"] = m_name;
-			params["birthday"] = m_birthday;
-			params["address"] = m_address;
-			params["sex"] = m_sex;
-			params["captcha"] = "";
-			params["pay_password"] = m_md5_password;
-			params["open_no_card_payment"] = m_is_open_pay_password;
-			params["is_no_card"] = "1";
 			params["member_id"] = m_member_id;
-			params["card_identify"] = "";
 
 			std::string response;
-			bool ret = CZhipuziHttpClient::GetInstance()->Request("/member/changeinfo", params, response);
+			bool ret = CZhipuziHttpClient::GetInstance()->Request("/member/freeze", params, response);
 			if (!ret)
 			{
 				m_pMainWnd->ShowToast(L"网络错误");
@@ -788,14 +789,14 @@ void CHuiyuanPageUI::StartDongjie()
 				int errcode = v_errcode.GetInt();
 				if (errcode != 0)
 				{
-					std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败：") + string(document["errmsg"].GetString());
-				std:wstring errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
+					std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"冻结会员失败：") + string(document["errmsg"].GetString());
+					std::wstring errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 					m_pMainWnd->ShowToast(errorInfo);
 
 					return;
 				}
 
-				m_pMainWnd->ShowToast(L"实体卡挂失成功");
+				m_pMainWnd->ShowToast(L"会员冻结成功");
 
 				//重新搜索，更新会员信息
 				StartHuiyuanSousuo();
@@ -830,27 +831,17 @@ void CHuiyuanPageUI::StartJiedong()
 		pXiugaiziliaoWnd->SetIcon(IDI_ICON_DUILIB);
 		pXiugaiziliaoWnd->CenterWindow();
 
-		pXiugaiziliaoWnd->SetTitle(L"会员挂失确认");
-		pXiugaiziliaoWnd->SetContent(L"确认挂失该会员卡吗，挂失后会员的实体会员卡将无法使用");
+		pXiugaiziliaoWnd->SetTitle(L"会员解冻确认");
+		pXiugaiziliaoWnd->SetContent(L"确认解冻该会员吗，解冻后该会员将恢复正常的会员功能");
 
 		UINT ret = pXiugaiziliaoWnd->ShowModal();
 		if (ret == IDOK)
 		{
 			std::map<string, string> params;
-			params["card_no"] = m_member_card_no;
-			params["name"] = m_name;
-			params["birthday"] = m_birthday;
-			params["address"] = m_address;
-			params["sex"] = m_sex;
-			params["captcha"] = "";
-			params["pay_password"] = m_md5_password;
-			params["open_no_card_payment"] = m_is_open_pay_password;
-			params["is_no_card"] = "1";
 			params["member_id"] = m_member_id;
-			params["card_identify"] = "";
 
 			std::string response;
-			bool ret = CZhipuziHttpClient::GetInstance()->Request("/member/changeinfo", params, response);
+			bool ret = CZhipuziHttpClient::GetInstance()->Request("/member/unfreeze", params, response);
 			if (!ret)
 			{
 				m_pMainWnd->ShowToast(L"网络错误");
@@ -880,14 +871,14 @@ void CHuiyuanPageUI::StartJiedong()
 				int errcode = v_errcode.GetInt();
 				if (errcode != 0)
 				{
-					std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败：") + string(document["errmsg"].GetString());
-				std:wstring errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
+					std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"解冻会员失败：") + string(document["errmsg"].GetString());
+					std::wstring errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 					m_pMainWnd->ShowToast(errorInfo);
 
 					return;
 				}
 
-				m_pMainWnd->ShowToast(L"实体卡挂失成功");
+				m_pMainWnd->ShowToast(L"会员解冻成功");
 
 				//重新搜索，更新会员信息
 				StartHuiyuanSousuo();

zhipuzi_pos_windows/page/CShoukuanPageUI.cpp

@@ -245,7 +245,61 @@ void CShoukuanPageUI::HandleTextCapture(std::string content)
 	if (m_is_show_modal_wnd == true)
 	{
 		m_curModalWnd->HandleTextCapture(content);
+		return;
+	}
+
+	//按付款码处理
+	std::string s_Fukuanma = content;
+
+	int length = s_Fukuanma.size();
+	if (length != 18 && length != 19)
+	{
+		//肯定不是付款码
+		m_pMainWnd->ShowToast(L"无效的条码！");
+		return;
 	}
+
+	for (int i = 0; i < length; i++)
+	{
+		char c = *(s_Fukuanma.c_str() + i);
+		if (isdigit(c) == 0)
+		{
+			//不是数字
+			m_pMainWnd->ShowToast(L"无效的条码！");
+			return;
+		}
+	}
+
+	if (s_Fukuanma.find("10") == 0 \
+		|| s_Fukuanma.find("11") == 0 \
+		|| s_Fukuanma.find("12") == 0 \
+		|| s_Fukuanma.find("13") == 0 \
+		|| s_Fukuanma.find("14") == 0 \
+		|| s_Fukuanma.find("15") == 0)
+	{
+		//微信付款码
+	}
+	else if (s_Fukuanma.find("25") == 0 \
+		|| s_Fukuanma.find("26") == 0 \
+		|| s_Fukuanma.find("27") == 0 \
+		|| s_Fukuanma.find("28") == 0 \
+		|| s_Fukuanma.find("29") == 0 \
+		|| s_Fukuanma.find("30") == 0)
+	{
+		//支付宝付款码
+	}
+	else if (s_Fukuanma.find("62") == 0)
+	{
+		//云闪付付款码
+	}
+	else
+	{
+		m_pMainWnd->ShowToast(L"无效的条码！");
+		return;
+	}
+
+	//代码能走到这里，说明肯定就是付款码了，默认唤起支付
+	this->StartWeixinzhifuShoukuan(content);
 }
 
 void CShoukuanPageUI::ShowError(std::wstring err)

zhipuzi_pos_windows/wnd/CHuiyuanBangkaWnd.cpp

@@ -287,7 +287,7 @@ void CHuiyuanBangkaWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败：") + string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"会员绑定实体卡失败：") + string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 

zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.cpp

@@ -12,6 +12,17 @@
 void CHuiyuanChongzhiWnd::Init()
 {
 	//::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
+
+	if (m_is_zidingyizhifu_init == false)
+	{
+		//初始化结算页面的支付方式
+		this->InitJiesuanZhifu();
+
+		m_is_zidingyizhifu_init = true;
+	}
+
+	//更新结算按钮位置
+	UpdateJiesuanZhifuPos();
 }
 
 void CHuiyuanChongzhiWnd::Notify(TNotifyUI& msg)
@@ -26,8 +37,29 @@ void CHuiyuanChongzhiWnd::Notify(TNotifyUI& msg)
 		{
 			StartClose();
 		}
-		else if (msg.pSender->GetName() == _T("shoukuanBtn"))
+		else if (msg.pSender->GetName() == _T("huiyuan_chongzhi_jiesuan_zhifufangshi_weixinzhifu_btn"))
 		{
+			m_shoukuan_type = 1;
+
+			StartShoukuan();
+		}
+		else if (msg.pSender->GetName() == L"huiyuan_chongzhi_jiesuan_zhifufangshi_xianjin_btn")
+		{
+			m_shoukuan_type = 2;
+
+			StartShoukuan();
+		}
+		else if (senderName == L"huiyuan_chongzhi_jiesuan_zhifufangshi_zidingyi_btn")
+		{
+			//自定义支付
+			m_shoukuan_type = 3;
+
+			std::wstring name = msg.pSender->GetText();
+			std::wstring selfpay_id = msg.pSender->GetCustomAttribute(L"selfpay_id");
+
+			m_zidingyi_name = CLewaimaiString::UnicodeToUTF8(name);
+			m_zidingyi_id = CLewaimaiString::UnicodeToUTF8(selfpay_id);
+
 			StartShoukuan();
 		}
 		else if (msg.pSender->GetName() == L"xianjin_kuaijie_50")
@@ -297,7 +329,7 @@ void CHuiyuanChongzhiWnd::Notify(TNotifyUI& msg)
 			curEdit->SetText(wsReason.c_str());
 			curEdit->SetFocus();
 		}
-		else if (senderName == L"jianpan_dian")
+		else if (senderName == L"jianpan_qingkong")
 		{
 			CEditUI* curEdit;
 
@@ -311,9 +343,13 @@ void CHuiyuanChongzhiWnd::Notify(TNotifyUI& msg)
 			{
 				curEdit = pZengsong;
 			}
+			
 			wstring wsReason = curEdit->GetText();
 
-			wsReason += L".";
+			wsReason.clear();
+
+			curEdit->SetText(wsReason.c_str());
+			curEdit->SetFocus();
 		}
 	}
 	else if (msg.sType == _T("textchanged"))
@@ -760,6 +796,10 @@ void CHuiyuanChongzhiWnd::StartShoukuan()
 	CEditUI* pZengsongEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("zengsong_edit")));
 	std::wstring ws_zengsong = pZengsongEdit->GetText();
 	m_zengsong = CLewaimaiString::UnicodeToUTF8(ws_zengsong);
+	if (m_zengsong == "")
+	{
+		m_zengsong = "0";
+	}
 
 	double chongzhi_value = atof(m_chongzhi.c_str());
 	double zengsong_value = atof(m_zengsong.c_str());
@@ -806,7 +846,7 @@ void CHuiyuanChongzhiWnd::StartShoukuan()
 	}
 	else
 	{
-		//现金等，直接开始调用接口，以后做
+		//现金、自定义支付等，直接开始调用接口
 		m_shoukuan_status = 1;
 
 		CVerticalLayoutUI* before_pay_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_before_pay_layout")));
@@ -827,24 +867,13 @@ void CHuiyuanChongzhiWnd::StartShoukuan()
 
 void CHuiyuanChongzhiWnd::HandleShoukuan()
 {
-	//先判断收款码的格式是否正确
-	std::string s_Fukuanma = m_fukuanma;
-
-	int length = s_Fukuanma.size();
-	if (length != 18 && length != 19)
+	if (m_shoukuan_type == 1)
 	{
-		m_shoukuan_status = 4;
-
-		m_fail_message = L"收款码格式不对，请检查后重新输入！";
-
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
-		return;
-	}
+		//先判断收款码的格式是否正确
+		std::string s_Fukuanma = m_fukuanma;
 
-	for (int i = 0; i < length; i++)
-	{
-		char c = *(s_Fukuanma.c_str() + i);
-		if (isdigit(c) == 0)
+		int length = s_Fukuanma.size();
+		if (length != 18 && length != 19)
 		{
 			m_shoukuan_status = 4;
 
@@ -853,41 +882,55 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
-	}
 
-	if (s_Fukuanma.find("10") == 0 \
-		|| s_Fukuanma.find("11") == 0 \
-		|| s_Fukuanma.find("12") == 0 \
-		|| s_Fukuanma.find("13") == 0 \
-		|| s_Fukuanma.find("14") == 0 \
-		|| s_Fukuanma.find("15") == 0)
-	{
-		//微信付款码
-		m_fukuanma_type = 1;
-	}
-	else if (s_Fukuanma.find("25") == 0 \
-		|| s_Fukuanma.find("26") == 0 \
-		|| s_Fukuanma.find("27") == 0 \
-		|| s_Fukuanma.find("28") == 0 \
-		|| s_Fukuanma.find("29") == 0 \
-		|| s_Fukuanma.find("30") == 0)
-	{
-		//支付宝付款码
-		m_fukuanma_type = 2;
-	}
-	else if (s_Fukuanma.find("62") == 0)
-	{
-		//云闪付付款码
-		m_fukuanma_type = 3;
-	}
-	else
-	{
-		m_shoukuan_status = 4;
+		for (int i = 0; i < length; i++)
+		{
+			char c = *(s_Fukuanma.c_str() + i);
+			if (isdigit(c) == 0)
+			{
+				m_shoukuan_status = 4;
 
-		m_fail_message = L"收款码格式不对，请检查后重新输入！";
+				m_fail_message = L"收款码格式不对，请检查后重新输入！";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
-		return;
+				SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+				return;
+			}
+		}
+
+		if (s_Fukuanma.find("10") == 0 \
+			|| s_Fukuanma.find("11") == 0 \
+			|| s_Fukuanma.find("12") == 0 \
+			|| s_Fukuanma.find("13") == 0 \
+			|| s_Fukuanma.find("14") == 0 \
+			|| s_Fukuanma.find("15") == 0)
+		{
+			//微信付款码
+			m_fukuanma_type = 1;
+		}
+		else if (s_Fukuanma.find("25") == 0 \
+			|| s_Fukuanma.find("26") == 0 \
+			|| s_Fukuanma.find("27") == 0 \
+			|| s_Fukuanma.find("28") == 0 \
+			|| s_Fukuanma.find("29") == 0 \
+			|| s_Fukuanma.find("30") == 0)
+		{
+			//支付宝付款码
+			m_fukuanma_type = 2;
+		}
+		else if (s_Fukuanma.find("62") == 0)
+		{
+			//云闪付付款码
+			m_fukuanma_type = 3;
+		}
+		else
+		{
+			m_shoukuan_status = 4;
+
+			m_fail_message = L"收款码格式不对，请检查后重新输入！";
+
+			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			return;
+		}
 	}
 
 	//先获取会员充值的token
@@ -978,6 +1021,19 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 	{
 		params_2["zhifu_type"] = "7";
 	}
+	else if (m_shoukuan_type == 2)
+	{
+		params_2["zhifu_type"] = "4";
+	}
+	else if (m_shoukuan_type == 3)
+	{
+		params_2["zhifu_type"] = "5";
+
+		params_2["zidingyi_pay_id"] = m_zidingyi_id;
+		params_2["zhifu_name"] = m_zidingyi_name;
+		params_2["is_guazhang"] = "1";
+		params_2["guazhang"] = m_chongzhi;
+	}
 
 	std::string response_2;
 
@@ -1341,4 +1397,110 @@ void CHuiyuanChongzhiWnd::SetCurBalance(std::string balance)
 
 	CLabelUI* pCurBalance = static_cast<CLabelUI*>(m_pm.FindControl(_T("huiyuan_chongzhi_curbalance")));
 	pCurBalance->SetText((L"当前余额：" + CLewaimaiString::UTF8ToUnicode(m_cur_balance)).c_str());
+}
+
+void CHuiyuanChongzhiWnd::InitJiesuanZhifu()
+{
+	CHorizontalLayoutUI* pZhifufangshiLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("huiyuan_chongzhi_jiesuan_zhifufangshi_layout")));
+
+	int num = 0;
+
+	CHorizontalLayoutUI* pWeixinLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("huiyuan_chongzhi_jiesuan_zhifufangshi_weixinzhifu")));
+	if (CShopinfo::GetInstance()->m_is_online_pay_open == "1")
+	{
+		//展示微信支付，并且调整位置
+		pWeixinLayout->SetVisible(true);
+
+		num++;
+	}
+	else
+	{
+		pZhifufangshiLayout->RemoveAt(num);
+	}
+
+	//现金支付
+	CHorizontalLayoutUI* pXianjinLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("huiyuan_chongzhi_jiesuan_zhifufangshi_xianjin")));
+	if (CShopinfo::GetInstance()->m_is_cash_pay_open == "1")
+	{
+		pXianjinLayout->SetVisible(true);
+
+		num++;
+	}
+	else
+	{
+		pZhifufangshiLayout->RemoveAt(num);
+	}
+
+	//接着添加自定义支付的
+	for (std::vector<SelfPay>::iterator it = CShopinfo::GetInstance()->m_self_pay.begin(); it != CShopinfo::GetInstance()->m_self_pay.end(); it++)
+	{
+		SelfPay selfpay = *it;
+
+		if (selfpay.is_open == "1")
+		{
+			CButtonUI* newButton = new CButtonUI();
+
+			newButton->SetFixedWidth(120);
+			newButton->SetFixedHeight(80);
+			newButton->SetText(CLewaimaiString::UTF8ToUnicode(selfpay.name).c_str());
+
+			newButton->SetBorderSize(1);
+			newButton->SetBorderColor(0xFFC1C1C1);
+			newButton->SetBkColor(0xFFF7F7F7);
+
+			//设置定义属性，在点击按钮的时候好区分
+			newButton->SetAttribute(L"name", L"huiyuan_chongzhi_jiesuan_zhifufangshi_zidingyi_btn");
+			newButton->AddCustomAttribute(L"selfpay_id", CLewaimaiString::UTF8ToUnicode(selfpay.id).c_str());
+			newButton->SetAttribute(L"float", L"true");
+
+			//必须先Add，才能调用下面的SetPos，否则无效
+			pZhifufangshiLayout->Add(newButton);
+
+			num++;
+		}
+	}
+
+	m_nZhiufuNum = num;
+}
+
+void CHuiyuanChongzhiWnd::UpdateJiesuanZhifuPos()
+{
+	//添加支付方式
+	int nWidth = m_nPageWidth;
+	if (nWidth == 0)
+	{
+		return;
+	}
+
+	//根据宽度计算每行显示的数量
+	int nMeihangNum = (nWidth) / 144;
+	if (nMeihangNum < 1)
+	{
+		nMeihangNum = 1;
+	}
+
+	int num = 0;
+
+	CHorizontalLayoutUI* pZhifufangshiLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("huiyuan_chongzhi_jiesuan_zhifufangshi_layout")));
+	for (int i = 0; i < m_nZhiufuNum; i++)
+	{
+		CButtonUI* curItem = static_cast<CButtonUI*>(pZhifufangshiLayout->GetItemAt(i));
+
+		int curRow = num / nMeihangNum + 1;
+		int curCol = num % nMeihangNum + 1;
+
+		RECT rect;
+		rect.left = (curCol - 1) * 140 + 20;
+		rect.right = rect.left + 120;
+		rect.top = (curRow - 1) * 100 + 20;
+		rect.bottom = rect.top + 80;
+
+		curItem->SetPos(rect);
+
+		num++;
+	}
+
+	//调整区域高度
+	int lastRow = (num - 1) / nMeihangNum + 1;
+	pZhifufangshiLayout->SetFixedHeight(lastRow * 105);
 }

zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.h

@@ -84,9 +84,23 @@ public:
 
 	void SetCurBalance(std::string balance);
 
+	//初始化结算页面的支付方式展示(仅需要在页面初始化的时候调用一次，这里只添加支付方式，不设置位置）
+	void InitJiesuanZhifu();
+
+	//这个只更新结算页面支付方式的位置，不处理控件添加
+	void UpdateJiesuanZhifuPos();
+
 public:
 	CPaintManagerUI m_pm;
 
+	bool m_is_zidingyizhifu_init = false;
+
+	//结算页面总的支付方式数量
+	int m_nZhiufuNum;
+
+	//当前控件的实际宽度
+	int m_nPageWidth = 800;
+
 	//当前充值会员的余额
 	std::string m_cur_balance;
 
@@ -110,7 +124,11 @@ public:
 	
 	int m_inputType = 1; //当前输入框 1：输入充值金额 2：输入赠送金额
 
-	int m_shoukuan_type = 1; //1 微信支付
+	int m_shoukuan_type = 1; //1 微信支付 2 现金支付 3 自定义支付
+
+	//自定义支付相关的2个参数
+	std::string m_zidingyi_name;
+	std::string m_zidingyi_id;
 
 	//微信支付时，是否进入到扫码状态
 	bool m_is_start_saoma = false;

zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.cpp

@@ -36,18 +36,27 @@ void CHuiyuanShoukuanWnd::Notify(TNotifyUI& msg)
 			CHorizontalLayoutUI* pShoujihaoLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("fukuan_input_shoujihao_layout")));
 			pShoujihaoLayout->SetVisible(false);
 
+			CHorizontalLayoutUI* pShitikaLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("fukuan_input_shitika_layout")));
+			pShitikaLayout->SetVisible(false);
+
 			CButtonUI* pFukuanmaBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_saomazhifu")));
 			pFukuanmaBtn->SetTextColor(0xFF43A947);
 
 			CButtonUI* pShoujihaoBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_shoujihao")));
 			pShoujihaoBtn->SetTextColor(0xFF555555);
 
+			CButtonUI* pShitikaBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_shitika")));
+			pShitikaBtn->SetTextColor(0xFF555555);
+
 			CControlUI* pFukuanmaLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_saomazhifu_line")));
 			pFukuanmaLine->SetVisible(true);
 
 			CControlUI* pShoujihaoLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_shoujihao_line")));
 			pShoujihaoLine->SetVisible(false);
 
+			CControlUI* pShitikaLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_shitika_line")));
+			pShitikaLine->SetVisible(false);
+
 			m_shoukuanModel = 1;
 		}
 		else if (msg.pSender->GetName() == L"shoukuan_btn_shoujihao")
@@ -58,18 +67,27 @@ void CHuiyuanShoukuanWnd::Notify(TNotifyUI& msg)
 			CHorizontalLayoutUI* pShoujihaoLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("fukuan_input_shoujihao_layout")));
 			pShoujihaoLayout->SetVisible(true);
 
+			CHorizontalLayoutUI* pShitikaLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("fukuan_input_shitika_layout")));
+			pShitikaLayout->SetVisible(false);
+
 			CButtonUI* pFukuanmaBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_saomazhifu")));
 			pFukuanmaBtn->SetTextColor(0xFF555555);
 
 			CButtonUI* pShoujihaoBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_shoujihao")));
 			pShoujihaoBtn->SetTextColor(0xFF43A947);
 
+			CButtonUI* pShitikaBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_shitika")));
+			pShitikaBtn->SetTextColor(0xFF555555);
+
 			CControlUI* pFukuanmaLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_saomazhifu_line")));
 			pFukuanmaLine->SetVisible(false);
 
 			CControlUI* pShoujihaoLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_shoujihao_line")));
 			pShoujihaoLine->SetVisible(true);
 
+			CControlUI* pShitikaLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_shitika_line")));
+			pShitikaLine->SetVisible(false);
+
 			m_shoukuanModel = 2;
 
 			m_pm.SetNextTabControl(false);
@@ -77,6 +95,37 @@ void CHuiyuanShoukuanWnd::Notify(TNotifyUI& msg)
 			CEditUI* pShoujihao = static_cast<CEditUI*>(m_pm.FindControl(_T("shoujihao_edit")));
 			pShoujihao->SetFocus();
 		}
+		else if (msg.pSender->GetName() == L"shoukuan_btn_shitika")
+		{
+			CHorizontalLayoutUI* pFukuanmaLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("fukuan_input_fukuanma_layout")));
+			pFukuanmaLayout->SetVisible(false);
+
+			CHorizontalLayoutUI* pShoujihaoLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("fukuan_input_shoujihao_layout")));
+			pShoujihaoLayout->SetVisible(false);
+
+			CHorizontalLayoutUI* pShitikaLayout = static_cast<CHorizontalLayoutUI*>(m_pm.FindControl(_T("fukuan_input_shitika_layout")));
+			pShitikaLayout->SetVisible(true);
+
+			CButtonUI* pFukuanmaBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_saomazhifu")));
+			pFukuanmaBtn->SetTextColor(0xFF555555);
+
+			CButtonUI* pShoujihaoBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_shoujihao")));
+			pShoujihaoBtn->SetTextColor(0xFF555555);
+
+			CButtonUI* pShitikaBtn = static_cast<CButtonUI*>(m_pm.FindControl(_T("shoukuan_btn_shitika")));
+			pShitikaBtn->SetTextColor(0xFF43A947);
+
+			CControlUI* pFukuanmaLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_saomazhifu_line")));
+			pFukuanmaLine->SetVisible(false);
+
+			CControlUI* pShoujihaoLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_shoujihao_line")));
+			pShoujihaoLine->SetVisible(false);
+
+			CControlUI* pShitikaLine = static_cast<CControlUI*>(m_pm.FindControl(_T("shoukuan_btn_shitika_line")));
+			pShitikaLine->SetVisible(true);
+
+			m_shoukuanModel = 3;
+		}
 		else if (senderName == L"jianpan_1")
 		{
 			CEditUI* curEdit;
@@ -976,6 +1025,10 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 		m_commonParams["phone"] = m_shoujihao;
 		m_commonParams["pay_password"] = md5(m_password);
 	}
+	else if (m_shoukuanModel == 3)
+	{
+		m_commonParams["card_identify"] = m_card_identify;
+	}
 
 	std::string response;
 
@@ -1214,4 +1267,10 @@ void CHuiyuanShoukuanWnd::HandleTextCapture(std::string content)
 
 		StartShoukuan();
 	}
+	else if (m_shoukuanModel == 3)
+	{
+		m_card_identify = content;
+		
+		StartShoukuan();
+	}
 }

zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.h

@@ -95,6 +95,8 @@ public:
 	std::string m_shoujihao;
 	std::string m_password;
 
+	std::string m_card_identify;
+
 	//收款状态 0：未开始 1：请求发给服务器了，但是暂时还没得到反馈 2：查询密码中 3：成功 4：失败 5：正在取消支付
 	int m_shoukuan_status = 0;
 
@@ -105,7 +107,7 @@ public:
 
 	std::map<string, string> m_commonParams;
 
-	int m_shoukuanModel = 1; //收款模式 1：会员扫码 2：手机号+密码
+	int m_shoukuanModel = 1; //收款模式 1：会员扫码 2：手机号+密码 3 实体卡
 
 	int m_inputType = 1; //当前输入框 1：输入手机号 2：输入密码
 

zhipuzi_pos_windows/wnd/CToastWnd.h

@@ -21,7 +21,7 @@ public:
 		//WindowImplBase::OnFinalMessage(hWnd);
 		m_pm.RemovePreMessageFilter(this);
 
-		//delete this;
+		delete this;
 	};
 
 	void Init();