1

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44">
-		<Label text="开启点单页面AI识别" width="260"/>
-		<CheckBox name="setting_is_ai_recognition_open" 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">
+		<Label text="开启点单页面AI识别" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_ai_recognition_open" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<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="260" height="30"/>
+		<Label text="摄像头识别区域设置" width="275" height="30" font="115" textcolor="#FF1F2329"/>
 		<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

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44">
-		<Label text="标签打印机接口类型" width="260"/>
-		<Combo name="setting_biaoqian_printer_leixing" padding="0,9,0,0" width="140" height="26" 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="50" childvalign="vcenter">
+		<Label text="标签打印机接口类型" width="275" textcolor="#FF5F6368"/>
+		<Combo name="setting_biaoqian_printer_leixing" 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="usb" selected="true"/>
 			<ListLabelElement text="网口" />
 		</Combo>
 	</HorizontalLayout>
 					
-	<HorizontalLayout height="44" name="setting_biaoqian_printer_usb_layout">
-		<Label text="标签打印机usb端口选择" width="260"/>
-		<Combo name="setting_biaoqian_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的标签打印机usb端口" 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="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>
 	</HorizontalLayout>
 	
-	<HorizontalLayout height="56" name="setting_biaoqian_printer_wangkou_layout">
-		<Label text="网口IP地址" width="260"/>
-		<Edit name="setting_biaoqian_printer_wangkou_ip" width="200" 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="56" name="setting_biaoqian_printer_wangkou_layout" childvalign="vcenter">
+		<Label text="网口IP地址" width="275" textcolor="#FF5F6368"/>
+		<Edit name="setting_biaoqian_printer_wangkou_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_biaoqian_printer_wangkouk_save_btn" align="center" width="100" height="38" padding="20,8,0,3" text="保存" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+		<Button name="setting_biaoqian_printer_wangkouk_save_btn" 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="44">
-		<Label text="标签纸尺寸规格【宽度*高度】" width="260"/>
-		<Combo name="setting_biaoqian_printer_guige" padding="0,9,0,0" width="140" height="26" 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="50" childvalign="vcenter">
+		<Label text="标签纸尺寸规格【宽度*高度】" width="275" textcolor="#FF5F6368"/>
+		<Combo name="setting_biaoqian_printer_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="40*30mm" selected="true" />
 			<ListLabelElement text="35*25mm" />
 			<ListLabelElement text="30*25mm" />
@@ -33,23 +33,23 @@
 		</Combo>
 	</HorizontalLayout>
 	
-	<HorizontalLayout height="44">
-		<Label text="出纸方向" width="260"/>
-		<Combo name="setting_biaoqian_printer_fangxiang" padding="0,9,0,0" width="140" height="26" 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="50" childvalign="vcenter">
+		<Label text="出纸方向" width="275" textcolor="#FF5F6368"/>
+		<Combo name="setting_biaoqian_printer_fangxiang" 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="正方向" selected="true" />
 			<ListLabelElement text="反方向" />
 		</Combo>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
-	<HorizontalLayout height="44">
-		<Label text="订单打印按绑定商品分类打印标签" width="260" />
-		<CheckBox name="setting_biaoqian_printer_is_type" 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">
+		<Label text="订单打印按绑定商品分类打印标签" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_biaoqian_printer_is_type" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<HorizontalLayout height="500">
-		<Label text="当前绑定商品分类：" width="260"  height="44"/>
+	<HorizontalLayout height="500" name="setting_biaoqian_printer_type_area">
+		<Label text="当前绑定商品分类：" width="275"  height="44" textcolor="#FF5F6368"/>
 		<VerticalLayout name="setting_biaoqian_printer_type_layout" padding="0,15,0,0">
 		
 		</VerticalLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44" padding="0,15,0,20">
-		<Button name="setting_new_chufang_printer_btn" align="center" width="200" height="44" padding="0,3,0,3" 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 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">

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

@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44">
-		<Label text="快餐扫码点餐新订单语音通知" width="260" />
-		<CheckBox name="setting_is_new_diannei_voice" 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">
+		<Label text="快餐扫码点餐新订单语音通知" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_diannei_voice" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
-	<HorizontalLayout height="44">
-		<Label text="新订单自动打印收银小票" width="260" />
-		<CheckBox name="setting_is_new_diannei_printer" 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">
+		<Label text="新订单自动打印收银小票" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_diannei_printer" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<HorizontalLayout height="44">
-		<Label text="新订单自动打印标签纸" width="260" />
-		<CheckBox name="setting_is_new_diannei_biaoqian_printer" 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">
+		<Label text="新订单自动打印标签纸" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_diannei_biaoqian_printer" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<HorizontalLayout height="44">
-		<Label text="新订单自动厨房打印" width="260" />
-		<CheckBox name="setting_is_new_diannei_chufang_printer" 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">
+		<Label text="新订单自动厨房打印" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_diannei_chufang_printer" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
-	<HorizontalLayout height="64">
-		<Label text="打印扫码点餐和手机app订单（如果一个店多台收银机请只开一台，否则多台机器会重复打印）" wordbreak="true" endellipsis="true" width="260" />
-		<CheckBox name="setting_is_new_diannei_saomadiancan_printer" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+	<HorizontalLayout height="64" childvalign="vcenter">
+		<Label text="打印扫码点餐和手机app订单（如果一个店多台收银机请只开一台，否则多台机器会重复打印）" wordbreak="true" endellipsis="true" width="260" padding="0,0,15,0" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_diannei_saomadiancan_printer" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
-	<HorizontalLayout height="44">
-		<Label text="现金收款后自动打开钱箱" width="260" />
-		<CheckBox name="setting_is_diannei_xianjin_qianxiang" 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">
+		<Label text="现金收款后自动打开钱箱" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_diannei_xianjin_qianxiang" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 </Window>

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

@@ -1,35 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="30" padding="0,15,0,0">
-		<Label text="称重电子秤" width="260"/>
-		<HorizontalLayout padding="30,0,30,0" width="90" height="30">
-			<CheckBox name="setting_dianzicheng_weilianjie" group="setting_dianzicheng_type" selected="true" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="setting_dianzicheng_weilianjie_name" text="未连接" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
-		<HorizontalLayout padding="30,0,30,0" width="90" height="30">
-			<CheckBox name="setting_dianzicheng_yilianjie" group="setting_dianzicheng_type" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="setting_dianzicheng_yilianjie_name" text="已连接" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
+	<HorizontalLayout height="50" childvalign="vcenter">
+		<Label text="称重电子秤" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_dianzicheng_weilianjie" group="setting_dianzicheng_type" selected="true" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="setting_dianzicheng_weilianjie_name" text="未连接" width="105" padding="10,0,16,0" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_dianzicheng_yilianjie" group="setting_dianzicheng_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="setting_dianzicheng_yilianjie_name" text="已连接" width="105" padding="10,0,0,0" textcolor="#FF5F6368"/>
 	</HorizontalLayout>
 
 	<VerticalLayout name="setting_dianzicheng_layout">
-		<HorizontalLayout height="44">
-			<Label text="电子秤型号" width="260"/>
-			<Combo name="setting_dianzicheng_xinghao" padding="0,9,0,0" width="300" height="26" 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="50" childvalign="vcenter">
+			<Label text="电子秤型号" width="275" textcolor="#FF5F6368"/>
+			<Combo name="setting_dianzicheng_xinghao" width="300" 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="大华ACS系列" selected="true" />
 				<ListLabelElement text="顶尖OS2X系列" selected="true" />
 			</Combo>
 		</HorizontalLayout>
-		
-		<HorizontalLayout height="44" name="setting_printer_chuankou_layout">
-			<Label text="串口端口选择" width="260"/>
-			<Combo name="setting_dianzicheng_chuankou" padding="0,9,0,0" width="200" height="26" 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 name="setting_printer_chuankou_layout" height="50" childvalign="vcenter">
+			<Label text="串口端口选择" width="275" textcolor="#FF5F6368"/>
+			<Combo name="setting_dianzicheng_chuankou" width="200" 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" >
 			</Combo>
 		</HorizontalLayout>
-		
-		<HorizontalLayout height="44">
-			<Label text="波特率" width="260"/>
-			<Combo name="setting_dianzicheng_botelv" padding="0,9,0,0" width="300" height="26" 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="50" childvalign="vcenter">
+			<Label text="波特率" width="275" textcolor="#FF5F6368"/>
+			<Combo name="setting_dianzicheng_botelv" width="300" 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="600" />
 				<ListLabelElement text="1200" />
 				<ListLabelElement text="2400" />
@@ -40,4 +36,4 @@
 			</Combo>
 		</HorizontalLayout>
 	</VerticalLayout>	
-</Window>
+</Window>

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

@@ -1,99 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<VerticalLayout vscrollbar="true">
-		<HorizontalLayout height="44" padding="0,0,0,0">
-			<Label text="操作提示：点击选中要设置的操作，然后用键盘按出想要的快捷键即可" width="600" />
+		<HorizontalLayout height="50" childvalign="vcenter" padding="0,0,0,0">
+			<Label text="操作提示：点击选中要设置的操作，然后用键盘按出想要的快捷键即可" width="600"  textcolor="#FF5F6368"/>
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44" padding="0,0,0,0">
-			<Label text="【选中后按 Back 或 Del 也可以删除快捷键】" width="600" />
+		<HorizontalLayout height="50" childvalign="vcenter" padding="0,0,0,0">
+			<Label text="【选中后按 Back 或 Del 也可以删除快捷键】" width="600"  textcolor="#FF5F6368"/>
 		</HorizontalLayout>
 		
-		<Control height="1" bkcolor="#FF708090" padding="0,0,0,20" />
+		<Control height="1" bkcolor="#FFF0F1F3" padding="0,0,0,20" />
 		
-		<HorizontalLayout height="44">
-			<Label text="微信/支付宝/云闪付收款" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_weixinshoukuan" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000"/>
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="微信/支付宝/云闪付收款" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_weixinshoukuan" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000"/>
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="会员收款" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_huiyuanshoukuan" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="会员收款" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_huiyuanshoukuan" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="现金收款" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_xianjinshoukuan" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="现金收款" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_xianjinshoukuan" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="会员登录" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_huiyuandenglu" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="会员登录" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_huiyuandenglu" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="打开钱箱" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_qianxiang" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="打开钱箱" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_qianxiang" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="退出登录" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_logout" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="退出登录" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_logout" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【点单】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_diandan" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【点单】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_diandan" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【订单】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_dingdan" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【订单】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_dingdan" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【会员】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_huiyuan" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【会员】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_huiyuan" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【报表】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_baobiao" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【报表】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_baobiao" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【交班】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_jiaoban" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【交班】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_jiaoban" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【设置】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_shezhi" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【设置】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_shezhi" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【商品】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_shangpin" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【商品】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_shangpin" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【库存】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_kucun" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【库存】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_kucun" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【采购】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_caigou" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【采购】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_caigou" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【桌台】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_zhuotai" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【桌台】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_zhuotai" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="44">
-			<Label text="跳转【收款】页面" width="260" />
-			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_shoukuan" align="center" width="200" height="38" padding="0,3,0,3" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
+		<HorizontalLayout height="50" childvalign="vcenter">
+			<Label text="跳转【收款】页面" width="275" textcolor="#FF5F6368"/>
+			<Button name="setting_kuaijiejian_page_btn_tiaozhuan_shoukuan" align="center" width="200" height="38" maxheight="38" padding="0,0,0,0" text="" normalimage="" hotimage="" pushedimage="" focusedimage="" bordersize="1" bordercolor="#FFA9A9A9" focusbordercolor="#FFFF0000" />
 		</HorizontalLayout>
 	</VerticalLayout>
 </Window>

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

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<SettingPage name="setting_page" bkcolor="#FFEFF6EE">
+	<SettingPage name="setting_page" bkcolor="#FFF5F7FA">
 		<HorizontalLayout>
 			<HorizontalLayout width="350" bkcolor="#FFF6F6F6">
 				<VerticalLayout inset="0,0,0,0" vscrollbar="true">
-					<Option name="setting_switch_page_waimai_order" selected="true" text="外卖订单设置" group="setting_switch" align="center" height="69"  padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_waimai_order" selected="true" 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>
-					<Option name="setting_switch_page_diannei_order" text="店内订单设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_diannei_order" 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>
-					<Option name="setting_switch_page_printer" text="收银小票打印设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_printer" 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>
-					<Option name="setting_switch_page_biaoqian_printer" text="标签纸打印设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_biaoqian_printer" 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>
-					<Option name="setting_switch_page_chufang_printer" text="厨房打印设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_chufang_printer" 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>
-					<Option name="setting_switch_page_dianzicheng" text="称重电子秤设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_dianzicheng" 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>
-					<Option name="setting_switch_page_tiaomacheng" text="条码秤设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_tiaomacheng" 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>
-					<Option name="setting_switch_page_ai_recognition" text="AI识别设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_ai_recognition" text="AI识别设置" 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>
-					<Option name="setting_switch_page_xianshi" text="显示设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_xianshi" 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>
-					<Option name="setting_switch_page_tongbu" text="数据同步" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_tongbu" 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>
-					<Option name="setting_switch_page_kuaijiejian" text="快捷键设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_kuaijiejian" 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>
-					<Option name="setting_switch_page_system" text="系统设置" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<Option name="setting_switch_page_system" 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>
-					<Option name="setting_switch_page_system_about" text="关于" group="setting_switch" align="center" height="69" padding="0,0,0,0" selectedimage="file='white_bkg.png'" textcolor="#FF666666" selectedtextcolor="#FF000000" />
+					<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>
@@ -38,55 +38,68 @@
 			</HorizontalLayout>
 
 			<TabLayout name="setting_switch">
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_waimai_tixing.xml" />
 				</VerticalLayout>
 				
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_diannei_tixing.xml" />
 				</VerticalLayout>
 
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15" vscrollbar="true">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_print.xml" />
 				</VerticalLayout>
 				
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15" vscrollbar="true">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_biaoqian_print.xml" />
 				</VerticalLayout>
 
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_chufang_print.xml" />
 				</VerticalLayout>
 				
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_dianzicheng.xml" />
 				</VerticalLayout>
 				
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_tiaomacheng.xml" />
 				</VerticalLayout>
 
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_ai_shibie.xml" />
 				</VerticalLayout>
 				
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_xianshi.xml" />
 				</VerticalLayout>
 				
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_tongbu.xml" />
 				</VerticalLayout>
 				
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_kuaijiejian.xml" />
 				</VerticalLayout>
 
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Include source="setting_system.xml" />
 				</VerticalLayout>
 
-				<VerticalLayout bkcolor="#FFFFFFFF" inset="15,15,15,15">
+				<VerticalLayout bkcolor="#FFFFFFFF" inset="18,0,0,0" vscrollbar="true">
+					<Control height="14" />
 					<Control height="300" />
 					<Label text="智铺子收银系统" align="center">
 					</Label>

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

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44">
-		<Label text="打印机规格" width="260"/>
-		<Combo name="setting_printer_guige" padding="0,9,0,0" width="140" height="26" 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="50" childvalign="vcenter">
+		<Label text="打印机规格" width="275" textcolor="#FF5F6368"/>
+		<Combo name="setting_printer_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>
-	<HorizontalLayout height="44">
-		<Label text="打印联数" width="260"/>
-		<Combo name="setting_printer_lianshu" padding="0,9,0,0" width="140" height="26" 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="50" childvalign="vcenter">
+		<Label text="打印联数" width="275" textcolor="#FF5F6368"/>
+		<Combo name="setting_printer_lianshu" 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="1联" selected="true" />
 			<ListLabelElement text="2联" />
 			<ListLabelElement text="3联" />
 			<ListLabelElement text="4联" />
 		</Combo>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="打印机接口类型" width="260"/>
-		<Combo name="setting_printer_leixing" padding="0,9,0,0" width="140" height="26" 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="50" childvalign="vcenter">
+		<Label text="打印机接口类型" width="275" textcolor="#FF5F6368"/>
+		<Combo name="setting_printer_leixing" 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="智能识别模式" selected="true" />
 			<ListLabelElement text="usb" />
 			<ListLabelElement text="并口" />
@@ -26,68 +26,68 @@
 			<ListLabelElement text="网口" />
 		</Combo>
 	</HorizontalLayout>
-	<HorizontalLayout height="44" name="setting_printer_usb_layout">
-		<Label text="usb打印机端口选择" width="260"/>
-		<Combo name="setting_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的打印机USB端口" 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="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>
 	</HorizontalLayout>
-	<HorizontalLayout height="44" name="setting_printer_chuankou_layout">
-		<Label text="串口端口选择" width="260"/>
-		<Combo name="setting_printer_com" padding="0,9,0,0" width="200" height="26" 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="50" childvalign="vcenter" name="setting_printer_chuankou_layout">
+		<Label text="串口端口选择" width="275" textcolor="#FF5F6368"/>
+		<Combo name="setting_printer_com" width="200" 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" >
 		</Combo>
 	</HorizontalLayout>
-	<HorizontalLayout height="56" name="setting_printer_wangkou_layout">
-		<Label text="网口IP地址" width="260"/>
-		<Edit name="setting_printer_wangkou_ip" width="200" 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="56" name="setting_printer_wangkou_layout" childvalign="vcenter">
+		<Label text="网口IP地址" width="275" textcolor="#FF5F6368"/>
+		<Edit name="setting_printer_wangkou_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_printer_wangkouk_save_btn" align="center" width="100" height="38" padding="20,8,0,3" text="保存" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+		<Button name="setting_printer_wangkouk_save_btn" 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="44" padding="0,20,0,0">
-		<Label text="收银小票格式设置" width="260" />
+		<Label text="收银小票格式设置" width="275" font="115" textcolor="#FF1F2329"/>
 	</HorizontalLayout>
-	<Control height="1" bkcolor="#FF708090" />
-	<HorizontalLayout height="44" visible="false">
-		<Label text="取货方式大号字体" width="260" />
-		<CheckBox name="setting_printer_quhuo_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+	<Control height="1" bkcolor="#FFF0F1F3" />
+	<HorizontalLayout height="50" childvalign="vcenter" visible="false">
+		<Label text="取货方式大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_quhuo_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="订单号大号字体" width="260" />
-		<CheckBox name="setting_printer_dingdanhao_big" 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">
+		<Label text="订单号大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_dingdanhao_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="下单时间大号字体" width="260" />
-		<CheckBox name="setting_printer_xiadanshijian_big" 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">
+		<Label text="下单时间大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_xiadanshijian_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44" visible="false">
-		<Label text="配送（自取）时间大号字体" width="260" />
-		<CheckBox name="setting_printer_peisongshijian_big" 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" visible="false">
+		<Label text="配送（自取）时间大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_peisongshijian_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="姓名大号字体" width="260" />
-		<CheckBox name="setting_printer_name_big" 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">
+		<Label text="姓名大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_name_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="电话大号字体" width="260" />
-		<CheckBox name="setting_printer_phone_big" 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">
+		<Label text="电话大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_phone_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="地址大号字体" width="260" />
-		<CheckBox name="setting_printer_address_big" 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">
+		<Label text="地址大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_address_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="商品大号字体" width="260" />
-		<CheckBox name="setting_printer_shangpin_big" 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">
+		<Label text="商品大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_shangpin_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="备注大号字体" width="260" />
-		<CheckBox name="setting_printer_memo_big" 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">
+		<Label text="备注大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_memo_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="价格大号字体" width="260" />
-		<CheckBox name="setting_printer_price_big" 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">
+		<Label text="价格大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_price_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="付款方式大号字体" width="260" />
-		<CheckBox name="setting_printer_pay_big" 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">
+		<Label text="付款方式大号字体" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_printer_pay_big" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 </Window>

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

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44">
-		<Label text="开机自动启动" width="260" />
-		<CheckBox name="setting_is_auto_start" 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">
+		<Label text="开机自动启动" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_auto_start" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="启动时自动登录" width="260" />
-		<CheckBox name="setting_is_auto_login" 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">
+		<Label text="启动时自动登录" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_auto_login" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
-	<HorizontalLayout height="44">
-		<Label text="点击关闭时，最小化到系统托盘" width="260" />
-		<CheckBox name="setting_is_close_min" 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">
+		<Label text="点击关闭时，最小化到系统托盘" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_close_min" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 </Window>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44">
-		<Label text="条码秤条码格式" width="260"/>
-		<Combo name="setting_tiaomacheng_geshi" padding="0,9,0,0" width="400" height="26" 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="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】" />
@@ -14,39 +14,39 @@
 		</Combo>
 	</HorizontalLayout>	
 	
-	<HorizontalLayout height="44">
-		<Label text="W：商品PLU编码；E：商品总价；N：商品重量，请根据您当前店内条码秤实际条码格式来选择" width="800"/>
+	<HorizontalLayout height="50" childvalign="vcenter">
+		<Label text="W：商品PLU编码；E：商品总价；N：商品重量，请根据您当前店内条码秤实际条码格式来选择" width="800" textcolor="#FF5F6368"/>
 	</HorizontalLayout>
 
-	<HorizontalLayout height="44">
+	<HorizontalLayout height="50" childvalign="vcenter">
 		<Label text="请正确选择您的条码秤所设置的条码格式类型，收银页面扫码时将按所选择的条码格式进行识别，条码秤设置的格式与这里选择的格式必须完全一致才能正确识别" textcolor="#FF999999" wordbreak="true" width="800"/>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
-	<HorizontalLayout height="44" padding="0,10,0,0">
-		<Label text="条码秤型号" width="260"/>
-		<Combo name="setting_tiaomacheng_xinghao" padding="0,9,0,0" width="140" height="26" 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="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">
-		<Label text="条码秤IP地址" width="260"/>
-		<Edit name="setting_tiaomacheng_ip" width="200" 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="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" padding="20,8,0,3" text="保存" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+		<Button name="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">
-		<Button name="setting_tiaomacheng_tongbushangpin" align="center" width="300" height="44" padding="0,8,0,3" 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 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="44">
+	<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" padding="0,20,0,0">
+	<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>

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

@@ -3,19 +3,19 @@
 	<VerticalLayout>
 		<Control height="300"></Control>
 		
-		<HorizontalLayout height="55" padding="0,0,0,0">
+		<HorizontalLayout height="55" childvalign="vcenter" padding="0,0,0,0">
 			<Control></Control>
 			<Button name="setting_tongbu_btn" text="同步云端数据" width="500" height="55" textcolor="#FFFFFFFF"></Button>
 			<Control></Control>
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="55" padding="0,20,0,0">
+		<HorizontalLayout height="55" childvalign="vcenter" padding="0,20,0,0">
 			<Control></Control>
 			<Label text="点击以上按钮，同步云端最新商品数据、店铺设置到本地" width="500" align="center"></Label>
 			<Control></Control>
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="55" padding="0,20,0,0">
+		<HorizontalLayout height="55" childvalign="vcenter" padding="0,20,0,0">
 			<Control></Control>
 			<Label text="" name="setting_tongbu_result" visiable="false" width="500" align="center" textcolor="#FFFF0000"></Label>
 			<Control></Control>

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="44">
-		<Label text="新订单自动接单" width="260"/>
-		<CheckBox name="setting_is_new_waimai_autoconfirm" 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">
+		<Label text="新订单自动接单" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_waimai_autoconfirm" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
-	<HorizontalLayout height="44">
-		<Label text="新订单语音通知" width="260" />
-		<CheckBox name="setting_is_new_waimai_voice" 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">
+		<Label text="新订单语音通知" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_waimai_voice" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
+	<Control height="1" bkcolor="#FFF0F1F3" padding="0,20,0,0"></Control>
 	
-	<HorizontalLayout height="44">
-		<Label text="新订单自动打印收银小票" width="260" />
-		<CheckBox name="setting_is_new_waimai_printer" 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">
+		<Label text="新订单自动打印收银小票" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_waimai_printer" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<HorizontalLayout height="44">
-		<Label text="新订单自动打印标签纸" width="260" />
-		<CheckBox name="setting_is_new_waimai_biaoqian_printer" 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">
+		<Label text="新订单自动打印标签纸" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_waimai_biaoqian_printer" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 	
-	<HorizontalLayout height="44">
-		<Label text="新订单自动厨房打印" width="260" />
-		<CheckBox name="setting_is_new_waimai_chufang_printer" 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">
+		<Label text="新订单自动厨房打印" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="setting_is_new_waimai_chufang_printer" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 	</HorizontalLayout>
 </Window>

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

@@ -1,34 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<HorizontalLayout height="30" padding="0,15,0,0">
-		<Label text="商品显示风格" width="180"/>
-		<HorizontalLayout padding="30,0,30,0" width="90" height="30">
-			<CheckBox name="xianshi_setting_youtu" group="setting_xianshi_type" selected="true" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="xianshi_setting_youtu_name" text="有图模式一" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
-		<HorizontalLayout padding="30,0,30,0" width="90" height="30">
-			<CheckBox name="xianshi_setting_youtu_2" group="setting_xianshi_type" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="xianshi_setting_youtu_2_name" text="有图模式二" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
-		<HorizontalLayout padding="30,0,30,0" width="90" height="30">
-			<CheckBox name="xianshi_setting_youtu_3" group="setting_xianshi_type" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="xianshi_setting_youtu_3_name" text="有图模式三	" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
-		<HorizontalLayout padding="30,0,30,0" width="90" height="30">
-			<CheckBox name="xianshi_setting_wutu" group="setting_xianshi_type" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="xianshi_setting_wutu_name" text="无图模式" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
+	<HorizontalLayout height="44">
+		<Label text="商品显示" width="275" font="115" textcolor="#FF1F2329"/>
 	</HorizontalLayout>
+	<Control height="1" bkcolor="#FFF0F1F3"></Control>
 
-	<HorizontalLayout height="30" padding="0,15,0,0">
-		<Label text="触摸键盘" width="180"/>
-		<HorizontalLayout padding="30,0,30,0" width="120" height="30">
-			<CheckBox name="xianshi_setting_chumo" group="setting_xianshi_chumojianpan_type" selected="true" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="xianshi_setting_chumo_name" text="显示触摸键盘" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
-		<HorizontalLayout padding="30,0,30,0" width="120" height="30">
-			<CheckBox name="xianshi_setting_buchumo" group="setting_xianshi_chumojianpan_type" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-			<Label name="xianshi_setting_buchumo_name" text="不显示触摸键盘" width="300" padding="10,0,0,0"/>
-		</HorizontalLayout>
+	<HorizontalLayout height="50" childvalign="vcenter">
+		<Label text="商品显示风格" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_youtu" group="setting_xianshi_type" selected="true" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_youtu_name" text="有图模式一" width="105" padding="10,0,16,0" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_youtu_2" group="setting_xianshi_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_youtu_2_name" text="有图模式二" width="105" padding="10,0,16,0" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_youtu_3" group="setting_xianshi_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_youtu_3_name" text="有图模式三" width="105" padding="10,0,16,0" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_wutu" group="setting_xianshi_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_wutu_name" text="无图模式" width="105" padding="10,0,0,0" textcolor="#FF5F6368"/>
 	</HorizontalLayout>
-</Window>
+
+	<HorizontalLayout height="44">
+		<Label text="触摸键盘" width="275" font="115" textcolor="#FF1F2329"/>
+	</HorizontalLayout>
+	<Control height="1" bkcolor="#FFF0F1F3"></Control>
+
+	<HorizontalLayout height="50" childvalign="vcenter">
+		<Label text="触摸键盘" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_chumo" group="setting_xianshi_chumojianpan_type" selected="true" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_chumo_name" text="显示触摸键盘" width="105" padding="10,0,16,0" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_buchumo" group="setting_xianshi_chumojianpan_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_buchumo_name" text="不显示触摸键盘" width="105" padding="10,0,0,0" textcolor="#FF5F6368"/>
+	</HorizontalLayout>
+</Window>

zhipuzi_pos_windows/page/CSettingPageUI.cpp

@@ -790,6 +790,15 @@ void CSettingPageUI::InitControl()
 		box->Selected(false, false);
 	}
 
+	//「订单打印按绑定商品分类打印标签」开关：开启时显示「当前绑定商品分类」区，关闭时隐藏
+	{
+		CControlUI* pTypeArea = static_cast<CControlUI*>(this->FindSubControl(_T("setting_biaoqian_printer_type_area")));
+		if (pTypeArea)
+		{
+			pTypeArea->SetVisible(box->IsSelected());
+		}
+	}
+
 	std::string type_ids = CSetting::GetInstance()->GetParam("setting_biaoqian_printer_type_ids");
 	std::vector<std::string> type_vector = CLewaimaiString::Split(type_ids, ",");
 
@@ -1348,6 +1357,13 @@ void CSettingPageUI::HandleClickMsg(TNotifyUI& msg)
 		{
 			CSetting::GetInstance()->SetParam("setting_biaoqian_printer_is_type", "1");
 		}
+
+		//开关切换后联动「当前绑定商品分类」区显隐（CLICK 早于 SELECTCHANGED，此处 IsSelected 为旧态，取反即新态）
+		CControlUI* pTypeArea = static_cast<CControlUI*>(this->FindSubControl(_T("setting_biaoqian_printer_type_area")));
+		if (pTypeArea)
+		{
+			pTypeArea->SetVisible(!box->IsSelected());
+		}
 	}
 	else if (name == L"biaoqian_setting_fenleli_xuanze_checkbox")
 	{