继续优化

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

@@ -4,7 +4,7 @@
 	<ListContainerElement name="diandan_cart_item" width="380" height="42">
 		<VerticalLayout>
 			<HorizontalLayout height="42"> 
-				<Label name="diandan_cart_item_name" width="220" height="42" align="left" valign="center" padding="10,0,0,0" multiline="true" endellipsis="true" />
+				<Label name="diandan_cart_item_name" width="220" height="42" align="left" valign="vcenter" padding="10,0,0,0"  endellipsis="true"/>
 				<Label name="diandan_cart_item_num" width="80" align="center"/> 
 				<Label name="diandan_cart_item_price" width="80" align="center"/>
 			</HorizontalLayout>

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

@@ -9,18 +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="会员登录" heiht="38" width="100" padding="10,2,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							<Label name="diandan_page_member_info" text="" width="130" heiht="30" padding="10,10,10,10" visible="false"></Label>
+							<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="输入餐牌号" heiht="38" width="100" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+							<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="清空" heiht="38" width="40" padding="0,0,10,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+							<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="整单备注：" heiht="30" padding="10,10,10,10" textcolor="#FF8D8D8D"></Label>
+							<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">
@@ -32,14 +32,14 @@
 						
 						<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="查看优惠>" heiht="30" width="80" padding="5,0,25,0" textcolor="#FF3CB371" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+							<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,0,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="46" padding="10,80,10,0" text="+" font="24" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_jia" width="90" height="46" padding="10,50,10,0" text="+" font="24" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 						<Button name="btn_diandan_jian" width="90" height="46" padding="10,15,10,0" text="-" font="24" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 						<Button name="btn_diandan_shanchu" width="90" height="46" padding="10,15,10,0" text="删除" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 						<Button name="btn_diandan_guige" width="90" height="46" padding="10,30,10,0" text="规格/做法" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
@@ -61,24 +61,24 @@
 				
 				<VerticalLayout height="165" bkcolor="#FFFFFFFF">
 					<HorizontalLayout height="70">
-						<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,8,0,0"></Label>
+						<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="" heiht="75" width="110" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
+						<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="" heiht="75" width="110" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
+						<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="" heiht="75" width="110" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
+						<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="" heiht="75" width="108" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+						<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>
@@ -119,48 +119,48 @@
 					
 					<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="" heiht="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+						<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="" heiht="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+						<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="" heiht="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+						<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+						<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+						<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+						<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+						<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">
@@ -208,39 +208,39 @@
 					
 					<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
+							<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
+							<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
+							<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<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>

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

@@ -4,7 +4,7 @@
 		<VerticalLayout name="page_layout">
 			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
 				<Button name="diandan_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
-				<Label name="diandan_page_table_name" text="" font="28" textcolor="#FF1087FF" width="300" heiht="30" padding="10,10,10,10"></Label>
+				<Label name="diandan_page_table_name" text="" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
 			</HorizontalLayout>
 			
 			<Control height="1" bkcolor="#FFEBE8E8"></Control>
@@ -17,18 +17,18 @@
 						<VerticalLayout width="380" padding="0,0,0,0">					
 							<HorizontalLayout 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="会员登录" heiht="38" width="100" padding="10,2,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-								<Label name="diandan_page_member_info" text="" width="130" heiht="30" padding="10,10,10,10" visible="false"></Label>
+								<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="输入餐牌号" heiht="38" width="100" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+								<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="清空" heiht="38" width="40" padding="0,0,10,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+								<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="整单备注：" heiht="30" padding="10,10,10,10" textcolor="#FF8D8D8D"></Label>
+								<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">
@@ -40,14 +40,14 @@
 							
 							<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="查看优惠>" heiht="30" width="80" padding="5,0,25,0" textcolor="#FF3CB371" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+								<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,0,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="46" padding="10,80,10,0" text="+" font="24" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
+							<Button name="btn_diandan_jia" width="90" height="46" padding="10,50,10,0" text="+" font="24" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 							<Button name="btn_diandan_jian" width="90" height="46" padding="10,15,10,0" text="-" font="24" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 							<Button name="btn_diandan_shanchu" width="90" height="46" padding="10,15,10,0" text="删除" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 							<Button name="btn_diandan_guige" width="90" height="46" padding="10,30,10,0" text="规格/做法" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
@@ -64,17 +64,21 @@
 					
 					<VerticalLayout height="165" bkcolor="#FFFFFFFF">
 						<HorizontalLayout height="70">
-							<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,8,0,0" multiline="true" endellipsis="true"></Label>
+							<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,24,0,0" multiline="true" endellipsis="true"></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="75" name="diandan_pay_layout">
-							<Button name="btn_diandan_xiadan" text="下单" heiht="75" width="230" padding="10,0,0,15" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'"></Button>
+							<Button name="btn_diandan_xiadan" text="下单" height="75" width="230" padding="10,0,0,15" textcolor="#FFFFFFFF" normalimage="file='Dialog_Btn3.png' corner='5,5,5,5'" hotimage="file='Dialog_Btn3_Hover.png' corner='5,5,5,5'" pushedimage="file='Dialog_Btn3_Click.png' corner='5,5,5,5'"></Button>
 
-							<Button name="btn_diandan_pay" text="结账" heiht="75" width="230" padding="10,0,0,15" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'"></Button>
+							<Button name="btn_diandan_pay" text="结账" height="75" width="230" padding="10,0,0,15" normalimage="file='Dialog_Btn1.png' corner='5,5,5,5'" hotimage="file='Dialog_Btn1_Hover.png' corner='5,5,5,5'" pushedimage="file='Dialog_Btn1_Click.png' corner='5,5,5,5'"></Button>
 						</HorizontalLayout>
 						
-						<Button visible="false" name="btn_diandan_jixujiacai" text="继续点单" height="55" padding="20,20,20,15" textcolor="#FFFFFFFF"></Button>
+						<HorizontalLayout height="75" name="jiesuan_pay_layout" visible="false">							
+							<Button name="btn_diandan_jixujiacai" text="加菜" height="75" width="230" padding="10,0,0,15" textcolor="#FFFFFFFF" normalimage="file='Dialog_Btn3.png' corner='5,5,5,5'" hotimage="file='Dialog_Btn3_Hover.png' corner='5,5,5,5'" pushedimage="file='Dialog_Btn3_Click.png' corner='5,5,5,5'"></Button>
+							
+							<Button name="btn_diandan_yulandan" text="打印预览单" height="75" width="230" padding="10,0,0,15" normalimage="file='Dialog_Btn1.png' corner='5,5,5,5'" hotimage="file='Dialog_Btn1_Hover.png' corner='5,5,5,5'" pushedimage="file='Dialog_Btn1_Click.png' corner='5,5,5,5'"></Button>
+						</HorizontalLayout>
 					</VerticalLayout>
 				</VerticalLayout>
 				
@@ -110,48 +114,48 @@
 						
 						<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="" heiht="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+							<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="" heiht="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+							<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="" heiht="48" width="220" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+							<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+							<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+							<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+							<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="扫码使用" heiht="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="取消使用" heiht="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+							<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">
@@ -199,39 +203,39 @@
 						
 						<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
+								<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
+								<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
+								<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+								<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+								<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="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+								<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>

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

@@ -0,0 +1,46 @@
+<?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" />
+	
+	<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>
+		
+		<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"/>
+				
+				<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
+				
+				<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='green_zhengchang.png' corner='5,5,5,5'" hotimage="file='green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='green_dianji.png' corner='5,5,5,5'" />
+				</HorizontalLayout>
+			</VerticalLayout>
+			
+			<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>
+				
+				<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>
+		</HorizontalLayout>
+		
+	</VerticalLayout>
+</Window>

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -707,7 +707,7 @@ void CDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 	else if (name == L"btn_diandan_jixujiacai")
 	{
 		//点击继续加菜
-		this->JixuJiacai();
+		this->ShowXuangouPage();
 	}
 	else if (name == L"btn_diandan_chakanyouhui")
 	{
@@ -2265,25 +2265,6 @@ void CDiandanPageUI::ClickGengduoPay()
 	ShowJiesuanPage();
 }
 
-void CDiandanPageUI::JixuJiacai()
-{
-	//先显示商品页面
-	CVerticalLayoutUI* pFoodLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_food_layout")));
-	pFoodLayout->SetVisible(true);
-
-	//显示结算按钮
-	CHorizontalLayoutUI* pPayLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_pay_layout")));
-	pPayLayout->SetVisible(true);
-
-	//再隐藏结算页面
-	CHorizontalLayoutUI* pJiesuanLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_layout")));
-	pJiesuanLayout->SetVisible(false);
-
-	//隐藏继续加菜的按钮
-	CButtonUI* pJiacaiBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_jixujiacai")));
-	pJiacaiBtn->SetVisible(false);
-}
-
 void CDiandanPageUI::ClickChakanYouhui()
 {
 	if (m_is_show_modal_wnd == true)

zhipuzi_pos_windows/page/CDiandanPageUI.h

@@ -119,9 +119,6 @@ public:
 	//点击更多支付之后的逻辑
 	void ClickGengduoPay();
 
-	//点击继续加菜之后的逻辑
-	void JixuJiacai();
-
 	//点击查看优惠
 	void ClickChakanYouhui();
 

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -24,6 +24,7 @@
 #include "../wnd/CZidingyiShoukuanWnd.h"
 #include "../wnd/CChengzhongWnd.h"
 #include "../wnd/CGuadanWnd.h"
+#include "../wnd/CZhengcanRenshuWnd.h"
 
 #include "../print/CPosPrinter.h"
 
@@ -741,7 +742,7 @@ void CZhengcanDiandanPageUI::ShowJiesuanPage()
 	CVerticalLayoutUI* pFoodLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_food_layout")));
 	pFoodLayout->SetVisible(false);
 
-	//隐藏结算按钮
+	//隐藏结算区域
 	CHorizontalLayoutUI* pPayLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_pay_layout")));
 	pPayLayout->SetVisible(false);
 
@@ -749,9 +750,9 @@ void CZhengcanDiandanPageUI::ShowJiesuanPage()
 	CHorizontalLayoutUI* pJiesuanLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_layout")));
 	pJiesuanLayout->SetVisible(true);
 
-	//展示继续加菜的按钮
-	CButtonUI* pJiacaiBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_jixujiacai")));
-	pJiacaiBtn->SetVisible(true);
+	//展示继续加菜的区域
+	CHorizontalLayoutUI* pJiesuanPayLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("jiesuan_pay_layout")));
+	pJiesuanPayLayout->SetVisible(true);
 
 	//更新结算按钮位置
 	UpdateJiesuanZhifuPos();
@@ -772,9 +773,9 @@ void CZhengcanDiandanPageUI::ShowXuangouPage()
 	CHorizontalLayoutUI* pJiesuanLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_layout")));
 	pJiesuanLayout->SetVisible(false);
 
-	//隐藏继续加菜的按钮
-	CButtonUI* pJiacaiBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_jixujiacai")));
-	pJiacaiBtn->SetVisible(false);
+	//隐藏继续加菜的区域
+	CHorizontalLayoutUI* pJiesuanPayLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("jiesuan_pay_layout")));
+	pJiesuanPayLayout->SetVisible(false);
 }
 
 //处理按钮点击类事件
@@ -831,7 +832,7 @@ void CZhengcanDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 	else if (name == L"btn_diandan_jixujiacai")
 	{
 		//点击继续加菜
-		this->JixuJiacai();
+		this->ShowXuangouPage();
 	}
 	else if (name == L"btn_diandan_chakanyouhui")
 	{
@@ -2400,25 +2401,6 @@ void CZhengcanDiandanPageUI::ClickPayBtn()
 	ShowJiesuanPage();
 }
 
-void CZhengcanDiandanPageUI::JixuJiacai()
-{
-	//先显示商品页面
-	CVerticalLayoutUI* pFoodLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_food_layout")));
-	pFoodLayout->SetVisible(true);
-
-	//显示结算按钮
-	CHorizontalLayoutUI* pPayLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_pay_layout")));
-	pPayLayout->SetVisible(true);
-
-	//再隐藏结算页面
-	CHorizontalLayoutUI* pJiesuanLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_layout")));
-	pJiesuanLayout->SetVisible(false);
-
-	//隐藏继续加菜的按钮
-	CButtonUI* pJiacaiBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_jixujiacai")));
-	pJiacaiBtn->SetVisible(false);
-}
-
 void CZhengcanDiandanPageUI::ClickChakanYouhui()
 {
 	if (m_is_show_modal_wnd == true)
@@ -2918,7 +2900,7 @@ void CZhengcanDiandanPageUI::ClickRenshu()
 		return;
 	}
 
-	CCanpaiWnd* pCanpaiDlg = new CCanpaiWnd();
+	CZhengcanRenshuWnd* pCanpaiDlg = new CZhengcanRenshuWnd();
 
 	if (pCanpaiDlg != NULL)
 	{
@@ -2929,7 +2911,9 @@ void CZhengcanDiandanPageUI::ClickRenshu()
 		pCanpaiDlg->SetIcon(IDI_ICON_DUILIB);
 		pCanpaiDlg->CenterWindow();
 
-		pCanpaiDlg->SetTitle(L"填写人数");
+		pCanpaiDlg->SetTitle(L"请输入用餐人数");
+
+		pCanpaiDlg->SetTableId(m_table_id);
 
 		UINT ret = pCanpaiDlg->ShowModal();
 

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.h

@@ -113,9 +113,6 @@ public:
 	//点击更多支付之后的逻辑
 	void ClickPayBtn();
 
-	//点击继续加菜之后的逻辑
-	void JixuJiacai();
-
 	//点击查看优惠
 	void ClickChakanYouhui();
 

zhipuzi_pos_windows/wnd/CZhengcanRenshuWnd.cpp

@@ -0,0 +1,447 @@
+#include "../pch/pch.h"
+#include "CZhengcanRenshuWnd.h"
+
+#define WM_ZHENGCAN_RENSHU_SUCCESS 10001
+#define WM_ZHENGCAN_RENSHU_FAIL 10002
+
+LRESULT CZhengcanRenshuWnd::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 CZhengcanRenshuWnd::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 CZhengcanRenshuWnd::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 CZhengcanRenshuWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled)
+{
+	if (uMsg == WM_KEYDOWN)
+	{
+		if (wParam == VK_RETURN)
+		{
+			StartYanzheng();
+
+			return true;
+		}
+		else if (wParam == VK_ESCAPE)
+		{
+			if (m_is_qingqiu == false)
+			{
+				Close(IDCANCEL);
+			}
+
+			return true;
+		}
+	}
+	else if (uMsg == WM_ZHENGCAN_RENSHU_SUCCESS)
+	{
+		m_qingqiu_mutex.lock();
+
+		m_is_qingqiu = false;
+
+		m_qingqiu_mutex.unlock();
+
+		//验证成功了
+		Close(IDOK);
+
+		return true;
+	}
+	else if (uMsg == WM_ZHENGCAN_RENSHU_FAIL)
+	{
+		//验证失败了
+		CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+		pContent->SetEnabled(true);
+
+		CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
+		pSave->SetEnabled(true);
+
+		//失败原因
+		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
+		pErrorInfo->SetText(m_errorInfo.c_str());
+		pErrorInfo->SetVisible(true);
+
+		m_qingqiu_mutex.lock();
+
+		m_is_qingqiu = false;
+
+		m_qingqiu_mutex.unlock();
+
+		return true;
+	}
+
+	return false;
+}
+
+LRESULT CZhengcanRenshuWnd::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("zhengcan_renshu_dlg.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 CZhengcanRenshuWnd::Notify(TNotifyUI& msg)
+{
+	if (msg.sType == _T("click"))
+	{
+		DuiLib::CDuiString senderName = msg.pSender->GetName();
+
+		if (senderName == _T("closebtn"))
+		{
+			if (m_is_qingqiu == false)
+			{
+				Close(IDCANCEL);
+			}
+
+			return;
+		}
+		else if (senderName == _T("save"))
+		{
+			StartYanzheng();
+		}
+		else if (senderName == L"jianpan_1")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"1";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_2")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"2";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_3")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"3";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_4")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"4";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_5")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"5";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_6")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"6";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_7")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"7";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_8")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"8";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_9")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"9";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_0")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason += L"0";
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_x")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason = wsReason.substr(0, wsReason.length() - 1);
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+		else if (senderName == L"jianpan_qingkong")
+		{
+			CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+			wstring wsReason = pContent->GetText();
+
+			wsReason.clear();
+
+			pContent->SetText(wsReason.c_str());
+			pContent->SetFocus();
+		}
+	}
+	else if (msg.sType == _T("textchanged"))
+	{
+		//只能输入数字，其他的全部删除
+		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+		if (!m_pEdit->GetText().IsEmpty())
+		{
+			wstring ws_Value = m_pEdit->GetText();
+			string strValue = CLewaimaiString::UnicodeToUTF8(ws_Value);
+
+			for (size_t nIndex = 0; nIndex < strValue.length(); nIndex++)
+			{
+				unsigned char tmp = strValue.at(nIndex);
+				if (tmp > 57 || tmp < 48)
+				{
+					//ASCII码不是数字的都过滤掉
+					strValue = strValue.substr(0, nIndex);
+
+					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+
+					break;
+				}
+			}
+		}
+	}
+	else if (msg.sType == L"windowinit")
+	{
+		m_pm.SetNextTabControl(false);
+
+		CEditUI* pFukuanEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+		pFukuanEdit->SetFocus();
+	}
+}
+
+void CZhengcanRenshuWnd::Init()
+{
+
+}
+
+std::string CZhengcanRenshuWnd::getContent()
+{
+	return m_content;
+}
+
+void CZhengcanRenshuWnd::SetTitle(std::wstring title)
+{
+	CLabelUI* pLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("memo_dlg_title")));
+	pLabel->SetText(title.c_str());
+}
+
+void CZhengcanRenshuWnd::StartYanzheng()
+{
+	CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
+	wstring wsReason = pContent->GetText();
+
+	if (wsReason.length() == 0)
+	{
+		m_errorInfo = _T("人数不能为空");
+		PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
+
+		return;
+	}
+
+	m_content = CLewaimaiString::UnicodeToUTF8(wsReason);
+
+	pContent->SetEnabled(false);
+
+	CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
+	pSave->SetEnabled(false);
+
+	m_qingqiu_mutex.lock();
+
+	m_is_qingqiu = true;
+
+	m_qingqiu_mutex.unlock();
+
+	//开始处理
+	std::thread(&CZhengcanRenshuWnd::ConfirmMember, this).detach();
+}
+
+void CZhengcanRenshuWnd::ConfirmMember()
+{
+	std::string renshu = m_content;
+
+	std::map<string, string> params;
+	params["table_id"] = m_table_id;
+	params["person"] = renshu;
+
+	std::string response;
+	bool ret = CZhipuziHttpClient::GetInstance()->Request("/dinnercash/changerenshu", params, response);
+	if (!ret)
+	{
+		m_errorInfo = _T("网络请求出错");
+		PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
+
+		return;
+	}
+
+	rapidjson::Document document;
+	document.Parse(response.c_str());
+
+	if (document.HasParseError())
+	{
+		m_errorInfo = _T("服务器返回数据格式错误");
+		PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
+
+		return;
+	}
+	else
+	{
+		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
+		{
+			m_errorInfo = _T("服务器返回数据格式错误");
+			PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
+
+			return;
+		}
+
+		rapidjson::Value& v_errcode = document["errcode"];
+		int errcode = v_errcode.GetInt();
+		if (errcode != 0)
+		{
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"修改人数失败：") + string(document["errmsg"].GetString());
+			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
+			PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
+
+			return;
+		}
+
+		rapidjson::Value& data = document["data"];
+
+		PostMessage(WM_ZHENGCAN_RENSHU_SUCCESS);
+	}
+}

zhipuzi_pos_windows/wnd/CZhengcanRenshuWnd.h

@@ -0,0 +1,91 @@
+#pragma once
+
+#include "../pch/pch.h"
+#include "CMainWnd.h"
+#include "CModalWnd.h"
+
+class CZhengcanRenshuWnd : 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();
+
+	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 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 StartYanzheng();
+
+	void ConfirmMember();
+
+	void SetTableId(std::string table_id)
+	{
+		m_table_id = table_id;
+	}
+
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
+public:
+	CPaintManagerUI m_pm;
+
+	std::string m_content;
+
+	std::wstring m_errorInfo;
+
+	std::string m_table_id;
+
+	std::mutex m_qingqiu_mutex;
+	bool m_is_qingqiu = false;
+};

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -231,6 +231,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
   <ItemGroup>
     <ClInclude Include="control\CTabletypeOptionUI.h" />
     <ClInclude Include="control\CZhengcanTableItemUI.h" />
+    <ClInclude Include="wnd\CZhengcanRenshuWnd.h" />
     <ClInclude Include="zhipuzi\CZhengcanOrderItem.h" />
     <ClInclude Include="zhipuzi\CZhengcanOrder.h" />
     <ClInclude Include="page\CZhengcanDiandanPageUI.h" />
@@ -336,6 +337,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
   <ItemGroup>
     <ClCompile Include="control\CTabletypeOptionUI.cpp" />
     <ClCompile Include="control\CZhengcanTableItemUI.cpp" />
+    <ClCompile Include="wnd\CZhengcanRenshuWnd.cpp" />
     <ClCompile Include="zhipuzi\CZhengcanOrderItem.cpp" />
     <ClCompile Include="zhipuzi\CZhengcanOrder.cpp" />
     <ClCompile Include="page\CZhengcanDiandanPageUI.cpp" />

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj.filters

@@ -324,6 +324,9 @@
     <ClInclude Include="zhipuzi\CZhengcanOrderItem.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="wnd\CZhengcanRenshuWnd.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch\pch.cpp">
@@ -608,6 +611,9 @@
     <ClCompile Include="zhipuzi\CZhengcanOrderItem.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="wnd\CZhengcanRenshuWnd.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="resource\zhipuzi.ico">