1.0.0.2发布

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

@@ -31,9 +31,9 @@
 
 			<HorizontalLayout>
 				<VerticalLayout name="data_layout" visible="false">
-					<Label text="营业概况" font="2" padding="20,20,0,0"></Label>
+					<Label text="营业概况" font="2" padding="20,20,0,0" height="30"></Label>
 					
-					<HorizontalLayout>					
+					<HorizontalLayout name="baobiao_page_yingye_items">					
 						<VerticalLayout bkcolor="#FFFFFFFF" width="240" height="126" padding="20,15,0,0">
 							<Label name="waimai_num" text="" font="2" padding="20,25,0,0"></Label>
 							<Label text="外卖订单数量" padding="20,15,0,0" textcolor="#FF777777"></Label>

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

@@ -19,7 +19,7 @@
 				<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='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<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>
 			

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

@@ -22,7 +22,7 @@
 				<Label name="errinfo" text=""  height="60" width="270" float="true" pos="30,150,300,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='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<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>
 			

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <Window> 
-	<ListContainerElement name="diandan_cart_item" width="400" height="42">
+	<ListContainerElement name="diandan_cart_item" width="380" height="42">
 		<VerticalLayout>
 			<HorizontalLayout height="42"> 
-				<Label name="diandan_cart_item_name" width="240" height="42" align="left" padding="10,0,0,0" endellipsis="true" />
+				<Label name="diandan_cart_item_name" width="220" height="42" align="left" 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>
-			<Label name="diandan_cart_item_nature" width="240" height="42" align="left" padding="10,0,10,0" textcolor="#FF808080" visible="false" multiline="true" endellipsis="true" />
+			<Label name="diandan_cart_item_nature" width="220" height="42" align="left" padding="10,0,10,0" textcolor="#FF808080" visible="false" multiline="true" endellipsis="true" />
 		</VerticalLayout>
 	</ListContainerElement> 
 </Window>

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

@@ -4,9 +4,9 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-			<VerticalLayout width="520" bkcolor="#FFFFFFFF">
+			<VerticalLayout width="490" bkcolor="#FFFFFFFF">
 				<HorizontalLayout>					
-					<VerticalLayout width="400" padding="0,0,0,0">
+					<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>
@@ -25,7 +25,7 @@
 												
 						<List name="list_diandan_cart" padding="0,10,0,0" itemlinecolor="#FF000000" vscrollbar="true">
 							<ListHeader inset="10,0,0,0"/>
-							<ListHeaderItem text="商品" width="240" align="left" />
+							<ListHeaderItem text="商品" width="220" align="left" />
 							<ListHeaderItem text="数量" width="80" align="center" />
 							<ListHeaderItem text="金额" width="80" align="center" />
 						</List>
@@ -38,49 +38,49 @@
 					
 					<Control width="1" bkcolor="#FFEBE8E8"></Control>
 					
-					<VerticalLayout width="120" padding="0,0,0,0">
-						<Button name="btn_diandan_jia" width="90" height="46" padding="15,80,15,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="15,15,15,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="15,15,15,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="15,30,15,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'" />
+					<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_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'" />
 						
-						<Button name="btn_diandan_dabao" width="90" height="46" padding="15,15,15,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_dabao" 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_cundan" width="90" height="46" padding="15,50,15,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_qudan" width="90" height="46" padding="15,15,15,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_qudan" 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'" />
 						
 						<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,490,104,509" bordercolor="#FFFF0000" bordersize="0"></Label>
 						
-						<Button name="btn_diandan_zhengdanbeizhu" width="90" height="46" padding="15,15,15,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_zhengdanbeizhu" 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_qianxiang" width="90" height="46" padding="15,50,15,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_qianxiang" width="90" height="46" padding="10,50,10,30" 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'" />
 					</VerticalLayout>
 				</HorizontalLayout>
 				
 				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 				
 				<VerticalLayout height="165" bkcolor="#FFFFFFFF">
-					<HorizontalLayout height="75">
-						<Label name="diandan_page_otherprice" text="" width="290" align="left" padding="15,10,0,0"></Label>
-						<Label name="diandan_page_totalprice" text="总价：¥0.00" font="24" textcolor="#FFFF0000" width="200" align="right" padding="0,10,15,0"></Label>
+					<HorizontalLayout height="70">
+						<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,10,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="15,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
-						<Control bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="60,10,84,32" mouse="false"></Control>
-						<Label text="微信支付/支付宝/云闪付" multiline="true" width="110" height="40" font="14" float="true" pos="16,35,126,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+						<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>
+						<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="15,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="185,10,211,30" mouse="false"></Control>
-						<Label text="会员支付" width="110" height="35" font="14" float="true" pos="165,35,275,70" 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>
+						<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="15,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="310,10,331,34" mouse="false"></Control>
-						<Label text="现金支付" width="110" height="35" font="14" float="true" pos="290,35,400,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>
+						<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="114" padding="15,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="435,10,321,31" mouse="false"></Control>
-						<Label text="更多支付" width="110" height="35" font="14" float="true" pos="415,35,525,70" 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>
+						<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>
@@ -99,70 +99,70 @@
 				</TileLayout>
 				
 				<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-					<Edit name="diandan_food_search_edit" tooltip="请输入商品名字搜索" width="400" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
+					<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="385,23,68,46" float="true"></Button>
+					<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">
-				<VerticalLayout width="420">
+			<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="100" height="48" padding="20,0,0,0"></Label>
-						<Button name="diandan_jiesuan_zhekou_value" text="" heiht="48" width="250" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-						<Label text="%" width="100" height="48" padding="20,0,0,0"></Label>
+						<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>
+						<Label text="%" width="60" height="48" padding="20,0,0,0"></Label>
 					</HorizontalLayout>
 					
 					<HorizontalLayout padding="0,15,0,0" height="48">
-						<Label text="加价：" width="100" height="48" padding="20,0,0,0"></Label>
-						<Button name="diandan_jiesuan_jiajia_value" text="" heiht="48" width="250" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-						<Label text="元" width="100" height="48" padding="20,0,0,0"></Label>
+						<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>
+						<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
 					</HorizontalLayout>
 					
 					<HorizontalLayout padding="0,15,0,0" height="48">
-						<Label text="优惠：" width="100" height="48" padding="20,0,0,0"></Label>
-						<Button name="diandan_jiesuan_youhui_value" text="" heiht="48" width="250" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-						<Label text="元" width="100" height="48" padding="20,0,0,0"></Label>
+						<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>
+						<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
 					</HorizontalLayout>
 					
 					<HorizontalLayout padding="0,15,0,0" height="48">
-						<Label text="优惠券：" width="100" height="48" padding="20,0,0,0"></Label>
-						<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="80" height="48" padding="0,0,0,0"></Label>
+						<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>
 					</HorizontalLayout>
 					
 					<HorizontalLayout padding="0,15,0,0" height="48">
-						<Label text="商品券：" width="100" height="48" padding="20,0,0,0"></Label>
-						<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="80" height="48" padding="0,0,0,0"></Label>
+						<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>
 					</HorizontalLayout>
 					
 					<HorizontalLayout padding="0,15,0,0" height="48">
-						<Label text="次卡：" width="100" height="48" padding="20,0,0,0"></Label>
-						<Label name="diandan_jiesuan_cika_status" text="未使用" width="80" height="48" padding="0,0,0,0"></Label>
+						<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>
 					</HorizontalLayout>
 					
 					<HorizontalLayout padding="0,15,0,0" height="48">
-						<Label text="权益卡：" width="100" height="48" padding="20,0,0,0"></Label>
-						<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="80" height="48" padding="0,0,0,0"></Label>
+						<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>
 					</HorizontalLayout>
 					
 					<HorizontalLayout padding="0,15,0,0" height="130">
-						<Label text="抹零：" width="100" height="48" padding="20,0,0,0"></Label>
+						<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'"/>
@@ -184,7 +184,7 @@
 				
 				<Control width="1" bkcolor="#FFEBE8E8"></Control>
 				
-				<VerticalLayout vscrollbar="true">
+				<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>
@@ -197,7 +197,7 @@
 					
 					<HorizontalLayout height="50">
 						<Control></Control>
-						<Label name="diandan_jiesuan_total_yingshou" text="" height="50" align="right" padding="0,0,15,0"/>
+						<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>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<HorizontalLayout padding="0,10,0,0">
-		<Label name="name" text=""  height="30" width="150" align="left"/>
+		<Label name="name" text=""  height="30" width="100" align="left"/>
 		<Control></Control>
-		<Label name="value" text=""  height="30" width="150" align="right"/>
+		<Label name="value" text=""  height="30" width="100" align="right"/>
 	</HorizontalLayout>
 </Window>

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

@@ -52,7 +52,7 @@
 					
 					<HorizontalLayout height="80" padding="0,30,0,0">
 						<Control></Control>
-						<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="350" padding="0,0,0,0" tooltip="点击这里确认收款" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+						<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="350" padding="0,0,0,0" tooltip="点击这里确认收款" 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'" />
 						<Control></Control>
 					</HorizontalLayout>	
 				</VerticalLayout>

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

@@ -22,7 +22,7 @@
 			<Label name="guandan_order_zongjia" text="" width="200" height="70"></Label>
 			<Control></Control>
 			<Button name="guadan_order_delete" align="center" width="120" height="45" padding="0,13,0,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="guadan_order_queren" textcolor="#FFFFFFFF" align="center" width="120" height="45" padding="20,13,20,0" text="确认此单" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+			<Button name="guadan_order_queren" textcolor="#FFFFFFFF" align="center" width="120" height="45" padding="20,13,20,0" text="确认此单" 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>
 </Window>

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

@@ -29,7 +29,7 @@
 				</HorizontalLayout>
 				
 				<HorizontalLayout height="56" valign="center" padding="30,100,0,20">
-					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="250" padding="0,0,0,0" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="380" 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>
 			

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

@@ -9,14 +9,16 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-			<VerticalLayout width="486" bkcolor="#FFFFFFFF">
-				<Label text="请输入会员手机号" heiht="30" padding="43,30,10,10"></Label>
-					
-				<Edit name="huiyuan_page_shoujihao_edit" tooltip="请输入会员手机号搜索" width="400" height="50" padding="43,10,0,10" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+			<VerticalLayout width="420" bkcolor="#FFFFFFFF">
+				<Label text="请输入会员手机号" heiht="30" padding="43,20,10,10"></Label>
+				
+				<HorizontalLayout height="50">
+					<Edit name="huiyuan_page_shoujihao_edit" tooltip="请输入会员手机号搜索" width="220" height="50" padding="43,0,0,10" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
 				
-				<Button name="huiiyuan_page_sousuo_btn" width="155" height="50" padding="166,30,0,0" text="搜索" textcolor="#FFFFFFFF" 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'" />
+					<Button name="huiiyuan_page_sousuo_btn" width="120" height="40" padding="15,0,0,0" text="搜索" textcolor="#FFFFFFFF" 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>
 				
-				<HorizontalLayout width="340" height="416" bkcolor="#FFF3F3F3" padding="73,20,73,10">
+				<HorizontalLayout width="340" height="416" bkcolor="#FFF3F3F3" padding="40,15,40,10">
 					<Button name="jianpan_1" text="1" font="0" heiht="60" width="60" float="true" pos="10,10,110,100" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
 					<Button name="jianpan_2" text="2" font="0" heiht="60" width="60" float="true" pos="120,10,220,100" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
 					<Button name="jianpan_3" text="3" font="0" heiht="60" width="60" float="true" pos="230,10,330,100" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
@@ -36,10 +38,12 @@
 				
 				<Control></Control>
 				
-				<Label name="errorinfo" text="" width="400" height="30" padding="43,50,10,10" textcolor="#FFFF0000" visible="false" align="center"></Label>
+				<Label name="errorinfo" text="" width="400" height="26" padding="43,10,10,10" textcolor="#FFFF0000" visible="false" align="center"></Label>
 				
-				<HorizontalLayout height="60" width="400" padding="43,0,0,80">
-					<Button name="huiyuan_page_add_btn" width="400" height="60" text="添加会员" textcolor="#FFFFFFFF" 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 height="60" width="420" padding="0,0,0,30">
+					<Control></Control>
+					<Button name="huiyuan_page_add_btn" width="380" height="60" text="添加会员" textcolor="#FFFFFFFF" normalimage="file='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'" />
+					<Control></Control>
 				</HorizontalLayout>
 			</VerticalLayout>
 			
@@ -47,14 +51,14 @@
 			
 			<HorizontalLayout name="huiyuan_page_no_layout">
 				<Control></Control>
-				<VerticalLayout width="600">
+				<VerticalLayout width="480">
 					<Control></Control>
 					<HorizontalLayout height="141">
 						<Control></Control>
 						<Control bkimage="huiyuan_no.png" width="206" height="141"></Control>
 						<Control></Control>
 					</HorizontalLayout>
-					<Label text="请在左侧输入手机号搜索会员，再进行充值、挂失等操作" textcolor="#FF666666" heiht="30" padding="0,20,0,0" align="center"></Label>
+					<Label text="请在左侧输入手机号搜索会员，再进行充值、挂失等操作" multiline="true" textcolor="#FF666666" heiht="30" padding="0,20,0,0" align="center"></Label>
 					<Control></Control>
 				</VerticalLayout>
 				<Control></Control>

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

@@ -52,7 +52,7 @@
 					
 					<HorizontalLayout height="80" padding="0,30,0,0">
 						<Control></Control>
-						<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="350" padding="0,0,0,0" tooltip="点击这里确认收款" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+						<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="350" padding="0,0,0,0" tooltip="点击这里确认收款" 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'" />
 						<Control></Control>
 					</HorizontalLayout>	
 				</VerticalLayout>

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

@@ -23,7 +23,7 @@
 				<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='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<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>
 			

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

@@ -23,10 +23,10 @@
 				</VerticalLayout>
 			</HorizontalLayout>
 			
-			<VerticalLayout height="180" padding="0,30,0,0">
-				<Label text="营业概况" font="2" padding="20,0,0,0"></Label>
+			<VerticalLayout name="jiaoban_page_yingye_layout" padding="0,30,0,0">
+				<Label text="营业概况" font="2" padding="20,0,0,0" height="30"></Label>
 				
-				<HorizontalLayout>					
+				<HorizontalLayout name="jiaoban_page_yingye_items">					
 					<VerticalLayout bkcolor="#FFFFFFFF" width="240" height="126" padding="20,15,0,0">
 						<Label name="waimai_num" text="" font="2" padding="20,25,0,0"></Label>
 						<Label text="外卖订单数量" padding="20,15,0,0" textcolor="#FF777777"></Label>

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

@@ -20,8 +20,9 @@
 			<Control width="1" padding="20,27,15,20" bkcolor="#FFFFFFFF"></Control>
 			<Label name="main_shopname" text="" width="400" padding="15,0,0,0" textcolor="#FFFFFFFF" font="28"/>
 			<Control></Control>
-			<HorizontalLayout width="300" height="36" padding="0,21,20,0">
+			<HorizontalLayout width="360" height="36" padding="0,21,20,0">
 				<Control></Control>
+				<Button name="main_shangchengbtn" tooltip="智铺子硬件商城" width="36" height="36" padding="0,0,20,0" normalimage="file='shopping_n.png'" hotimage="file='shopping_xuanfu.png'" pushedimage="file='shopping_dianji.png'"/>
 				<Button name="main_appbtn" tooltip="下载商家app" width="36" height="36" padding="0,0,20,0" normalimage="file='download_n.png'" hotimage="file='download_xuanfu.png'" pushedimage="file='download_dianji.png'"/>
 				<Button name="main_kefubtn" tooltip="联系客服" width="36" height="36" padding="0,0,20,0" normalimage="file='kefu_n.png'" hotimage="file='kefu_xuanfu.png'" pushedimage="file='kefu_dianji.png'"/>
 				<Button name="minbtn" width="36" height="36" normalimage="file='icon_shou_n.png'" hotimage="file='icon_shou_xuanfu.png'" pushedimage="file='icon_shou_dianji.png'"/>
@@ -32,16 +33,12 @@
 		</HorizontalLayout>
 		
 		<HorizontalLayout>
-			<VerticalLayout width="101" bkcolor="#FFEDEDED">
-				<Control height="15"></Control>
-				
-				<VerticalLayout name="main_gongneng_daohang_layout" height="714">
+			<VerticalLayout width="101" bkcolor="#FFEDEDED">				
+				<VerticalLayout name="main_gongneng_daohang_layout" inset="0,15,0,20" vscrollbar="true">
 
 				</VerticalLayout>
 				
-				<Control></Control>
-				
-				<Control height="1" bkcolor="#FFD1D1D1"></Control>
+				<Control height="1" bkcolor="#FFD1D1D1" padding="0,0,0,0"></Control>
 				<HorizontalLayout height="100">
 					<Button name="main_web_login_btn" width="100" height="100" normalimage="" hotimage="" pushedimage="" bordersize="0"></Button>
 					<Control bkimage="web_login.png" width="50" height="50" float="true" pos="25,15,75,65" mouse="false"></Control>

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

@@ -19,7 +19,7 @@
 				<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='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<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>
 			

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

@@ -20,7 +20,7 @@
 				
 				<HorizontalLayout height="56" valign="center" padding="30,100,0,20">
 					<Control></Control>
-					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="250" padding="0,0,0,0" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<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'" />
 					<Control></Control>
 				</HorizontalLayout>
 			</VerticalLayout>

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

@@ -23,7 +23,7 @@
 				<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='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<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>
 			

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

@@ -3,7 +3,7 @@
 	<SettingPage name="setting_page" bkcolor="#FFEFF6EE">
 		<HorizontalLayout>
 			<HorizontalLayout width="350" bkcolor="#FFF6F6F6">
-				<VerticalLayout height="900" inset="0,0,0,0">
+				<VerticalLayout inset="0,0,0,0" vscrollbar="true">
 					<Option name="setting_waimai_order_switch" selected="true" text="外卖订单设置" group="setting_switch" align="center" height="69"  padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
 					<Control height="1" bkcolor="#FFD1D1D1"></Control>
 					<Option name="setting_diannei_order_switch" text="店内订单设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
@@ -27,8 +27,9 @@
 					<Option name="setting_system_about" text="关于" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
 					<Control height="1" bkcolor="#FFD1D1D1"></Control>
 
-					<Control></Control>
-					<Button name="setting_logout" padding="20,30,20,0" height="52" text="退出登陆" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='white_bkg.png'" />
+					<Control height="30"></Control>
+					
+					<Button name="setting_logout" padding="20,30,20,30" height="52" text="退出登陆" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='white_bkg.png'" />
 				</VerticalLayout>
 			</HorizontalLayout>
 
@@ -79,6 +80,11 @@
 					</Label>
 					<Label name="setting_version" text="版本号：1.0.0.1" align="center">
 					</Label>
+					<Control height="30"></Control>
+					<Label text="联系电话：0755-26924653" align="center">
+					</Label>
+					<Label text="官方网站：www.zhipuzi.com" align="center">
+					</Label>
 				</VerticalLayout>
 			</TabLayout>
 		</HorizontalLayout>

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

@@ -11,7 +11,7 @@
 			<HorizontalLayout>
 				<Control width="1" bkcolor="#FFD1D1D1"></Control>
 				
-				<VerticalLayout name="shangpin_create_page_info_layout" width="888" bkcolor="#FFFFFFFF" vscrollbar="true">
+				<VerticalLayout name="shangpin_create_page_info_layout" width="620" bkcolor="#FFFFFFFF" 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>
@@ -180,7 +180,7 @@
 				
 				<HorizontalLayout name="shangpin_create_page_no_layout">
 					<Control></Control>
-					<VerticalLayout width="400">
+					<VerticalLayout width="280">
 						<Control></Control>
 						<HorizontalLayout height="127">
 							<Control></Control>
@@ -189,7 +189,7 @@
 						</HorizontalLayout>
 						<HorizontalLayout height="60" padding="0,50,0,50">
 							<Control></Control>
-							<Button name="shangpin_create_page_saoma_btn" width="400" height="60" text="扫码快速录入" textcolor="#FFFFFFFF" 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'" />
+							<Button name="shangpin_create_page_saoma_btn" width="280" height="60" text="扫码快速录入" textcolor="#FFFFFFFF" 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'" />
 							<Control></Control>
 						</HorizontalLayout>
 						<Label height="60" multiline="true" text="若您要新建的商品为国家标准商品库的商品，可以直接扫描商品条码快速获取商品的名字、价格、单位等信息" textcolor="#FF666666" heiht="30" padding="20,20,20,0" align="center"></Label>

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

@@ -4,9 +4,9 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-			<VerticalLayout width="490" bkcolor="#FFFFFFFF">				
-				<HorizontalLayout height="60" width="400" padding="43,80,0,0">
-					<Button name="shangpin_page_add_btn" width="400" height="60" text="新建商品" textcolor="#FFFFFFFF" 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'" />
+			<VerticalLayout width="380" bkcolor="#FFFFFFFF">				
+				<HorizontalLayout height="60" width="380" padding="0,80,0,0">
+					<Button name="shangpin_page_add_btn" width="350" height="60" padding="15,0,15,0" text="新建商品" textcolor="#FFFFFFFF" 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>
 				
 				<Control></Control>
@@ -14,7 +14,7 @@
 				<HorizontalLayout height="30" padding="0,0,0,80">
 					<Control></Control>
 					<Control bkimage="beizhu_tishi.png" width="24" height="24" padding="50,2,10,0"></Control>
-					<Label text="推荐使用web后台管理商品，功能更多更方便" width="430" align="left" textcolor="#FF8D8D8D"></Label>
+					<Label text="推荐使用web后台管理商品" width="350" align="left" textcolor="#FF8D8D8D"></Label>
 					<Control></Control>
 				</HorizontalLayout>
 			</VerticalLayout>

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

@@ -10,7 +10,7 @@
 			<HorizontalLayout>
 				<Control width="1" bkcolor="#FFD1D1D1"></Control>
 				
-				<VerticalLayout name="shangpin_create_page_info_layout" width="888" bkcolor="#FFFFFFFF" vscrollbar="true">
+				<VerticalLayout name="shangpin_create_page_info_layout" width="620" bkcolor="#FFFFFFFF" 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>
@@ -179,11 +179,11 @@
 				
 				<HorizontalLayout name="shangpin_create_page_no_layout">
 					<Control></Control>
-					<VerticalLayout width="400">
+					<VerticalLayout width="280">
 						<Control></Control>
-						<Button name="shangpin_create_page_print_btn" width="400" height="60" text="打印条码" textcolor="#FFFFFFFF" 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'" />
+						<Button name="shangpin_create_page_print_btn" width="280" height="60" text="打印条码" textcolor="#FFFFFFFF" 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'" />
 						<Control height="20"></Control>
-						<Button name="shangpin_create_page_delete_btn" width="400" height="60" text="删除商品" textcolor="#FFFFFFFF" normalimage="file='red_zhengchang.png' corner='5,5,5,5'" hotimage="file='red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='red_dianji.png' corner='5,5,5,5'" />
+						<Button name="shangpin_create_page_delete_btn" width="280" height="60" text="删除商品" textcolor="#FFFFFFFF" normalimage="file='red_zhengchang.png' corner='5,5,5,5'" hotimage="file='red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='red_dianji.png' corner='5,5,5,5'" />
 						<Control></Control>
 					</VerticalLayout>
 					<Control></Control>

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

@@ -40,7 +40,7 @@
 				
 				<HorizontalLayout height="60" padding="0,20,0,0">
 					<Control></Control>
-					<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="400" padding="0,0,0,0" tooltip="点击这里确认收款" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="400" padding="0,0,0,0" tooltip="点击这里确认收款" 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'" />
 					<Control></Control>
 				</HorizontalLayout>	
 

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

@@ -23,7 +23,7 @@
 				<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='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+					<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>
 			

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

@@ -23,7 +23,7 @@
 			
 			<HorizontalLayout height="60" padding="0,50,0,0">
 				<Control></Control>
-				<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="400" padding="0,0,0,0" tooltip="点击这里确认收款" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
+				<Button name="shoukuanBtn" text="确认" font="2" textcolor="#FFFFFFFF" height="50" width="400" padding="0,0,0,0" tooltip="点击这里确认收款" 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'" />
 				<Control></Control>
 			</HorizontalLayout>	
 

bin/Win32/Release/setup/智铺子收银系统安装脚本.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "智铺子收银系统"
-!define PRODUCT_VERSION "1.0.0.1"
+!define PRODUCT_VERSION "1.0.0.2"
 !define PRODUCT_PUBLISHER "深圳市迅享智慧云科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.zhipuzi.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

zhipuzi_pos_windows/page/CBaobiaoPageUI.cpp

@@ -325,4 +325,49 @@ void CBaobiaoPageUI::DoRefresh()
 	pOrderListLayout->SetVisible(true);
 
 	this->FindSubControl(_T("loading"))->SetVisible(false);
+}
+
+void CBaobiaoPageUI::SetPos(RECT rc, bool bNeedInvalidate)
+{
+	int m_nPageWidth = rc.right - rc.left;
+
+	//添加支付方式
+	int nWidth = m_nPageWidth;
+	if (nWidth == 0)
+	{
+		return;
+	}
+
+	//根据宽度计算每行显示的数量
+	int nMeihangNum = nWidth / 260;
+
+	int num = 0;
+
+	CHorizontalLayoutUI* pFenleiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("baobiao_page_yingye_items")));
+	for (int i = 0; i < 6; i++)
+	{
+		CVerticalLayoutUI* curItem = static_cast<CVerticalLayoutUI*>(pFenleiLayout->GetItemAt(i));
+
+		int curRow = num / nMeihangNum + 1;
+		int curCol = num % nMeihangNum + 1;
+
+		RECT rect;
+		rect.left = (curCol - 1) * 260 + 20;
+		rect.right = rect.left + 240;
+		rect.top = (curRow - 1) * 146 + 20;
+		rect.bottom = rect.top + 126;
+
+		curItem->SetFloat(true);
+		curItem->SetPos(rect);
+
+		num++;
+	}
+
+	//调整区域高度
+	CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("data_layout")));
+
+	int lastRow = (num - 1) / nMeihangNum + 1;
+	pLayout->SetFixedHeight(lastRow * 146 + 20 + 30);
+
+	CContainerUI::SetPos(rc, bNeedInvalidate);
 }

zhipuzi_pos_windows/page/CBaobiaoPageUI.h

@@ -42,6 +42,7 @@ public:
 	void HandleRefresh();
 	void DoRefresh();
 
+	void SetPos(RECT rc, bool bNeedInvalidate = true);
 private:
 	
 

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -184,7 +184,7 @@ void CDiandanPageUI::UpdateFoodtypePos()
 	}
 
 	//根据宽度计算每行显示的数量
-	int nMeihangNum = (nWidth - 521) / 135;
+	int nMeihangNum = (nWidth - 491) / 135;
 
 	int num = 0;
 
@@ -543,8 +543,16 @@ void CDiandanPageUI::UpdateJiesuanZhifuPos()
 		return;
 	}
 
+	int nZhangdanWidth = nWidth - 491 - 391 - 5;
+	if (nZhangdanWidth < 290)
+	{
+		nZhangdanWidth = 290;
+	}
+	CVerticalLayoutUI* pZhangdanLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"diandan_page_jiesuan_zhangdan_layout"));
+	pZhangdanLayout->SetFixedWidth(nZhangdanWidth);
+
 	//根据宽度计算每行显示的数量
-	int nMeihangNum = (nWidth - 521 - 421) / 144;
+	int nMeihangNum = (nZhangdanWidth) / 144;
 	if (nMeihangNum < 1)
 	{
 		nMeihangNum = 1;

zhipuzi_pos_windows/page/CJiaobanPageUI.cpp

@@ -333,4 +333,49 @@ void CJiaobanPageUI::StartJiaoban()
 
 	//打印完成之后，退出登陆
 	m_pMainWnd->LoginOut(1);
+}
+
+void CJiaobanPageUI::SetPos(RECT rc, bool bNeedInvalidate)
+{
+	int m_nPageWidth = rc.right - rc.left;
+
+	//添加支付方式
+	int nWidth = m_nPageWidth;
+	if (nWidth == 0)
+	{
+		return;
+	}
+
+	//根据宽度计算每行显示的数量
+	int nMeihangNum = nWidth / 260;
+
+	int num = 0;
+
+	CHorizontalLayoutUI* pFenleiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("jiaoban_page_yingye_items")));
+	for (int i = 0; i < 6; i++)
+	{
+		CVerticalLayoutUI* curItem = static_cast<CVerticalLayoutUI*>(pFenleiLayout->GetItemAt(i));
+
+		int curRow = num / nMeihangNum + 1;
+		int curCol = num % nMeihangNum + 1;
+
+		RECT rect;
+		rect.left = (curCol - 1) * 260 + 20;
+		rect.right = rect.left + 240;
+		rect.top = (curRow - 1) * 146 + 20;
+		rect.bottom = rect.top + 126;
+
+		curItem->SetFloat(true);
+		curItem->SetPos(rect);
+
+		num++;
+	}
+
+	//调整区域高度
+	CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("jiaoban_page_yingye_layout")));
+
+	int lastRow = (num - 1) / nMeihangNum + 1;
+	pLayout->SetFixedHeight(lastRow * 146 + 20 + 30);
+
+	CContainerUI::SetPos(rc, bNeedInvalidate);
 }

zhipuzi_pos_windows/page/CJiaobanPageUI.h

@@ -43,6 +43,7 @@ public:
 
 	void StartJiaoban();
 
+	void SetPos(RECT rc, bool bNeedInvalidate = true);
 private:
 
 

zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -103,7 +103,7 @@ void CShangpinPageUI::UpdateFoodtypePos()
 	}
 
 	//根据宽度计算每行显示的数量
-	int nMeihangNum = (nWidth - 521) / 135;
+	int nMeihangNum = (nWidth - 381) / 135;
 
 	int num = 0;
 

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -247,12 +247,15 @@ void CMainWnd::HandleClickMsg(TNotifyUI& msg)
 	{
 		this->ShowAppDownload();
 	}
-	else if (msg.pSender->GetName() == L"main_web_login_btn")
+	else if (name == L"main_shangchengbtn")
+	{
+		this->ShowShangcheng();
+	}
+	else if (name == L"main_web_login_btn")
 	{
 		ShellExecute(NULL, _T("open"), _T("explorer.exe"), _T("https://www.zhipuzi.com/login.html"), NULL, SW_SHOW);
 	}
-
-    if(name == _T("quitbtn"))
+    else if(name == _T("quitbtn"))
     {
 		QuitApp();
     }
@@ -1437,4 +1440,22 @@ void CMainWnd::ShowAppDownload()
 
 		pYouhuiDlg->ShowModal();
 	}
+}
+
+void CMainWnd::ShowShangcheng()
+{
+	CImageAttentionWnd* pYouhuiDlg = new CImageAttentionWnd();
+
+	if (pYouhuiDlg != NULL)
+	{
+		pYouhuiDlg->Create(m_pm.GetPaintWindow(), _T(""), UI_WNDSTYLE_DIALOG, WS_EX_WINDOWEDGE);
+		pYouhuiDlg->SetIcon(IDI_ICON_DUILIB);
+		pYouhuiDlg->CenterWindow();
+
+		pYouhuiDlg->SetTitle(L"智铺子硬件商城");
+		pYouhuiDlg->SetAttentionText(L"请微信扫描二维码，进入智铺子商城，采购收银系统配套硬件设备");
+		pYouhuiDlg->SetAttentionImage(L"shangcheng_qrcode.png", 300, 300);
+
+		pYouhuiDlg->ShowModal();
+	}
 }

zhipuzi_pos_windows/wnd/CMainWnd.h

@@ -142,6 +142,9 @@ private:
 	//弹框展示下载二维码
 	void ShowAppDownload();
 
+	//展示进入智铺子商城的小程序
+	void ShowShangcheng();
+
 public:
     CPaintManagerUI m_pm;
 

zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp

@@ -628,22 +628,7 @@ void CXianjinShoukuanWnd::StartShoukuan()
 		return;
 	}
 
-	if (m_money == L"0.00")
-	{
-		pLabel->SetText(L"收款金额不能为 0 元，请重新输入！");
-		pLabel->SetVisible(true);
-
-		return;
-	}
-
 	double money_value = atof(CLewaimaiString::UnicodeToUTF8(m_money).c_str());
-	if (!money_value || money_value < 0.01)
-	{
-		pLabel->SetText(L"收款金额错误，请重新输入！");
-		pLabel->SetVisible(true);
-
-		return;
-	}
 
 	if (money_value > 50000)
 	{