商品展示弄好了

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<Font id="diandan_price" name="微软雅黑" size="18" />
+	<Font id="diandan_price" name="微软雅黑" size="20" />
 	
-	<DiandanFoodItem bkcolor="#FFFFFFFF">
-		<Control name="image" height="100" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" height="50"></Label>
-		<Label name="price" height="50" font="daindan_price" textcolor="#FFFF7F50" align="right"></Label>
+	<DiandanFoodItem bkcolor="#FFFFFFFF" padding="0,0,7,7">
+		<Control name="image" height="135" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
+		<Label name="foodname" width="135" height="40" multiline="true" endellipsis="true"></Label>
+		<Label name="price" height="30" font="daindan_price" textcolor="#FFFF7F50" align="right"></Label>
 	</DiandanFoodItem>
 </Window>

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

@@ -6,22 +6,22 @@
 	
 	<DiandanPage>
 		<HorizontalLayout>
-			<VerticalLayout width="430">
+			<VerticalLayout width="450">
 				<HorizontalLayout>
-					<VerticalLayout bkcolor="#FFFFFFFF" width="300" padding="15,15,0,0">
+					<VerticalLayout bkcolor="#FFFFFFFF" width="320" padding="15,15,0,0">
 						<HorizontalLayout height="70">
 							<Control></Control>
 							<Button name="btn_diandan_cundan" width="70" height="36" padding="0,15,20,0" text="存单" textcolor="#FFFFFFFF" />
 							<Button name="btn_diandan_qudan" width="70" height="36" padding="0,15,20,0" text="取单" textcolor="#FFFFFFFF" />
 						</HorizontalLayout>
 						
-						<Label text="整单备注：" heiht="32" padding="10,10,10,0" bkcolor="#FFDCDCDC"></Label>
+						<Label text="整单备注：" heiht="32" padding="0,10,10,0" bkcolor="#FFDCDCDC"></Label>
 						
 						<List name="list_diandan_cart" padding="0,10,0,0" itemlinecolor="#FF000000" vscrollbar="true">
 							<ListHeader />
-							<ListHeaderItem text="商品" width="160" align="center" />
-							<ListHeaderItem text="数量" width="70" align="center" />
-							<ListHeaderItem text="金额" width="70" align="center" />
+							<ListHeaderItem text="商品" width="180" align="left" />
+							<ListHeaderItem text="数量" width="60" align="left" />
+							<ListHeaderItem text="金额" width="60" align="left" />
 						</List>
 						
 						<Label text="5份 ¥100" font="0" textcolor="#FFFF0000" height="40" align="right" padding="0,10,15,0"></Label>
@@ -50,16 +50,18 @@
 			</VerticalLayout>
 			
 			<VerticalLayout>
-				<HorizontalLayout name="diandan_fenlei_layout" height="56" hscrollbar="true" padding="15,15,15,0">
+				<HorizontalLayout name="diandan_fenlei_layout" height="62" hscrollbar="true" padding="15,15,15,0">
 
 				</HorizontalLayout>
 				
-				<TileLayout name="diandan_foodlist" padding="15,15,15,0" childpadding="1" itemsize="150,200" bkcolor="#FFDEB887" vscrollbar="true" hscrollbar="false">
+				<TileLayout name="diandan_foodlist" padding="15,15,15,0" childpadding="1" itemsize="150,220" vscrollbar="true" hscrollbar="false">
 				
 				</TileLayout>
 				
-				<HorizontalLayout height="100" bkcolor="#FFFFFFFF" padding="15,15,15,15">
-				
+				<HorizontalLayout height="48" padding="15,15,15,15">
+					<Edit name="diandan_food_search_edit" tooltip="请输入商品名字搜索" width="300" height="48" 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="btn_diandan_budabao" width="100" height="48" padding="10,0,10,0" text="搜索商品" textcolor="#FFFFFFFF" />
 				</HorizontalLayout>
 			</VerticalLayout>
 		</HorizontalLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<FoodtypeOption width="120" height="38" padding="0,0,15,0" bkcolor="#FFFFFFFF" selectedtextcolor="FFFF0000">
+	<FoodtypeOption endellipsis="true" align="center" valign="center" width="120" height="44" padding="0,0,15,0" bkcolor="#FFFFFFFF" selectedtextcolor="FFFF0000">
 	</FoodtypeOption>
 </Window>

zhipuzi_pos_windows/control/CDiandanFoodItemUI.cpp

@@ -21,6 +21,14 @@ void CDiandanFoodItemUI::UpdateShow()
 {
 	CControlUI* pImage = static_cast<CControlUI*>(this->FindSubControl(_T("image")));
 
+	//获取本地图片的路径
+	std::wstring imagepath = m_foodinfo.getImageTmpPath();
+	if (CSystem::IsFileExist(imagepath.c_str()))
+	{
+		//图片已经存在，直接显示
+		pImage->SetBkImage(imagepath.c_str());
+	}
+
 	CLabelUI* pName = static_cast<CLabelUI*>(this->FindSubControl(_T("foodname")));
 	pName->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.name).c_str());
 

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -133,18 +133,6 @@ void CDiandanPageUI::RefreshFoodShow()
 	}
 	else
 	{
-		//正常的商品分类
-
-		//设置商品布局的参数
-		//SIZE itemSize;
-		//itemSize.cx = 150;
-		//itemSize.cy = 200;
-
-		//m_foodLayout->SetItemSize(itemSize);
-
-		//m_foodLayout->SetChildPadding(0);
-		//m_foodLayout->SetChildVPadding(30);
-
 		CSqlite3 sqlite;
 		std::vector<CFood> foodlist = sqlite.GetFoodByTypeid(m_cur_type_id);