开始做收款功能

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

@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>
+	<DiandanPage>
+		<HorizontalLayout>
+			<Control width="1" bkcolor="#FFD1D1D1"></Control>
+			
+			<VerticalLayout width="490" bkcolor="#FFFFFFFF">
+				<HorizontalLayout>					
+					<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>
+							<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>
+							<Control bkimage="order_delete.png" width="20" height="20" padding="0,20,0,0"></Control>
+							<Button name="btn_diandan_qingkong" text="清空" height="38" width="40" padding="0,10,10,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="50" bkcolor="#FFF5F5F5">
+							<Control bkimage="beizhu_tishi.png" width="24" height="24" padding="10,13,0,0"></Control>
+							<Label name="diandan_page_label_zhengdanbeizhu" text="整单备注：" height="30" padding="10,10,10,10" textcolor="#FF8D8D8D"></Label>
+						</HorizontalLayout>
+												
+						<List name="list_diandan_cart" padding="0,10,0,0" itemlinecolor="#FF000000" vscrollbar="true">
+							<ListHeader inset="10,0,0,0"/>
+							<ListHeaderItem text="商品" width="220" align="left" />
+							<ListHeaderItem text="数量" width="80" align="center" />
+							<ListHeaderItem text="金额" width="80" align="center" />
+						</List>
+						
+						<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
+							<Label name="diandan_page_youhui_tishi" text="已优惠10元" textcolor="#FFFF3838" padding="15,0,0,0" width="270" hegiht="40"></Label>
+							<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF3CB371" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+						</HorizontalLayout>
+					</VerticalLayout>
+					
+					<Control width="1" bkcolor="#FFEBE8E8"></Control>
+					
+					<VerticalLayout width="110" padding="0,0,0,0" vscrollbar="true">
+						<Button name="btn_diandan_jia" width="90" height="40" padding="10,50,10,0" text="+" font="24" 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'" />
+						<Button name="btn_diandan_jian" width="90" height="40" padding="10,15,10,0" text="-" font="24" 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'" />
+						<Button name="btn_diandan_shanchu" width="90" height="40" padding="10,15,10,0" 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'" />
+						<Button name="btn_diandan_guige" width="90" height="40" padding="10,30,10,0" 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'" />
+						
+						<Button name="btn_diandan_dabao" width="90" height="40" padding="10,15,10,0" 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'" />
+						
+						<Button name="btn_diandan_cundan" width="90" height="40" padding="10,50,10,0" 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'" />
+						<Button name="btn_diandan_qudan" width="90" height="40" padding="10,15,10,0" 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'" />
+						
+						<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" textcolor="#FFFFFFFF" bkimage="num_bkg.png" float="true" pos="85,430,104,449" bordercolor="#FFFF0000" bordersize="0"></Label>
+						
+						<Button name="btn_diandan_zhengdanbeizhu" width="90" height="40" padding="10,15,10,0" 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'" />
+						
+						<Button name="btn_diandan_qianxiang" width="90" height="40" padding="10,50,10,30" 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'" />
+					</VerticalLayout>
+				</HorizontalLayout>
+				
+				<Control height="1" bkcolor="#FFEBE8E8"></Control>
+				
+				<VerticalLayout height="165" bkcolor="#FFFFFFFF">
+					<HorizontalLayout height="70">
+						<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,24,0,0"></Label>
+						<Label name="diandan_page_totalprice" text="总价：¥0.00" font="22" textcolor="#FFFF0000" width="200" align="right" padding="0,0,15,0"></Label>
+					</HorizontalLayout>
+					
+					<HorizontalLayout height="90" name="diandan_pay_layout">
+						<Button name="btn_diandan_weixinzhifu_pay" text="" height="75" width="110" padding="10,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="56,10,80,32" mouse="false"></Control>
+						<Label text="微信支付/支付宝/云闪付" multiline="true" width="110" height="40" font="14" float="true" pos="11,35,121,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+						
+						<Button name="btn_diandan_huiyuanzhifu_pay" text="" height="75" width="110" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
+						<Control bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="176,12,202,32" mouse="false"></Control>
+						<Label text="会员支付" width="110" height="35" font="14" float="true" pos="159,35,269,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+					
+						<Button name="btn_diandan_xianjinzhifu_pay" text="" height="75" width="110" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
+						<Control bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="297,10,318,34" mouse="false"></Control>
+						<Label text="现金支付" width="110" height="35" font="14" float="true" pos="279,35,389,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+						
+						<Button name="btn_diandan_gengduozhifu_pay" text="" height="75" width="108" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+						<Control bkimage="gengduozhifu_icon.png" width="21" height="21" float="true" pos="413,10,434,31" mouse="false"></Control>
+						<Label text="更多支付" width="110" height="35" font="14" float="true" pos="394,35,504,70" mouse="false"></Label>
+					</HorizontalLayout>
+					
+					<Button visible="false" name="btn_diandan_jixujiacai" text="继续点单" height="55" padding="20,20,20,15" textcolor="#FFFFFFFF"></Button>
+				</VerticalLayout>
+			</VerticalLayout>
+			
+			<Control width="1" bkcolor="#FFEBE8E8"></Control>
+			
+			<VerticalLayout name="diandan_food_layout">
+				<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
+					<HorizontalLayout name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+
+					</HorizontalLayout>
+				</VerticalLayout>
+				
+				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="15,15,15,15" childpadding="1" itemsize="160,250" vscrollbar="true" hscrollbar="false">
+				
+				</TileLayout>
+				
+				<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+					<Edit name="diandan_food_search_edit" tooltip="请输入商品名字搜索" width="380" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
+					
+					<Label name="diandan_food_search_tishi" text="请输入商品名字搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
+					
+					<Control bkimage="search_icon.png" width="25" height="26" pos="45,23,70,49" float="true"></Control>
+					
+					<Button name="diandan_food_search_clear" visible="false" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png" width="23" height="23" pos="365,23,68,46" float="true"></Button>
+				</HorizontalLayout>
+			</VerticalLayout>
+			
+			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false" hscrollbar="true">
+				<VerticalLayout width="390">
+					<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="20"></Label>
+					
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+					
+					<HorizontalLayout padding="0,15,0,0" height="48">
+						<Label text="整单折扣：" width="90" height="48" padding="20,0,0,0"></Label>
+						<Button name="diandan_jiesuan_zhekou_value" text="" height="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+						<Label text="%" width="60" height="48" padding="20,0,0,0"></Label>
+					</HorizontalLayout>
+					
+					<HorizontalLayout padding="0,15,0,0" height="48">
+						<Label text="加价：" width="90" height="48" padding="20,0,0,0"></Label>
+						<Button name="diandan_jiesuan_jiajia_value" text="" height="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+						<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
+					</HorizontalLayout>
+					
+					<HorizontalLayout padding="0,15,0,0" height="48">
+						<Label text="优惠：" width="90" height="48" padding="20,0,0,0"></Label>
+						<Button name="diandan_jiesuan_youhui_value" text="" height="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+						<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
+					</HorizontalLayout>
+					
+					<HorizontalLayout padding="0,15,0,0" height="48">
+						<Label text="优惠券：" width="90" height="48" padding="20,0,0,0"></Label>
+						<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+						<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+						<Button name="diandan_jiesuan_youhuiquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+					</HorizontalLayout>
+					
+					<HorizontalLayout padding="0,15,0,0" height="48">
+						<Label text="商品券：" width="90" height="48" padding="20,0,0,0"></Label>
+						<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+						<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+						<Button name="diandan_jiesuan_shangpinquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+					</HorizontalLayout>
+					
+					<HorizontalLayout padding="0,15,0,0" height="48">
+						<Label text="次卡：" width="90" height="48" padding="20,0,0,0"></Label>
+						<Label name="diandan_jiesuan_cika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+						<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+						<Button name="diandan_jiesuan_cika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+					</HorizontalLayout>
+					
+					<HorizontalLayout padding="0,15,0,0" height="48">
+						<Label text="权益卡：" width="90" height="48" padding="20,0,0,0"></Label>
+						<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+						<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+						<Button name="diandan_jiesuan_quanyika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+					</HorizontalLayout>
+					
+					<HorizontalLayout padding="0,15,0,0" height="130">
+						<Label text="抹零：" width="90" height="48" padding="20,0,0,0"></Label>
+						<VerticalLayout padding="0,10,0,0">
+							<HorizontalLayout padding="0,0,30,0" width="200" height="30">
+								<CheckBox name="diandan_jiesuan_moling_bumoling" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label name="" text="不抹零" width="150" height="30" padding="15,0,0,0"/>
+							</HorizontalLayout>
+							
+							<HorizontalLayout padding="0,0,30,0" width="200" height="30">
+								<CheckBox name="diandan_jiesuan_moling_molingdaojiao" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label name="" text="抹零到角" width="150" height="30" padding="15,0,0,0"/>
+							</HorizontalLayout>
+							
+							<HorizontalLayout padding="0,0,30,0" width="200" height="30">
+								<CheckBox name="diandan_jiesuan_moling_molingdaoyuan" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label name="" text="抹零到元" width="150" height="30" padding="15,0,0,0"/>
+							</HorizontalLayout>
+						</VerticalLayout>
+					</HorizontalLayout>
+				</VerticalLayout>
+				
+				<Control width="1" bkcolor="#FFEBE8E8"></Control>
+				
+				<VerticalLayout name="diandan_page_jiesuan_zhangdan_layout" vscrollbar="true">
+					<Label text="账单明细" height="58" padding="20,0,0,0" font="20"></Label>
+					
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+					
+					<VerticalLayout name="diandan_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
+					
+					</VerticalLayout>
+					
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,10,10,0"></Control>
+					
+					<HorizontalLayout height="50">
+						<Control></Control>
+						<Label name="diandan_jiesuan_total_yingshou" text="" width="150" height="50" align="right" padding="0,0,15,0"/>
+					</HorizontalLayout>
+					
+					<Label text="支付方式" width="100" height="58" padding="20,30,0,0" font="20"></Label>
+					
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+					
+					<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout">
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
+							<Button name="diandan_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>
+						
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_huiyuan_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
+							<Control name="zhifu_icon" bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="50,10,76,30" 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 name="diandan_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
+							<Button name="diandan_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 name="diandan_jiesuan_zhifufangshi_gouwuka" width="122" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_gouwuka_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<Control name="zhifu_icon" bkimage="gouwuka_icon.png" width="34" height="28" float="true" pos="45,10,79,38" mouse="false"></Control>
+							<Label name="zhifu_name" text="购物卡" width="180" height="35" font="14" float="true" pos="38,35,218,70" mouse="false"></Label>
+						</HorizontalLayout>
+						
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_meishicheng" width="122" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_meishicheng_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<Control name="zhifu_icon" bkimage="meishicheng_icon.png" width="37" height="27" float="true" pos="48,10,85,37" mouse="false"></Control>
+							<Label name="zhifu_name" text="美食城临时卡" width="180" height="35" font="14" float="true" pos="25,35,205,70" mouse="false"></Label>
+						</HorizontalLayout>
+						-->
+						
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_fulika" width="122" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_fulika_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<Control name="zhifu_icon" bkimage="fulika_icon.png" width="30" height="30" float="true" pos="48,10,78,40" mouse="false"></Control>
+							<Label name="zhifu_name" text="福利卡" width="180" height="35" font="14" float="true" pos="40,35,220,70" mouse="false"></Label>
+						</HorizontalLayout>
+					</HorizontalLayout>
+				</VerticalLayout>
+			</HorizontalLayout>
+		</HorizontalLayout>
+	</DiandanPage>
+</Window>

zhipuzi_pos_windows/page/CGengduoPageUI.cpp

@@ -184,6 +184,12 @@ void CGengduoPageUI::Refresh()
 			pImage->SetBkImage(L"main_saomashouyin.png");
 			pItem->SetName(L"saomashouyin");
 		}
+		else if (*it == "shoukuan")
+		{
+			pTitle->SetText(L"ÊÕ¿î");
+			pImage->SetBkImage(L"main_shoukuan.png");
+			pItem->SetName(L"shoukuan");
+		}
 		else
 		{
 			continue;
@@ -343,6 +349,18 @@ void CGengduoPageUI::Refresh()
 			pBack->SetName(L"gengduo_back");
 			pExchange->SetName(L"gengduo_exchange");
 		}
+		else if (*it == "shoukuan")
+		{
+			pTitle->SetText(L"ÊÕ¿î");
+			pImage->SetBkImage(L"main_shoukuan.png");
+			pItem->SetName(L"shoukuan");
+
+			pExchange->SetText(L"ÉÏÒÆ");
+
+			pFront->SetName(L"gengduo_front");
+			pBack->SetName(L"gengduo_back");
+			pExchange->SetName(L"gengduo_exchange");
+		}
 		else
 		{
 			continue;

zhipuzi_pos_windows/tool/CSetting.cpp

@@ -341,7 +341,7 @@ void CSetting::Init()
 	std::string setting_gongneng_gengduo_string = "setting_gongneng_gengduo_string";
 	if (m_paramsMap.find(setting_gongneng_gengduo_string) == m_paramsMap.end())
 	{
-		m_paramsMap[setting_gongneng_gengduo_string] = "shangpin,kucun,caigou,zhengcan,saomashouyin";
+		m_paramsMap[setting_gongneng_gengduo_string] = "shangpin,kucun,caigou,zhengcan,saomashouyin,shoukuan";
 	}
 
 	//点单页面关于抹零的设置 0 不抹零 1 抹零到角 2 抹零到元

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -282,7 +282,7 @@ void CMainWnd::HandleSelectChangeMsg(TNotifyUI& msg)
 	std::wstring ws_name = name;
 
 	if (ws_name == _T("main_diandan") || ws_name == _T("main_dingdan") || ws_name == _T("main_huiyuan") || ws_name == _T("main_baobiao") || ws_name == _T("main_jiaoban") || ws_name == _T("main_setting") || ws_name == _T("main_gengduo") \
-		|| ws_name == _T("main_shangpin") || ws_name == _T("main_kucun") || ws_name == _T("main_caigou") || ws_name == _T("main_zhengcan") || ws_name == _T("main_saomashouyin"))
+		|| ws_name == _T("main_shangpin") || ws_name == _T("main_kucun") || ws_name == _T("main_caigou") || ws_name == _T("main_zhengcan") || ws_name == _T("main_saomashouyin") || ws_name == _T("main_shoukuan"))
 	{
 		SwitchPageByName(ws_name);
 	}
@@ -1089,6 +1089,14 @@ void CMainWnd::UpdateGongnengDaohang()
 			newOption->SetNormalImage(L"file='main_saomashouyin.png' source='0,0,50,50' dest='25,13,75,63'");
 			newOption->SetSelectedImage(L"file='main_saomashouyin_select.png' source='0,0,50,50' dest='25,13,75,63'");
 		}
+		else if (curName == "shoukuan")
+		{
+			newOption->SetName(L"main_shoukuan");
+			newOption->SetText(L"收款");
+
+			newOption->SetNormalImage(L"file='main_shoukuan.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_shoukuan_select.png' source='0,0,50,50' dest='25,13,75,63'");
+		}
 
 		layout->Add(newOption);
 	}
@@ -1189,6 +1197,10 @@ void CMainWnd::SwitchPageByName(std::wstring name)
 	{
 		this->SwitchPage(SAOMASHOUYIN);
 	}
+	else if (name == L"main_shoukuan")
+	{
+		this->SwitchPage(SHOUKUAN);
+	}
 	else if (name == L"main_kucun")
 	{
 		this->SwitchPage(KUCUN);
@@ -1424,6 +1436,13 @@ void CMainWnd::CreatePages()
 		m_pages[ZHENGCANINFO] = pChildContainer;
 	}
 
+	{
+		CDialogBuilder builder;
+		CDialogBuilderCallbackEx cb;
+		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("shoukuan_page.xml"), (UINT)0, &cb, &m_pm));
+		m_pages[SHOUKUAN] = pChildContainer;
+	}
+
 	//这里纯粹只是创建对象，不做任何初始化等处理
 }
 
@@ -1629,6 +1648,12 @@ void CMainWnd::UpdateGongnengString()
 		//如果以后有其他零售版专属的，要在这里继续添加
 	}
 
+	//新版本增加了扫码收银
+	if (TmpMap.find("shoukuan") == TmpMap.end())
+	{
+		TmpgengduoVector.push_back("shoukuan");
+	}
+
 	//这个时候已经过滤掉了不需要的，加上了被删除的，可以保存数据库了
 	gengduoVector = TmpgengduoVector;
 

zhipuzi_pos_windows/wnd/CMainWnd.h

@@ -35,6 +35,7 @@ public:
 		ZHENGCANDIANDAN, //正餐点单
 		ZHENGCANDINGDAN, //正餐订单列表
 		ZHENGCANINFO, //正餐订单详情
+		SHOUKUAN, //快速收银页面
 	};
 
     LPCTSTR GetWindowClassName() const