1

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

@@ -3,13 +3,14 @@
 	<Font id="diandan_price" name="微软雅黑" size="18" />
 	<Font id="1" name="微软雅黑" size="14" />
 	
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
-		<Control name="image" height="145" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" width="145" height="60" multiline="true" endellipsis="true"></Label>
-		<Label name="price" height="30" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
+	<!-- 宽度130，高度90，图片高度也是130-->
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,5,5">
+		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
+		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
+		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
 		
-		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="90,204,140,230" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-		<Label name="chengzhong" visible="false" width="50" height="26" font="1" text="称重" float="true" pos="90,204,140,230" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
-		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,210,145,235" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="80,194,130,220" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
+		<Label name="chengzhong" visible="false" width="50" height="26" font="1" text="称重" float="true" pos="80,194,130,220" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
+		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,185,130,220" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
 	</DiandanFoodItem>
 </Window>

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

@@ -3,12 +3,13 @@
 	<Font id="diandan_price" name="微软雅黑" size="18" />
 	<Font id="1" name="微软雅黑" size="14" />
 	
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
-		<Label name="foodname" width="145" height="60" multiline="true" endellipsis="true"></Label>
-		<Label name="price" height="30" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
+	<!-- 宽度130，高度90-->
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,5,5">
+		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
+		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
 		
-		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="90,59,140,85" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-		<Label name="chengzhong" visible="false" width="50" height="26" font="1" text="称重" float="true" pos="90,59,140,85" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
-		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,55,155,90" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="80,64,130,90" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
+		<Label name="chengzhong" visible="false" width="50" height="26" font="1" text="称重" float="true" pos="80,64,130,90" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
+		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,55,130,90" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
 	</DiandanFoodItem>
 </Window>

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

@@ -39,29 +39,29 @@
 					<Control width="1" bkcolor="#FFEBE8E8"></Control>
 					
 					<VerticalLayout width="110" padding="0,0,0,0" vscrollbar="true">
-						<Button name="btn_diandan_jia" width="90" height="40" padding="10,50,10,0" text="+" font="24" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-						<Button name="btn_diandan_jian" width="90" height="40" padding="10,15,10,0" text="-" font="24" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-						<Button name="btn_diandan_shanchu" width="90" height="40" padding="10,15,10,0" text="删除" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-						<Button name="btn_diandan_guige" width="90" height="40" padding="10,30,10,0" text="规格/做法" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_jia" width="90" height="40" padding="10,30,10,0" text="+" font="24" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_jian" width="90" height="40" padding="10,10,10,0" text="-" font="24" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_shanchu" width="90" height="40" padding="10,10,10,0" text="删除" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_guige" width="90" height="40" padding="10,10,10,0" text="规格/做法" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						
-						<Button name="btn_diandan_dabao" width="90" height="40" padding="10,15,10,0" text="打包" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_dabao" width="90" height="40" padding="10,10,10,0" text="打包" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						
-						<Button name="btn_diandan_cundan" width="90" height="40" padding="10,50,10,0" text="存单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-						<Button name="btn_diandan_qudan" width="90" height="40" padding="10,15,10,0" text="取单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_cundan" width="90" height="40" padding="10,10,10,0" text="存单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_qudan" width="90" height="40" padding="10,10,10,0" text="取单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						
-						<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" textcolor="#FFFFFFFF" bkimage="num_bkg.png" float="true" pos="85,430,104,449" bordercolor="#FFFF0000" bordersize="0"></Label>
+						<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" textcolor="#FFFFFFFF" bkimage="num_bkg.png" float="true" pos="85,255,104,274" bordercolor="#FFFF0000" bordersize="0"></Label>
 						
-						<Button name="btn_diandan_zhengdanbeizhu" width="90" height="40" padding="10,15,10,0" text="整单备注" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_zhengdanbeizhu" width="90" height="40" padding="10,10,10,0" text="整单备注" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						
-						<Button name="btn_diandan_qianxiang" width="90" height="40" padding="10,50,10,30" text="打开钱箱" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_qianxiang" width="90" height="40" padding="10,10,10,30" text="打开钱箱" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 					</VerticalLayout>
 				</HorizontalLayout>
 				
 				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 				
-				<VerticalLayout height="165" bkcolor="#FFFFFFFF">
-					<HorizontalLayout height="70">
-						<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,24,0,0"></Label>
+				<VerticalLayout height="145" bkcolor="#FFFFFFFF">
+					<HorizontalLayout height="50">
+						<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,14,0,0"></Label>
 						<Label name="diandan_page_totalprice" text="总价：¥0.00" font="22" textcolor="#FFFF0000" width="200" align="right" padding="0,0,15,0"></Label>
 					</HorizontalLayout>
 					
@@ -96,7 +96,7 @@
 					</HorizontalLayout>
 				</VerticalLayout>
 				
-				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="15,15,15,15" childpadding="1" itemsize="160,250" vscrollbar="true" hscrollbar="false">
+				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="1" vscrollbar="true" hscrollbar="false">
 				
 				</TileLayout>
 				

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

@@ -37,16 +37,16 @@
 		</HorizontalLayout>
 		
 		<HorizontalLayout>
-			<VerticalLayout width="101" bkcolor="#FFEDEDED">				
+			<VerticalLayout width="91" bkcolor="#FFEDEDED">				
 				<VerticalLayout name="main_gongneng_daohang_layout" inset="0,15,0,20" vscrollbar="true">
 
 				</VerticalLayout>
 				
 				<Control height="1" bkcolor="#FFD1D1D1" padding="0,0,0,0"></Control>
-				<HorizontalLayout height="100">
-					<Button name="main_web_login_btn" width="100" height="100" normalimage="" hotimage="" pushedimage="" bordersize="0"></Button>
-					<Control bkimage="web_login.png" width="50" height="50" float="true" pos="25,15,75,65" mouse="false"></Control>
-					<Label text="进入后台" float="true" pos="18,65,88,85" mouse="false"></Label>
+				<HorizontalLayout height="90">
+					<Button name="main_web_login_btn" width="90" height="90" normalimage="" hotimage="" pushedimage="" bordersize="0"></Button>
+					<Control bkimage="web_login.png" width="50" height="50" float="true" pos="18,15,68,65" mouse="false"></Control>
+					<Label text="进入后台" float="true" pos="13,60,88,85" mouse="false"></Label>
 				</HorizontalLayout>
 			</VerticalLayout>
 			

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -244,8 +244,8 @@ void CDiandanPageUI::InitFoodShow()
 	if (is_youtu)
 	{
 		SIZE itemsize;
-		itemsize.cx = 160;
-		itemsize.cy = 250;
+		itemsize.cx = 140;
+		itemsize.cy = 230;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem.xml");
@@ -253,8 +253,8 @@ void CDiandanPageUI::InitFoodShow()
 	else
 	{
 		SIZE itemsize;
-		itemsize.cx = 160;
-		itemsize.cy = 105;
+		itemsize.cx = 140;
+		itemsize.cy = 100;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_wutu.xml");

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -986,12 +986,12 @@ void CMainWnd::UpdateGongnengDaohang()
 
 		//公共属性
 		newOption->SetGroup(L"main_tab");
-		newOption->SetFixedWidth(101);
-		newOption->SetFixedHeight(102);
+		newOption->SetFixedWidth(91);
+		newOption->SetFixedHeight(92);
 
 		RECT padding;
 		padding.left = 0;
-		padding.top = 60;
+		padding.top = 55;
 		padding.right = 0;
 		padding.bottom = 0;
 		newOption->SetTextPadding(padding);
@@ -1006,96 +1006,96 @@ void CMainWnd::UpdateGongnengDaohang()
 			newOption->SetName(L"main_diandan");
 			newOption->SetText(L"点单");
 
-			newOption->SetNormalImage(L"file='main_diandan.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_diandan_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_diandan.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_diandan_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "dingdan")
 		{
 			newOption->SetName(L"main_dingdan");
 			newOption->SetText(L"订单");
 
-			newOption->SetNormalImage(L"file='main_dingdan.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_dingdan_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_dingdan.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_dingdan_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "huiyuan")
 		{
 			newOption->SetName(L"main_huiyuan");
 			newOption->SetText(L"会员");
 
-			newOption->SetNormalImage(L"file='main_huiyuan.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_huiyuan_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_huiyuan.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_huiyuan_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "baobiao")
 		{
 			newOption->SetName(L"main_baobiao");
 			newOption->SetText(L"报表");
 
-			newOption->SetNormalImage(L"file='main_baobiao.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_baobiao_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_baobiao.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_baobiao_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "jiaoban")
 		{
 			newOption->SetName(L"main_jiaoban");
 			newOption->SetText(L"交班");
 
-			newOption->SetNormalImage(L"file='main_jiaoban.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_jiaoban_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_jiaoban.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_jiaoban_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "setting")
 		{
 			newOption->SetName(L"main_setting");
 			newOption->SetText(L"设置");
 
-			newOption->SetNormalImage(L"file='main_setting.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_setting_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_setting.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_setting_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "shangpin")
 		{
 			newOption->SetName(L"main_shangpin");
 			newOption->SetText(L"商品");
 
-			newOption->SetNormalImage(L"file='main_shangpin.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_shangpin_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_shangpin.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_shangpin_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "kucun")
 		{
 			newOption->SetName(L"main_kucun");
 			newOption->SetText(L"库存");
 
-			newOption->SetNormalImage(L"file='main_kucun.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_kucun_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_kucun.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_kucun_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "caigou")
 		{
 			newOption->SetName(L"main_caigou");
 			newOption->SetText(L"采购");
 
-			newOption->SetNormalImage(L"file='main_caigou.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_caigou_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_caigou.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_caigou_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "zhengcan")
 		{
 			newOption->SetName(L"main_zhengcan");
 			newOption->SetText(L"桌台");
 
-			newOption->SetNormalImage(L"file='main_zhengcan.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_zhengcan_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_zhengcan.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_zhengcan_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "saomashouyin")
 		{
 			newOption->SetName(L"main_saomashouyin");
 			newOption->SetText(L"收银");
 
-			newOption->SetNormalImage(L"file='main_saomashouyin.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_saomashouyin_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_saomashouyin.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_saomashouyin_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 		else if (curName == "shoukuan")
 		{
 			newOption->SetName(L"main_shoukuan");
 			newOption->SetText(L"收款");
 
-			newOption->SetNormalImage(L"file='main_shoukuan.png' source='0,0,50,50' dest='25,13,75,63'");
-			newOption->SetSelectedImage(L"file='main_shoukuan_select.png' source='0,0,50,50' dest='25,13,75,63'");
+			newOption->SetNormalImage(L"file='main_shoukuan.png' source='0,0,50,50' dest='18,13,75,63'");
+			newOption->SetSelectedImage(L"file='main_shoukuan_select.png' source='0,0,50,50' dest='18,13,75,63'");
 		}
 
 		layout->Add(newOption);
@@ -1122,8 +1122,8 @@ void CMainWnd::UpdateGongnengDaohang()
 	newOption->SetName(L"main_gengduo");
 	newOption->SetText(L"更多");
 
-	newOption->SetNormalImage(L"file='main_gengduo.png' source='0,0,50,50' dest='25,13,75,63'");
-	newOption->SetSelectedImage(L"file='main_gengduo_select.png' source='0,0,50,50' dest='25,13,75,63'");
+	newOption->SetNormalImage(L"file='main_gengduo.png' source='0,0,50,50' dest='18,13,75,63'");
+	newOption->SetSelectedImage(L"file='main_gengduo_select.png' source='0,0,50,50' dest='18,13,75,63'");
 
 	layout->Add(newOption);