UI基本修改完成

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

@@ -1,55 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,600" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
-	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
-			<Label name="chufang_setting_title" text="新建厨房打印机" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF"/>
-			<Button name="chufang_setting_closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
+	<VerticalLayout bkimage="shoukuan_bkg.png">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="#FF60B177">
+			<Label name="chufang_setting_title" text="新建厨房打印机" height="44" align="center" valign="center" textcolor="#FFFFFFFF" font="114" />
+			<Button name="chufang_setting_closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" maxheight="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'" />
 		</HorizontalLayout>
 
-		<VerticalLayout inset="10,0,0,10" vscrollbar="true" >
-			<Control height="20" />
+		<VerticalLayout inset="30,0,0,0" vscrollbar="true">
+			<Control height="18" />
 
-			<HorizontalLayout height="56">
-				<Label text="厨房打印机名字" width="160"/>
-				<Edit name="chufang_setting_name" width="150" height="32" padding="0,12,0,12" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+			<HorizontalLayout height="24" childvalign="vcenter">
+				<Control width="4" height="14" maxheight="14" bkcolor="#FF60B177" />
+				<Label text="基础信息" width="120" font="113" textcolor="#FF1F2329" padding="8,0,0,0" />
 			</HorizontalLayout>
+			<Control height="6" />
 
-			<HorizontalLayout height="56" valign="center">
-				<Label text="IP地址" width="160" />
-				<Edit name="chufang_setting_ip" width="150" height="32" padding="0,12,0,12" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
-				<Label name="chufang_setting_ip_error" text="IP地址格式不正确" padding="20,0,0,0" textcolor="#FFFF0000" visible="false"/>
+			<HorizontalLayout height="46" childvalign="vcenter" childpadding="12">
+				<Label text="厨房打印机名字" width="170" font="13" textcolor="#FF5F6368" />
+				<Edit name="chufang_setting_name" width="300" height="34" maxheight="34" font="13" textcolor="#FF1F2329" textpadding="11,0,11,0" tipvalue="请输入厨房打印机名字" tipvaluecolor="#FF8A9099" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" focusedimage="file='gd_input_p.png' corner='8,8,8,8'" />
 			</HorizontalLayout>
 
-			<HorizontalLayout height="56" valign="center">
-				<Label text="打印机规格" width="160" />
-				<Combo name="chufang_setting_guige" padding="0,12,0,12" width="140" height="32" tooltip="请点击这里选择您的打印机纸张宽度规格" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+			<HorizontalLayout height="46" childvalign="vcenter" childpadding="12">
+				<Label text="IP地址" width="170" font="13" textcolor="#FF5F6368" />
+				<Edit name="chufang_setting_ip" width="300" height="34" maxheight="34" font="13" textcolor="#FF1F2329" textpadding="11,0,11,0" tipvalue="请输入打印机IP地址" tipvaluecolor="#FF8A9099" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" focusedimage="file='gd_input_p.png' corner='8,8,8,8'" />
+				<Label name="chufang_setting_ip_error" text="IP地址格式不正确" width="150" font="12" textcolor="#FFE14B4A" visible="false" padding="10,0,0,0" />
+			</HorizontalLayout>
+
+			<HorizontalLayout height="46" childvalign="vcenter" childpadding="12">
+				<Label text="打印机规格" width="170" font="13" textcolor="#FF5F6368" />
+				<Combo name="chufang_setting_guige" width="140" height="34" maxheight="34" tooltip="请点击这里选择您的打印机纸张宽度规格" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0">
 					<ListLabelElement text="58mm" selected="true" />
 					<ListLabelElement text="80mm" />
 				</Combo>
 			</HorizontalLayout>
+			<Control height="10" />
+
+			<HorizontalLayout height="24" childvalign="vcenter">
+				<Control width="4" height="14" maxheight="14" bkcolor="#FF60B177" />
+				<Label text="打印规则" width="120" font="113" textcolor="#FF1F2329" padding="8,0,0,0" />
+			</HorizontalLayout>
+			<Control height="6" />
+
+			<HorizontalLayout height="50" childvalign="vcenter" childpadding="12">
+				<Label text="分单打印" width="170" font="13" textcolor="#FF5F6368" />
+				<CheckBox name="chufang_setting_fendan" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" hotimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'" />
+				<Label text="开启后按商品分单打印" width="180" font="12" textcolor="#FF8A9099" padding="10,0,0,0" />
+			</HorizontalLayout>
 
-			<HorizontalLayout height="56" valign="center">
-				<Label text="分单打印" width="160" />
-				<CheckBox name="chufang_setting_fendan" padding="0,5,0,5" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+			<HorizontalLayout height="50" childvalign="vcenter" childpadding="12">
+				<Label text="分类打印" width="170" font="13" textcolor="#FF5F6368" />
+				<CheckBox name="chufang_setting_fenlei" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" hotimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'" />
+				<Label text="开启后按绑定的商品分类打印" width="200" font="12" textcolor="#FF8A9099" padding="10,0,0,0" />
 			</HorizontalLayout>
+			<Control height="10" />
 
-			<HorizontalLayout height="56" valign="center">
-				<Label text="分类打印" width="160" />
-				<CheckBox name="chufang_setting_fenlei" padding="0,5,0,5" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+			<HorizontalLayout height="24" childvalign="vcenter">
+				<Control width="4" height="14" maxheight="14" bkcolor="#FF60B177" />
+				<Label text="关联商品分类" width="120" font="113" textcolor="#FF1F2329" padding="8,0,0,0" />
 			</HorizontalLayout>
-			
+
 			<VerticalLayout name="chufang_setting_fenlei_xuanze">
-				<Label text="请在下面勾选需要打印的商品分类" height="30"/>
-				<VerticalLayout name="chufang_setting_fenlei_xuanze_area">
-					
-				</VerticalLayout>
+				<TileLayout name="chufang_setting_fenlei_xuanze_area" itemsize="360,30" columns="2" childpadding="0" />
 			</VerticalLayout>
+			<Control height="10" />
+		</VerticalLayout>
+
+		<VerticalLayout height="72">
+			<Control height="1" bkcolor="#FFF0F1F3" />
+			<HorizontalLayout height="71" childvalign="vcenter" inset="30,0,30,0" childpadding="20">
+				<Button name="chufang_setting_cancel" text="取消" width="330" height="44" maxheight="44" font="14" textcolor="#FF5F6368" normalimage="file='gd_btn_grey_n.png' corner='8,8,8,8'" hotimage="file='gd_btn_grey_h.png' corner='8,8,8,8'" pushedimage="file='gd_btn_grey_p.png' corner='8,8,8,8'" />
+				<Button name="chufang_setting_save" text="保存" width="330" height="44" maxheight="44" font="14" textcolor="#FFFFFFFF" normalimage="file='gd_btn_green_n.png' corner='8,8,8,8'" hotimage="file='gd_btn_green_h.png' corner='8,8,8,8'" pushedimage="file='gd_btn_green_p.png' corner='8,8,8,8'" />
+			</HorizontalLayout>
 		</VerticalLayout>
-		
-		<HorizontalLayout height="56" valign="center" padding="0,30,0,20">
-			<Control />
-			<Button name="chufang_setting_save" align="center" width="280" height="44" text="保存" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-			<Control />
-		</HorizontalLayout>
 	</VerticalLayout>
-</Window>
+</Window>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<Window> 
-	<HorizontalLayout height="30">
-		<CheckBox name="chufang_setting_fenleli_xuanze_checkbox" padding="0,7,0,7" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
-		<Label name="chufang_setting_fenleli_xuanze_name" text="" width="300" padding="10,0,0,0"/>
+<Window>
+	<HorizontalLayout width="360" height="30" childvalign="vcenter">
+		<CheckBox name="chufang_setting_fenleli_xuanze_checkbox" width="15" height="15" maxheight="15" normalimage="file='gd_check_off.png'" hotimage="file='gd_check_off.png'" selectedimage="file='gd_check_on.png'" />
+		<Label name="chufang_setting_fenleli_xuanze_name" text="" width="336" font="13" textcolor="#FF1F2329" padding="9,0,0,0" />
 	</HorizontalLayout>
 </Window>

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

@@ -8,7 +8,7 @@
 	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
 	<HorizontalLayout name="setting_video_layout" height="500" padding="0,20,0,0">
-		<Label text="摄像头识别区域设置" width="275" height="30" font="115" textcolor="#FF1F2329"/>
+		<Label text="摄像头识别区域设置" width="275" height="30" valign="top" textcolor="#FF5F6368"/>
 		<VerticalLayout width="600" height="450" padding="10,0,10,0">
 			<Control name="image_video" float="true" pos="0,0,400,300"></Control>
 		</VerticalLayout>		

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

@@ -10,7 +10,7 @@
 					
 	<HorizontalLayout height="50" childvalign="vcenter" name="setting_biaoqian_printer_usb_layout">
 		<Label text="标签打印机usb端口选择" width="275" textcolor="#FF5F6368"/>
-		<Combo name="setting_biaoqian_printer_usb" width="800" height="34" maxheight="34" tooltip="请点击这里选择您的标签打印机usb端口" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
+		<Combo name="setting_biaoqian_printer_usb" width="600" height="34" maxheight="34" tooltip="请点击这里选择您的标签打印机usb端口" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
 		</Combo>
 	</HorizontalLayout>
 	

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

@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="50" childvalign="vcenter" padding="0,15,0,20">
-		<Button name="setting_new_chufang_printer_btn" align="center" width="200" height="44" maxheight="44" padding="0,0,0,0" text="新建厨房打印机" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-	</HorizontalLayout>
-
-	<List name="setting_chufang_printer_list" bordersize="1" bordercolor="#FFC1C1C1" itemlinecolor="#FF000000" vscrollbar="true" hscrollbar="true">
-		<ListHeader inset="10,0,0,0" height="42">
-			<ListHeaderItem text="打印机名称" width="120" align="center" />
-			<ListHeaderItem text="IP地址" width="150" align="center" />
-			<ListHeaderItem text="打印机规格" width="100" align="center" />
-			<ListHeaderItem text="商品分单打印" width="100" align="center" />
-			<ListHeaderItem text="按商品分类打印" width="100" align="center" />
-			<ListHeaderItem text="关联商品分类" width="180" align="center" />
-			<ListHeaderItem text="操作" width="100" align="center"/>
-		</ListHeader>
-	</List> 
-</Window>
+	<VerticalLayout inset="10,8,28,22">
+		<HorizontalLayout height="40" childvalign="vcenter">
+			<Label text="厨房打印机" width="90" font="116" textcolor="#FF1F2329" />
+			<Label name="setting_chufang_printer_count" text="共 0 台打印机" width="140" font="12" textcolor="#FF8A9099" padding="12,0,0,0" />
+			<Control />
+			<Button name="setting_new_chufang_printer_btn" align="center" width="170" height="40" maxheight="40" text="＋ 新建厨房打印机" textcolor="#FFFFFFFF" font="14" normalimage="file='gd_btn_green_n.png' corner='8,8,8,8'" hotimage="file='gd_btn_green_h.png' corner='8,8,8,8'" pushedimage="file='gd_btn_green_p.png' corner='8,8,8,8'" />
+		</HorizontalLayout>
+		<Control height="16" />
+		<List name="setting_chufang_printer_list" bkimage="file='card_r10.png' corner='10,10,10,10'" itemlinecolor="#FFF0F1F3" itemshowrowline="true" vscrollbar="true" hscrollbar="false">
+			<ListHeader height="44" bkimage="file='chufang_header_bg.png' corner='10,10,10,10'" inset="18,0,18,0">
+				<ListHeaderItem text="打印机名称" width="140" align="left" font="13" textcolor="#FF5F6368" />
+				<ListHeaderItem text="IP地址" width="140" align="left" font="13" textcolor="#FF5F6368" />
+				<ListHeaderItem text="打印机规格" width="110" align="left" font="13" textcolor="#FF5F6368" />
+				<ListHeaderItem text="商品分单打印" width="110" align="left" font="13" textcolor="#FF5F6368" />
+				<ListHeaderItem text="按商品分类打印" width="140" align="left" font="13" textcolor="#FF5F6368" />
+				<ListHeaderItem text="关联商品分类" width="120" align="left" font="13" textcolor="#FF5F6368" />
+				<ListHeaderItem text="操作" align="left" font="13" textcolor="#FF5F6368" />
+			</ListHeader>
+		</List>
+		<Control />
+	</VerticalLayout>
+</Window>

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

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<Window> 
-	<ListContainerElement name="setting_chufang_printer_item" width="890" height="80"> 
-		<Label name="setting_chufang_printer_item_name" width="120" height="80" align="center"/> 
-		<Label name="setting_chufang_printer_item_ip" width="150" align="center"/> 
-		<Label name="setting_chufang_printer_guige" width="100" align="center"/>
-		<Label name="setting_chufang_printer_fendan" width="100" align="center"/> 
-		<Label name="setting_chufang_printer_item_fenlei" width="100" align="center"/> 
-		<HorizontalLayout width="180" height="80" valign="center">
-			<Label name="setting_chufang_printer_item_fenlei_ids" width="180" wordbreak="true" align="center" valign="center"/> 
+<Window>
+	<ListContainerElement name="setting_chufang_printer_item" height="62" inset="18,0,18,0">
+		<Label name="setting_chufang_printer_item_name" width="140" align="left" font="14" textcolor="#FF1F2329" />
+		<Label name="setting_chufang_printer_item_ip" width="140" align="left" font="14" textcolor="#FF1F2329" />
+		<Label name="setting_chufang_printer_guige" width="110" align="left" font="14" textcolor="#FF1F2329" />
+		<HorizontalLayout width="110" childvalign="vcenter">
+			<Label name="setting_chufang_printer_fendan" width="40" height="22" maxheight="22" align="center" font="12" textcolor="#FF2E9B5C" bkimage="file='cap_green.png' corner='11,11,11,11'" />
 		</HorizontalLayout>
-		<HorizontalLayout name="setting_chufang_printer_caozuo" width="100" align="center">
-			<Control></Control>
-			<Button name="setting_chufang_printer_item_update_btn" align="center" width="26" height="27" padding="10,25,0,0" normalimage="file='Setting_Btn.png'" hotimage="file='Setting_Btn_Hover.png'" pushedimage="file='Setting_Btn_Active.png'" />
-			<Button name="setting_chufang_printer_item_delete_btn" align="center" width="18" height="18" padding="10,29,0,0" normalimage="file='Delete_Members_Icon.png'" hotimage="file='Delete_Members_Icon_Hover.png'" pushedimage="file='Delete_Members_Icon_Click.png'" />
-			<Control></Control>
+		<HorizontalLayout width="140" childvalign="vcenter">
+			<Label name="setting_chufang_printer_item_fenlei" width="40" height="22" maxheight="22" align="center" font="12" textcolor="#FF2E9B5C" bkimage="file='cap_green.png' corner='11,11,11,11'" />
 		</HorizontalLayout>
-	</ListContainerElement> 
+		<HorizontalLayout width="120" childvalign="vcenter">
+			<Label name="setting_chufang_printer_item_fenlei_ids" width="80" height="22" maxheight="22" align="center" font="12" textcolor="#FF8A9099" bkimage="file='cap_grey.png' corner='11,11,11,11'" />
+		</HorizontalLayout>
+		<HorizontalLayout name="setting_chufang_printer_caozuo" childvalign="vcenter" childpadding="10">
+			<Button name="setting_chufang_printer_item_update_btn" width="26" height="26" maxheight="26" tooltip="修改" normalimage="file='op_ico_edit_n.png'" hotimage="file='op_ico_edit_h.png'" pushedimage="file='op_ico_edit_p.png'" />
+			<Button name="setting_chufang_printer_item_delete_btn" width="26" height="26" maxheight="26" tooltip="删除" normalimage="file='op_ico_del_n.png'" hotimage="file='op_ico_del_h.png'" pushedimage="file='op_ico_del_p.png'" />
+		</HorizontalLayout>
+	</ListContainerElement>
 </Window>

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

@@ -31,9 +31,7 @@
 					<Option name="setting_switch_page_system_about" text="关于" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='setting_nav_on.png' corner='3,1,1,1'" textcolor="#FF666666" selectedtextcolor="#FF2E9B5C" />
 					<Control height="1" bkcolor="#FFD1D1D1"></Control>
 
-					<Control height="30"></Control>
-					
-					<Button name="setting_logout" padding="20,30,20,30" height="52" text="退出登录" textcolor="#FFFFFFFF" normalimage="file='btn_border_red.png' corner='5,5,5,5'" hotimage="file='btn_border_red_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_red_Click.png' corner='5,5,5,5'" />
+					<Button name="setting_logout" padding="16,13,16,13" height="40" font="15" text="退出登录" textcolor="#FFFFFFFF" normalimage="file='setting_logout_n.png' corner='8,8,8,8'" hotimage="file='setting_logout_h.png' corner='8,8,8,8'" pushedimage="file='setting_logout_p.png' corner='8,8,8,8'" />
 				</VerticalLayout>
 			</HorizontalLayout>
 

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

@@ -28,7 +28,7 @@
 	</HorizontalLayout>
 	<HorizontalLayout height="50" childvalign="vcenter" name="setting_printer_usb_layout">
 		<Label text="usb打印机端口选择" width="275" textcolor="#FF5F6368"/>
-		<Combo name="setting_printer_usb" width="800" height="34" maxheight="34" tooltip="请点击这里选择您的打印机USB端口" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
+		<Combo name="setting_printer_usb" width="600" height="34" maxheight="34" tooltip="请点击这里选择您的打印机USB端口" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
 		</Combo>
 	</HorizontalLayout>
 	<HorizontalLayout height="50" childvalign="vcenter" name="setting_printer_chuankou_layout">

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

@@ -1,54 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="50" childvalign="vcenter">
-		<Label text="条码秤条码格式" width="275" textcolor="#FF5F6368"/>
-		<Combo name="setting_tiaomacheng_geshi" width="400" height="34" maxheight="34" tooltip="请点击这里选择当前条码秤使用的条码格式" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
-			<ListLabelElement text="13位【FWWWWWWEEEEEC】" selected="true" />
-			<ListLabelElement text="13位【FWWWWWWNNNNNC】" />
-			<ListLabelElement text="13位【FFWWWWWEEEEEC】" />
-			<ListLabelElement text="13位【FFWWWWWNNNNNC】" />
-			<ListLabelElement text="18位【FWWWWWWEEEEENNNNNC】" selected="true" />
-			<ListLabelElement text="18位【FWWWWWWNNNNNEEEEEC】" />
-			<ListLabelElement text="18位【FFWWWWWEEEEENNNNNC】" />
-			<ListLabelElement text="18位【FFWWWWWNNNNNEEEEEC】" />
-		</Combo>
-	</HorizontalLayout>	
-	
-	<HorizontalLayout height="50" childvalign="vcenter">
-		<Label text="W：商品PLU编码；E：商品总价；N：商品重量，请根据您当前店内条码秤实际条码格式来选择" width="800" textcolor="#FF5F6368"/>
-	</HorizontalLayout>
-
-	<HorizontalLayout height="50" childvalign="vcenter">
-		<Label text="请正确选择您的条码秤所设置的条码格式类型，收银页面扫码时将按所选择的条码格式进行识别，条码秤设置的格式与这里选择的格式必须完全一致才能正确识别" textcolor="#FF999999" wordbreak="true" width="800"/>
-	</HorizontalLayout>
-	
-	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
-	
-	<HorizontalLayout height="50" childvalign="vcenter" padding="0,10,0,0">
-		<Label text="条码秤型号" width="275" textcolor="#FF5F6368"/>
-		<Combo name="setting_tiaomacheng_xinghao" width="140" height="34" maxheight="34" tooltip="请点击这里选择您的打印机纸张宽度规格" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
-			<ListLabelElement text="大华TM系列" selected="true" />
-		</Combo>
-	</HorizontalLayout>
-	
-	<HorizontalLayout height="56" name="setting_printer_wangkou_layout" childvalign="vcenter">
-		<Label text="条码秤IP地址" width="275" textcolor="#FF5F6368"/>
-		<Edit name="setting_tiaomacheng_ip" width="200" height="32" maxheight="32" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
-
-		<Button name="setting_tiaomacheng_saveip" align="center" width="100" height="38" maxheight="38" padding="20,0,0,0" text="保存" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-	</HorizontalLayout>
-	
-	<HorizontalLayout height="52" childvalign="vcenter">
-		<Button name="setting_tiaomacheng_tongbushangpin" align="center" width="300" height="44" maxheight="44" padding="0,0,0,0" text="同步最新商品信息到条码秤" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-	</HorizontalLayout>
-	
-	<HorizontalLayout height="50" childvalign="vcenter">
-		<Label text="上述操作将自动同步本店所有已经设置PLU编码的称重商品的信息到条码秤，同步成功后条码秤即可以支持打印所有本店PLU编码商品的条码；同时会根据商品PLU编码生成快捷键，比如PLU编码为1，则快捷键为1，编码为10，则快捷键为10" textcolor="#FF999999" wordbreak="true" width="800"/>
-	</HorizontalLayout>
-	
-	<HorizontalLayout height="50" childvalign="vcenter" padding="0,20,0,0">
-		<Control></Control>
-		<Label name="setting_tiaomacheng_errinfo" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
-		<Control></Control>
-	</HorizontalLayout>	
-</Window>
+	<VerticalLayout inset="0,18,28,18">
+		<!-- 卡片1：条码格式 → -->
+		<VerticalLayout height="168" bkimage="file='card_r10.png' corner='10,10,10,10'" inset="22,18,22,18">
+			<Label text="条码格式" height="22" font="115" textcolor="#FF1F2329" padding="0,0,0,14" />
+			<HorizontalLayout height="46" childvalign="vcenter">
+				<Label text="条码秤条码格式" width="110" textcolor="#FF5F6368" />
+				<Combo name="setting_tiaomacheng_geshi" width="420" height="34" maxheight="34" tooltip="请点击这里选择当前条码秤使用的条码格式" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
+					<ListLabelElement text="13位【FWWWWWWEEEEEC】" selected="true" />
+					<ListLabelElement text="13位【FWWWWWWNNNNNC】" />
+					<ListLabelElement text="13位【FFWWWWWEEEEEC】" />
+					<ListLabelElement text="13位【FFWWWWWNNNNNC】" />
+					<ListLabelElement text="18位【FWWWWWWEEEEENNNNNC】" selected="true" />
+					<ListLabelElement text="18位【FWWWWWWNNNNNEEEEEC】" />
+					<ListLabelElement text="18位【FFWWWWWEEEEENNNNNC】" />
+					<ListLabelElement text="18位【FFWWWWWNNNNNEEEEEC】" />
+				</Combo>
+			</HorizontalLayout>
+			<Label text="W：商品PLU编码；E：商品总价；N：商品重量，请根据您当前店内条码秤实际条码格式来选择" height="17" textcolor="#FF8A9099" font="12" wordbreak="true" padding="0,0,0,10" />
+			<Label text="请正确选择您的条码秤所设置的条码格式类型，收银页面扫码时将按所选择的条码格式进行识别，条码秤设置的格式与这里选择的格式必须完全一致才能正确识别" height="17" textcolor="#FF999999" font="12" wordbreak="true" padding="0,0,0,6" />
+		</VerticalLayout>
+		<Control height="16" />
+		<!-- 卡片2：设备连接 → -->
+		<VerticalLayout height="164" bkimage="file='card_r10.png' corner='10,10,10,10'" inset="22,18,22,18">
+			<Label text="设备连接" height="22" font="115" textcolor="#FF1F2329" padding="0,0,0,14" />
+			<HorizontalLayout height="46" childvalign="vcenter">
+				<Label text="条码秤型号" width="110" textcolor="#FF5F6368" />
+				<Combo name="setting_tiaomacheng_xinghao" width="420" height="34" maxheight="34" tooltip="请点击这里选择您的打印机纸张宽度规格" normalimage="file='gd_combo_n.png' corner='8,8,22,8'" hotimage="file='gd_combo_h.png' corner='8,8,22,8'" pushedimage="file='gd_combo_p.png' corner='8,8,22,8'" textpadding="11,0,30,0" >
+					<ListLabelElement text="大华TM系列" selected="true" />
+				</Combo>
+			</HorizontalLayout>
+			<HorizontalLayout height="46" childvalign="vcenter">
+				<Label text="条码秤IP地址" width="110" textcolor="#FF5F6368" />
+				<Edit name="setting_tiaomacheng_ip" width="240" height="32" maxheight="32" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+				<Button name="setting_tiaomacheng_saveip" align="center" width="88" height="38" maxheight="38" padding="12,0,0,0" text="保存" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+			</HorizontalLayout>
+			<Label name="setting_tiaomacheng_errinfo" text="" textcolor="#FFE14B4A" font="12" visible="false" padding="0,8,0,0" />
+		</VerticalLayout>
+		<Control height="16" />
+		<!-- 卡片3：数据同步 → -->
+		<VerticalLayout height="168" bkimage="file='card_r10.png' corner='10,10,10,10'" inset="22,18,22,18">
+			<Label text="数据同步" height="22" font="115" textcolor="#FF1F2329" padding="0,0,0,14" />
+			<HorizontalLayout height="52" childvalign="vcenter">
+				<Button name="setting_tiaomacheng_tongbushangpin" align="center" width="300" height="44" maxheight="44" text="同步最新商品信息到条码秤" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+			</HorizontalLayout>
+			<Label text="上述操作将自动同步本店所有已经设置PLU编码的称重商品的信息到条码秤，同步成功后条码秤即可以支持打印所有本店PLU编码商品的条码；同时会根据商品PLU编码生成快捷键，比如PLU编码为1，则快捷键为1，编码为10，则快捷键为10" height="34" textcolor="#FF999999" font="12" wordbreak="true" padding="0,10,0,0" />
+		</VerticalLayout>
+		<Control />
+	</VerticalLayout>
+</Window>

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

@@ -1,43 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="700,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
-	
-	<VerticalLayout bkimage="shoukuan_bkg.png" >
+<Window size="540,420" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
+
+	<VerticalLayout bkimage="shoukuan_bkg.png">
 		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
-			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
-			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="115"/>
+			<Button name="closebtn" keyboard="false" padding="0,14,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="0xFF60B177" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
-				
-				<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_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+
+		<HorizontalLayout inset="20,20,20,20" childpadding="16">
+			<!-- 左侧：提示语 + 人数输入框 + 开台按钮 -->
+			<VerticalLayout width="242">
+				<Label name="name" text="请输入用餐人数" width="242" height="42" font="13" textcolor="#FF5F6368" align="left" wordbreak="true"/>
+				<Control width="242" height="14"/>
+				<HorizontalLayout width="242" height="46">
+					<Edit name="content" width="242" height="46" font="16" textcolor="#FF1F2329" bkcolor="#FFFFFFFF" nativebkcolor="#FFFFFFFF" textpadding="14,0,14,0" normalimage="file='input_normal.png' corner='10,10,10,10'" hotimage="file='input_hover.png' corner='10,10,10,10'" focusedimage="file='input_focus.png' corner='10,10,10,10'"/>
+				</HorizontalLayout>
+				<Control width="242" height="16"/>
+				<Button name="save" text="开台" width="242" height="46" textcolor="#FFFFFFFF" font="115" normalimage="file='gd_btn_green_n.png' corner='8,8,8,8'" hotimage="file='gd_btn_green_h.png' corner='8,8,8,8'" pushedimage="file='gd_btn_green_p.png' corner='8,8,8,8'"/>
+			</VerticalLayout>
+
+			<!-- 右侧：数字键盘，与加价弹框同规格（key_*.png 圆角 12 / 数字 24 号 / 按下文字转主绿 #FF60B177 / 清空与退格用次要灰字） -->
+			<VerticalLayout width="242" childpadding="10">
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_1" text="1" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_2" text="2" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_3" text="3" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+				</HorizontalLayout>
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_4" text="4" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_5" text="5" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_6" text="6" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+				</HorizontalLayout>
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_7" text="7" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_8" text="8" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_9" text="9" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+				</HorizontalLayout>
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_qingkong" text="清空" font="15" textcolor="#FF5F6368" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_0" text="0" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_x" text="×" font="24" textcolor="#FF5F6368" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
 				</HorizontalLayout>
 			</VerticalLayout>
-			
-			<HorizontalLayout width="330" height="406" bkcolor="#FFF3F3F3">
-				<Button name="jianpan_1" text="1" font="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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>
-		
+
+		<Label name="errinfo" text="" height="40" width="242" float="true" pos="20,236,262,276" align="left" font="13" textcolor="#FFFF0000" visible="false" wordbreak="true"/>
 	</VerticalLayout>
-</Window>
+</Window>

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

@@ -1,43 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="700,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
-	
-	<VerticalLayout bkimage="shoukuan_bkg.png" >
+<Window size="540,420" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
+
+	<VerticalLayout bkimage="shoukuan_bkg.png">
 		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
-			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
-			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="115"/>
+			<Button name="closebtn" keyboard="false" padding="0,14,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="0xFF60B177" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
-				
-				<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_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+
+		<HorizontalLayout inset="20,20,20,20" childpadding="16">
+			<!-- 左侧：提示语 + 人数输入框 + 确认按钮 -->
+			<VerticalLayout width="242">
+				<Label name="name" text="请输入用餐人数" width="242" height="42" font="13" textcolor="#FF5F6368" align="left" wordbreak="true"/>
+				<Control width="242" height="14"/>
+				<HorizontalLayout width="242" height="46">
+					<Edit name="content" width="242" height="46" font="16" textcolor="#FF1F2329" bkcolor="#FFFFFFFF" nativebkcolor="#FFFFFFFF" textpadding="14,0,14,0" normalimage="file='input_normal.png' corner='10,10,10,10'" hotimage="file='input_hover.png' corner='10,10,10,10'" focusedimage="file='input_focus.png' corner='10,10,10,10'"/>
+				</HorizontalLayout>
+				<Control width="242" height="16"/>
+				<Button name="save" text="确认" width="242" height="46" textcolor="#FFFFFFFF" font="115" normalimage="file='gd_btn_green_n.png' corner='8,8,8,8'" hotimage="file='gd_btn_green_h.png' corner='8,8,8,8'" pushedimage="file='gd_btn_green_p.png' corner='8,8,8,8'"/>
+			</VerticalLayout>
+
+			<!-- 右侧：数字键盘，与加价弹框同规格（key_*.png 圆角 12 / 数字 24 号 / 按下文字转主绿 #FF60B177 / 清空与退格用次要灰字） -->
+			<VerticalLayout width="242" childpadding="10">
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_1" text="1" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_2" text="2" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_3" text="3" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+				</HorizontalLayout>
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_4" text="4" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_5" text="5" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_6" text="6" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+				</HorizontalLayout>
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_7" text="7" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_8" text="8" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_9" text="9" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+				</HorizontalLayout>
+				<HorizontalLayout width="242" height="76" childpadding="10">
+					<Button name="jianpan_qingkong" text="清空" font="15" textcolor="#FF5F6368" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_0" text="0" font="24" textcolor="#FF1F2329" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
+					<Button name="jianpan_x" text="×" font="24" textcolor="#FF5F6368" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177"/>
 				</HorizontalLayout>
 			</VerticalLayout>
-			
-			<HorizontalLayout width="330" height="406" bkcolor="#FFF3F3F3">
-				<Button name="jianpan_1" text="1" font="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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="26" 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>
-		
+
+		<Label name="errinfo" text="" height="40" width="242" float="true" pos="20,236,262,276" align="left" font="13" textcolor="#FFFF0000" visible="false" wordbreak="true"/>
 	</VerticalLayout>
-</Window>
+</Window>

zhipuzi_pos_windows/page/CSettingPageUI.cpp

@@ -21,6 +21,75 @@ using boost::asio::ip::tcp;
 #include "../tool/CAppEnv.h"
 #include "../tool/CVideoCapture.h"
 
+//厨房打印机列表 C2 胶囊：「是/否」状态胶囊（开 = 绿底绿字，关 = 灰底灰字）
+static void ChufangSetStateCapsule(CLabelUI* pLabel, bool bOn)
+{
+	if (pLabel == NULL)
+	{
+		return;
+	}
+
+	pLabel->SetFixedWidth(40);
+
+	if (bOn)
+	{
+		pLabel->SetText(L"是");
+		pLabel->SetBkImage(L"file='cap_green.png' corner='11,11,11,11'");
+		pLabel->SetTextColor(0xFF2E9B5C);
+	}
+	else
+	{
+		pLabel->SetText(L"否");
+		pLabel->SetBkImage(L"file='cap_grey.png' corner='11,11,11,11'");
+		pLabel->SetTextColor(0xFF8A9099);
+	}
+}
+
+//厨房打印机列表 C2 胶囊：关联分类数胶囊（有分类 = 绿底「N 个分类」，无 = 灰底「未关联」），tooltip 展示完整分类名
+static void ChufangSetRelCapsule(CLabelUI* pLabel, int nCount, const std::wstring& wsNames)
+{
+	if (pLabel == NULL)
+	{
+		return;
+	}
+
+	if (nCount > 0)
+	{
+		std::wstring wsText = std::to_wstring(nCount) + L" 个分类";
+		pLabel->SetBkImage(L"file='cap_green.png' corner='11,11,11,11'");
+		pLabel->SetTextColor(0xFF2E9B5C);
+		pLabel->SetText(wsText.c_str());
+		pLabel->SetFixedWidth(24 + (int)wsText.length() * 12);
+	}
+	else
+	{
+		std::wstring wsText = L"未关联";
+		pLabel->SetBkImage(L"file='cap_grey.png' corner='11,11,11,11'");
+		pLabel->SetTextColor(0xFF8A9099);
+		pLabel->SetText(wsText.c_str());
+		pLabel->SetFixedWidth(24 + (int)wsText.length() * 12);
+	}
+
+	pLabel->SetToolTip(wsNames.c_str());
+}
+
+// 刷新「共 N 台打印机」台数（标题区一处）并约束列表高度 = 表头 44 + 行高 62*N
+static void ChufangRefreshPrinterCount(CSettingPageUI* pThis, CListUI* pList)
+{
+	if (pThis == NULL || pList == NULL)
+	{
+		return;
+	}
+
+	int n = pList->GetCount();
+	std::wstring wsText = L"共 " + std::to_wstring(n) + L" 台打印机";
+
+	CLabelUI* pTop = static_cast<CLabelUI*>(pThis->FindSubControl(_T("setting_chufang_printer_count")));
+	if (pTop != NULL) pTop->SetText(wsText.c_str());
+
+	pList->SetFixedHeight(44 + 62 * n);
+}
+
 CSettingPageUI::CSettingPageUI()
 {
 
@@ -891,26 +960,10 @@ void CSettingPageUI::InitControl()
 		}
 
 		CLabelUI* pFendan = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_fendan")));
-
-		if (newPrinter.fendan == "1")
-		{
-			pFendan->SetText(L"是");
-		}
-		else
-		{
-			pFendan->SetText(L"否");
-		}
+		ChufangSetStateCapsule(pFendan, newPrinter.fendan == "1");
 
 		CLabelUI* pFenlei = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_item_fenlei")));
-
-		if (newPrinter.fenlei == "1")
-		{
-			pFenlei->SetText(L"是");
-		}
-		else
-		{
-			pFenlei->SetText(L"否");
-		}
+		ChufangSetStateCapsule(pFenlei, newPrinter.fenlei == "1");
 
 		std::string foodtypeNames = "";
 
@@ -919,6 +972,8 @@ void CSettingPageUI::InitControl()
 		//这个是删除掉不存在的type_id之后的
 		std::string new_foodtype_ids = "";
 
+		int nValidTypes = 0;
+
 		std::vector<std::string> ids = CLewaimaiString::Split(foodtype_ids, ",");
 
 		CSqlite3 sqlite;
@@ -934,6 +989,8 @@ void CSettingPageUI::InitControl()
 
 			std::string name = type.name;
 
+			nValidTypes++;
+
 			foodtypeNames += name + CLewaimaiString::UnicodeToUTF8(L"、");
 
 			new_foodtype_ids += (*it) + ",";
@@ -951,13 +1008,15 @@ void CSettingPageUI::InitControl()
 		ws_foodtypeNames = ws_foodtypeNames.substr(0, ws_foodtypeNames.size() - 1);
 
 		CLabelUI* pFenleiIds = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_item_fenlei_ids")));
-		pFenleiIds->SetText(ws_foodtypeNames.c_str());
+		ChufangSetRelCapsule(pFenleiIds, nValidTypes, ws_foodtypeNames);
 
 		//设置标记属性，用于修改时候匹配
 		pEle->AddCustomAttribute(L"date", CLewaimaiString::UTF8ToUnicode(newPrinter.date).c_str());
 		pPrinterList->Add(pEle);
 	}
 
+	ChufangRefreshPrinterCount(this, pPrinterList);
+
 	//初始化AI识别的设置
 	box = static_cast<CCheckBoxUI *>(this->FindSubControl(_T("setting_is_ai_recognition_open")));
 	CHorizontalLayoutUI* videoLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("setting_video_layout")));
@@ -1453,32 +1512,18 @@ void CSettingPageUI::HandleClickMsg(TNotifyUI& msg)
 				}
 
 				CLabelUI* pFendan = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_fendan")));
-
-				if (newPrinter.fendan == "1")
-				{
-					pFendan->SetText(L"是");
-				}
-				else
-				{
-					pFendan->SetText(L"否");
-				}
+				ChufangSetStateCapsule(pFendan, newPrinter.fendan == "1");
 
 				CLabelUI* pFenlei = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_item_fenlei")));
-
-				if (newPrinter.fenlei == "1")
-				{
-					pFenlei->SetText(L"是");
-				}
-				else
-				{
-					pFenlei->SetText(L"否");
-				}
+				ChufangSetStateCapsule(pFenlei, newPrinter.fenlei == "1");
 
 				std::string foodtypeNames = "";
 
 				std::string foodtype_ids = newPrinter.fenlei_ids;
 				std::vector<std::string> ids = CLewaimaiString::Split(foodtype_ids, ",");
 
+				int nValidTypes = 0;
+
 				CSqlite3 sqlite;
 				for (std::vector<std::string>::iterator it = ids.begin(); it != ids.end(); it++)
 				{
@@ -1492,16 +1537,20 @@ void CSettingPageUI::HandleClickMsg(TNotifyUI& msg)
 					std::string name = foodtype.name;
 					std::wstring ws_name = CLewaimaiString::UTF8ToUnicode(name);
 					foodtypeNames += name + "  ";
+
+					nValidTypes++;
 				}
 
 				foodtypeNames = foodtypeNames.substr(0, foodtypeNames.size() - 1);
 				std::wstring ws_foodtypeNames = CLewaimaiString::UTF8ToUnicode(foodtypeNames);
 
 				CLabelUI* pFenleiIds = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_item_fenlei_ids")));
-				pFenleiIds->SetText(ws_foodtypeNames.c_str());
+				ChufangSetRelCapsule(pFenleiIds, nValidTypes, ws_foodtypeNames);
 
 				pEle->AddCustomAttribute(L"date", CLewaimaiString::UTF8ToUnicode(newPrinter.date).c_str());
 				pPrinterList->Add(pEle);
+
+	ChufangRefreshPrinterCount(this, pPrinterList);
 			}
 		}
 	}
@@ -1582,32 +1631,18 @@ void CSettingPageUI::HandleClickMsg(TNotifyUI& msg)
 				}
 
 				CLabelUI* pFendan = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_fendan")));
-
-				if (newPrinter.fendan == "1")
-				{
-					pFendan->SetText(L"是");
-				}
-				else
-				{
-					pFendan->SetText(L"否");
-				}
+				ChufangSetStateCapsule(pFendan, newPrinter.fendan == "1");
 
 				CLabelUI* pFenlei = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_item_fenlei")));
-
-				if (newPrinter.fenlei == "1")
-				{
-					pFenlei->SetText(L"是");
-				}
-				else
-				{
-					pFenlei->SetText(L"否");
-				}
+				ChufangSetStateCapsule(pFenlei, newPrinter.fenlei == "1");
 
 				std::string foodtypeNames = "";
 
 				std::string foodtype_ids = newPrinter.fenlei_ids;
 				std::vector<std::string> ids = CLewaimaiString::Split(foodtype_ids, ",");
 
+				int nValidTypes = 0;
+
 				CSqlite3 sqlite;
 				for (std::vector<std::string>::iterator it = ids.begin(); it != ids.end(); it++)
 				{
@@ -1621,13 +1656,15 @@ void CSettingPageUI::HandleClickMsg(TNotifyUI& msg)
 					std::string name = foodtype.name;
 					std::wstring ws_name = CLewaimaiString::UTF8ToUnicode(name);
 					foodtypeNames += name + "  ";
+
+					nValidTypes++;
 				}
 
 				foodtypeNames = foodtypeNames.substr(0, foodtypeNames.size() - 1);
 				std::wstring ws_foodtypeNames = CLewaimaiString::UTF8ToUnicode(foodtypeNames);
 
 				CLabelUI* pFenleiIds = static_cast<CLabelUI*>(pEle->FindSubControl(_T("setting_chufang_printer_item_fenlei_ids")));
-				pFenleiIds->SetText(ws_foodtypeNames.c_str());
+				ChufangSetRelCapsule(pFenleiIds, nValidTypes, ws_foodtypeNames);
 			}
 		}
 	}
@@ -1639,6 +1676,8 @@ void CSettingPageUI::HandleClickMsg(TNotifyUI& msg)
 		//获得了ID，这个时候从内存和数据库中分别删除对应的记录
 		CSetting::GetInstance()->DelChufangPrinter(CLewaimaiString::UnicodeToUTF8(date));
 		pPrinterList->Remove(pEle);
+
+	ChufangRefreshPrinterCount(this, pPrinterList);
 	}
 	else if (name == L"setting_tiaomacheng_saveip")
 	{

zhipuzi_pos_windows/wnd/CChufangSettingWnd.cpp

@@ -195,8 +195,8 @@ void CChufangSettingWnd::Init()
 		}
 	}
 
-	//把所有分类显示出来
-	CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("chufang_setting_fenlei_xuanze_area")));
+	//把所有分类显示出来（P2 弹框：分类勾选区为 TileLayout 两列排布）
+	CTileLayoutUI* pLayout = static_cast<CTileLayoutUI*>(m_pm.FindControl(_T("chufang_setting_fenlei_xuanze_area")));
 	pLayout->RemoveAll();
 
 	ChufangPrinter updatePrinter;
@@ -240,7 +240,8 @@ void CChufangSettingWnd::Init()
 	}
 
 	CVerticalLayoutUI* pOutLayout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("chufang_setting_fenlei_xuanze")));
-	pOutLayout->SetFixedHeight(foodtypes.size() * 30 + 30);
+	int rows = (foodtypes.size() + 1) / 2;
+	pOutLayout->SetFixedHeight(rows * 30 + 6);
 }
 
 void CChufangSettingWnd::Notify(TNotifyUI& msg)
@@ -260,6 +261,11 @@ void CChufangSettingWnd::Notify(TNotifyUI& msg)
 			Close(IDCANCEL);
 			return;
 		}
+		else if (senderName == _T("chufang_setting_cancel"))
+		{
+			Close(IDCANCEL);
+			return;
+		}
 		else if (senderName == _T("chufang_setting_save"))
 		{
 			//开始保存厨房打印机的数据
@@ -314,7 +320,7 @@ void CChufangSettingWnd::Notify(TNotifyUI& msg)
 
 			std::string fenlei_ids = "";
 
-			CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("chufang_setting_fenlei_xuanze_area")));
+			CTileLayoutUI* pLayout = static_cast<CTileLayoutUI*>(m_pm.FindControl(_T("chufang_setting_fenlei_xuanze_area")));
 			CStdPtrArray* pArray = m_pm.FindSubControlsByClass(pLayout, _T("CheckBox"));
 			int size = pArray->GetSize();
 			for (int i = 0; i < size; i++)