优化商品控件大小

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

@@ -4,12 +4,12 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
-		<Control name="image" height="155" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" width="155" height="60" multiline="true" endellipsis="true"></Label>
+		<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>
 		
-		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="100,214,150,240" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-		<Label name="chengzhong" visible="false" width="50" height="26" font="1" text="称重" float="true" pos="100,214,150,240" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
-		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,210,155,245" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></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>
 	</DiandanFoodItem>
 </Window>

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

@@ -4,11 +4,11 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
-		<Label name="foodname" width="155" height="60" multiline="true" endellipsis="true"></Label>
+		<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>
 		
-		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="100,59,150,85" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-		<Label name="chengzhong" visible="false" width="50" height="26" font="1" text="称重" float="true" pos="100,59,150,85" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></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>
 	</DiandanFoodItem>
 </Window>

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

@@ -46,7 +46,7 @@
 						
 						<Button name="btn_diandan_dabao" width="90" height="46" padding="10,15,10,0" text="打包" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 						
-						<Button name="btn_diandan_cundan" width="90" height="46" padding="15,50,15,0" text="存单" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
+						<Button name="btn_diandan_cundan" width="90" height="46" padding="10,50,10,0" text="存单" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 						<Button name="btn_diandan_qudan" width="90" height="46" padding="10,15,10,0" text="取单" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 						
 						<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" textcolor="#FFFFFFFF" bkimage="num_bkg.png" float="true" pos="85,490,104,509" bordercolor="#FFFF0000" bordersize="0"></Label>
@@ -94,7 +94,7 @@
 
 				</HorizontalLayout>
 				
-				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="15,15,15,15" childpadding="1" itemsize="170,260" vscrollbar="true" hscrollbar="false">
+				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="15,15,15,15" childpadding="1" itemsize="160,250" vscrollbar="true" hscrollbar="false">
 				
 				</TileLayout>
 				

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

@@ -22,7 +22,7 @@
 			<Label name="guandan_order_zongjia" text="" width="200" height="70"></Label>
 			<Control></Control>
 			<Button name="guadan_order_delete" align="center" width="120" height="45" padding="0,13,0,0" text="删除此单" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Button name="guadan_order_queren" textcolor="#FFFFFFFF" align="center" width="120" height="45" padding="20,13,20,0" text="确认此单" normalimage="file='green_zhengchang.png' corner='5,5,5,5'" hotimage="file='green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='green_dianji.png' corner='5,5,5,5'" />
+			<Button name="guadan_order_queren" textcolor="#FFFFFFFF" align="center" width="120" height="45" padding="20,13,20,0" text="取出此单" normalimage="file='green_zhengchang.png' corner='5,5,5,5'" hotimage="file='green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='green_dianji.png' corner='5,5,5,5'" />
 		</HorizontalLayout>
 	</VerticalLayout>
 </Window>

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

@@ -4,10 +4,10 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<ShangpinFoodItem name="shangpin_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
-		<Control name="image" height="155" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" width="155" height="60" multiline="true" endellipsis="true"></Label>
+		<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>
-				
-		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,210,155,245" textcolor="#FFFFFFFF" bkcolor="#FF696969" 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>
 	</ShangpinFoodItem>
 </Window>

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

@@ -4,7 +4,7 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<ShangpinFoodItem name="shangpin_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
-		<Label name="foodname" width="155" height="60" multiline="true" endellipsis="true"></Label>
+		<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>
 			
 		<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>

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

@@ -33,7 +33,7 @@
 				</HorizontalLayout>
 				
 				
-				<TileLayout name="shangpin_foodlist" padding="0,0,0,0" inset="15,15,15,15" childpadding="1" itemsize="170,260" vscrollbar="true" hscrollbar="false">
+				<TileLayout name="shangpin_foodlist" padding="0,0,0,0" inset="15,15,15,15" childpadding="1" itemsize="160,250" vscrollbar="true" hscrollbar="false">
 				
 				</TileLayout>
 				

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -233,8 +233,8 @@ void CDiandanPageUI::InitFoodShow()
 	if (is_youtu)
 	{
 		SIZE itemsize;
-		itemsize.cx = 170;
-		itemsize.cy = 260;
+		itemsize.cx = 160;
+		itemsize.cy = 250;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem.xml");
@@ -242,7 +242,7 @@ void CDiandanPageUI::InitFoodShow()
 	else
 	{
 		SIZE itemsize;
-		itemsize.cx = 170;
+		itemsize.cx = 160;
 		itemsize.cy = 105;
 		m_foodLayout->SetItemSize(itemsize);
 

zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -172,8 +172,8 @@ void CShangpinPageUI::InitFoodShow()
 	if (is_youtu)
 	{
 		SIZE itemsize;
-		itemsize.cx = 170;
-		itemsize.cy = 260;
+		itemsize.cx = 160;
+		itemsize.cy = 250;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("shangpin_fooditem.xml");
@@ -181,7 +181,7 @@ void CShangpinPageUI::InitFoodShow()
 	else
 	{
 		SIZE itemsize;
-		itemsize.cx = 170;
+		itemsize.cx = 160;
 		itemsize.cy = 105;
 		m_foodLayout->SetItemSize(itemsize);