优化完商品显示

DuiLib/DuiLib.vcxproj

@@ -79,7 +79,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DisableSpecificWarnings>4099;4091;4302</DisableSpecificWarnings>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>Default</LanguageStandard_C>
     </ClCompile>
     <ResourceCompile>
@@ -125,7 +125,7 @@ copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib.
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4099;4091;4302</DisableSpecificWarnings>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>Default</LanguageStandard_C>
     </ClCompile>
     <ResourceCompile>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Window>
-	<Font id="diandan_price" name="微软雅黑" size="18" />
-	<Font id="1" name="微软雅黑" size="14" />
-	
-	<!-- 宽度130，高度90，图片高度也是130-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="220">
-		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" width="130" height="64" wordbreak="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="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

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window>
-	<Font id="diandan_price" name="微软雅黑" size="18" />
-	<Font id="1" name="微软雅黑" size="14" />
-	
+<Window>	
 	<!-- 宽度130，高度90-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="90">
-		<Label name="foodname" width="130" height="64" wordbreak="true" endellipsis="true"></Label>
-		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="140" height="100">
+		<Label name="foodname" width="140" height="50" padding="5,26,5,0" font="18" wordbreak="true" endellipsis="true" align="center"></Label>
+		<Label name="price" width="140" height="24" font="16" textcolor="#FFFF7F50" 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>
+		<Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
+		<Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
+		<Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
 	</DiandanFoodItem>
 </Window>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>	
+	<!-- 宽度130，高度90，图片高度也是130-->
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="200">
+		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
+
+		<Label name="foodname" width="130" height="44" font="16" wordbreak="true" endellipsis="true"></Label>
+		<Label name="price" height="26" font="16" textcolor="#FFFF7F50" align="left"></Label>
+		
+		<Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
+		<Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
+		<Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+	</DiandanFoodItem>
+</Window>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>	
+	<!-- 宽度130，高度90，图片高度也是130-->
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="230" height="90">
+        <HorizontalLayout width="230" height="90" bkcolor="#FFFFFFFF" padding="0,0,0,0">
+            <Control name="image" width="90" height="90" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
+            
+            <VerticalLayout width="130" height="90" padding="5,0,5,0">
+                <Label name="foodname" width="130" height="60" font="16" wordbreak="true" endellipsis="true"></Label>
+                <Label name="price" width="130" height="30" font="16" textcolor="#FFFF7F50" align="left"></Label>
+            </VerticalLayout>
+
+            <Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
+            <Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
+            <Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+        </HorizontalLayout>
+	</DiandanFoodItem>
+</Window>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>	
+	<!-- 宽度130，高度90，图片高度也是130-->
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="140" height="120">
+		<Control name="image" height="120" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
+
+		<VerticalLayout name="diandan_fooditem_name_layout" width="140" height="44" float="true" pos="0,76,140,120" bkcolor="#C0FFFFFF" padding="5,0,5,0">
+			<Label name="foodname" width="140" height="22" font="16" wordbreak="true" endellipsis="true"></Label>
+			<Label name="price" height="22" font="16" textcolor="#FFFF7F50" align="left"></Label>
+		</VerticalLayout>
+		
+		<Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
+		<Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
+		<Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+	</DiandanFoodItem>
+</Window>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="1366,768" sizebox="4,4,6,6" caption="0,0,0,90" mininfo="1366,768" roundcorner="5,5" showdirty="false" shadowsize="3" showshadow="true">
-	<Font shared="true" id="12" name="微软雅黑" size="16" />
+	<Font shared="true" id="12" name="微软雅黑" size="12" />
 	<Font shared="true" id="14" name="微软雅黑" size="14" default="true" />
 	<Font shared="true" id="16" name="微软雅黑" size="16" />
 	<Font shared="true" id="18" name="微软雅黑" size="18" />

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Window>
-	<Font id="shangpin_price" name="微软雅黑" size="18" />
-	<Font id="1" name="微软雅黑" size="14" />
-	
-	<ShangpinFoodItem name="shangpin_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="220">
-		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" width="130" height="64" wordbreak="true" endellipsis="true"></Label>
-		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></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>
-	</ShangpinFoodItem>
-</Window>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Window>
-	<Font id="shangpin_price" name="微软雅黑" size="18" />
-	<Font id="1" name="微软雅黑" size="14" />
-	
-	<ShangpinFoodItem name="shangpin_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="90">
-		<Label name="foodname" width="130" height="64" wordbreak="true" endellipsis="true"></Label>
-		<Label name="price" height="26" 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,130,90" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
-	</ShangpinFoodItem>
-</Window>

zhipuzi_pos_windows/control/CDiandanFoodItemUI.cpp

@@ -70,7 +70,7 @@ void CDiandanFoodItemUI::UpdateShow()
 {
 	if (m_is_taocan)
 	{
-		if (m_is_youtu)
+		if (m_youtu_model == "1" || m_youtu_model == "2" || m_youtu_model == "3")
 		{
 			CControlUI* pImage = static_cast<CControlUI*>(this->FindSubControl(_T("image")));
 
@@ -98,7 +98,7 @@ void CDiandanFoodItemUI::UpdateShow()
 	}
 	else
 	{
-		if (m_is_youtu)
+		if (m_youtu_model == "1" || m_youtu_model == "2" || m_youtu_model == "3")
 		{
 			CControlUI* pImage = static_cast<CControlUI*>(this->FindSubControl(_T("image")));
 
@@ -149,7 +149,7 @@ void CDiandanFoodItemUI::UpdateShow()
 	}
 }
 
-void CDiandanFoodItemUI::SetYoutuModel(bool is_youtu)
+void CDiandanFoodItemUI::SetYoutuModel(std::string youtu_model)
 {
-	m_is_youtu = is_youtu;
+	m_youtu_model = youtu_model;
 }

zhipuzi_pos_windows/control/CDiandanFoodItemUI.h

@@ -28,7 +28,7 @@ public:
 	//刷新显示
 	void UpdateShow();
 
-	void SetYoutuModel(bool is_youtu);
+	void SetYoutuModel(std::string youtu_model);
 
 private:
 	CFood m_foodinfo;
@@ -37,6 +37,6 @@ private:
 	bool m_is_taocan = false;
 
 	//默认有图模式
-	bool m_is_youtu = true;
+	std::string m_youtu_model = "1";
 };
 

zhipuzi_pos_windows/control/CShangpinFoodItemUI.cpp

@@ -1,86 +0,0 @@
-#include "CShangpinFoodItemUI.h"
-
-#include "../pch/pch.h"
-
-CShangpinFoodItemUI::CShangpinFoodItemUI()
-{
-
-}
-
-
-CShangpinFoodItemUI::~CShangpinFoodItemUI()
-{
-}
-
-void CShangpinFoodItemUI::DoEvent(TEventUI& event)
-{
-	if (event.Type == UIEVENT_BUTTONUP)
-	{
-		m_pManager->SendNotify(this, DUI_MSGTYPE_CLICK);
-	}
-	else if (event.Type == UIEVENT_MOUSEENTER)
-	{
-		HCURSOR hcur = LoadCursor(NULL, IDC_HAND);  //加载系统自带鼠标样式
-		HWND hwnd = m_pManager->GetPaintWindow(); // 获取绘图窗口句柄
-		//SetClassLong(hwnd, GCL_HCURSOR, (long)hcur);
-	}
-	else if (event.Type == UIEVENT_MOUSELEAVE)
-	{
-		HCURSOR hcur = LoadCursor(NULL, IDC_ARROW);  //加载系统自带鼠标样式
-		HWND hwnd = m_pManager->GetPaintWindow(); // 获取绘图窗口句柄
-		//SetClassLong(hwnd, GCL_HCURSOR, (long)hcur);
-	}
-
-	CVerticalLayoutUI::DoEvent(event);
-}
-
-void CShangpinFoodItemUI::SetFoodInfo(CFood info)
-{
-	m_foodinfo = info;
-}
-
-CFood CShangpinFoodItemUI::GetFoodInfo()
-{
-	return m_foodinfo;
-}
-
-void CShangpinFoodItemUI::UpdateShow()
-{
-	if (m_is_youtu)
-	{
-		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());
-
-	CLabelUI* pPrice = static_cast<CLabelUI*>(this->FindSubControl(_T("price")));
-
-	std::wstring price = L"¥" + CLewaimaiString::UTF8ToUnicode(m_foodinfo.price);
-	if (m_foodinfo.is_nature == "1")
-	{
-		price += L"起";
-	}
-
-	pPrice->SetText(price.c_str());
-
-	if (m_foodinfo.stockvalid == "1" && atof(m_foodinfo.stock.c_str()) < 0.001)
-	{
-		//库存为0了
-		CLabelUI* pKucun = static_cast<CLabelUI*>(this->FindSubControl(_T("kucun")));
-		pKucun->SetVisible(true);
-	}
-}
-
-void CShangpinFoodItemUI::SetYoutuModel(bool is_youtu)
-{
-	m_is_youtu = is_youtu;
-}

zhipuzi_pos_windows/control/CShangpinFoodItemUI.h

@@ -1,34 +0,0 @@
-#pragma once
-
-#include "../pch/pch.h"
-
-#include "../zhipuzi/CFood.h"
-#include "../zhipuzi/CFoodpackage.h"
-
-
-/**
- * 商品和商品套餐的ITEM，都用这个
- */
-class CShangpinFoodItemUI : public CVerticalLayoutUI
-{
-public:
-	CShangpinFoodItemUI();
-	~CShangpinFoodItemUI();
-
-	void DoEvent(TEventUI& event);
-
-	void SetFoodInfo(CFood info);
-
-	CFood GetFoodInfo();
-
-	//刷新显示
-	void UpdateShow();
-
-	void SetYoutuModel(bool is_youtu);
-
-private:
-	CFood m_foodinfo;
-
-	//默认有图模式
-	bool m_is_youtu = true;
-};

zhipuzi_pos_windows/control/ControlEx.h

@@ -32,7 +32,6 @@
 #include "CDiandanFoodItemUI.h"
 #include "CFoodtypeOptionUI.h"
 #include "CDiandanNatureItemUI.h"
-#include "CShangpinFoodItemUI.h"
 #include "CTabletypeOptionUI.h"
 #include "CZhengcanTableItemUI.h"
 #include "CZhengcanOrderItemUI.h"
@@ -164,10 +163,6 @@ public:
 		{
 			return new CDiandanNatureItemUI;
 		}
-		else if (_tcscmp(pstrClass, _T("ShangpinFoodItem")) == 0)
-		{
-			return new CShangpinFoodItemUI;
-		}
 		else if (_tcscmp(pstrClass, _T("TabletypeOption")) == 0)
 		{
 			return new CTabletypeOptionUI;

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -290,37 +290,47 @@ void CDiandanPageUI::UpdateFoodtypePos()
 
 void CDiandanPageUI::InitFoodShow()
 {	
-	bool is_youtu;
-	if (CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu") == "1")
-	{
-		is_youtu = true;
-	}
-	else
-	{
-		is_youtu = false;
-	}
+	std::string setting_xianshi_is_youtu = CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu");
 
 	m_foodLayout = static_cast<CTileLayoutUI*>(this->FindSubControl(_T("diandan_foodlist")));
 	m_foodLayout->RemoveAll();
 
 	std::wstring xml_name;
 
-	if (is_youtu)
+	if (setting_xianshi_is_youtu == "1")
 	{
 		SIZE itemsize;
 		itemsize.cx = 130;
-		itemsize.cy = 220;
+		itemsize.cy = 200;
 		m_foodLayout->SetItemSize(itemsize);
 
-		xml_name = _T("diandan_fooditem.xml");
+		xml_name = _T("diandan_fooditem_youtu.xml");
 	}
-	else
+	else if (setting_xianshi_is_youtu == "2")
 	{
 		SIZE itemsize;
-		itemsize.cx = 130;
+		itemsize.cx = 230;
 		itemsize.cy = 90;
 		m_foodLayout->SetItemSize(itemsize);
 
+		xml_name = _T("diandan_fooditem_youtu_2.xml");
+	}
+	else if (setting_xianshi_is_youtu == "3")
+	{
+		SIZE itemsize;
+		itemsize.cx = 140;
+		itemsize.cy = 120;
+		m_foodLayout->SetItemSize(itemsize);
+
+		xml_name = _T("diandan_fooditem_youtu_3.xml");
+	}
+	else
+	{
+		SIZE itemsize;
+		itemsize.cx = 140;
+		itemsize.cy = 100;
+		m_foodLayout->SetItemSize(itemsize);
+
 		xml_name = _T("diandan_fooditem_wutu.xml");
 	}
 
@@ -350,7 +360,7 @@ void CDiandanPageUI::InitFoodShow()
 
 			CDiandanFoodItemUI * pItem = static_cast<CDiandanFoodItemUI *>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-			pItem->SetYoutuModel(is_youtu);
+			pItem->SetYoutuModel(setting_xianshi_is_youtu);
 			pItem->SetFoodInfo(food);
 			pItem->UpdateShow();
 
@@ -372,7 +382,7 @@ void CDiandanPageUI::InitFoodShow()
 
 			CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-			pItem->SetYoutuModel(is_youtu);
+			pItem->SetYoutuModel(setting_xianshi_is_youtu);
 			pItem->SetFoodpackageInfo(food);
 			pItem->UpdateShow();
 
@@ -396,7 +406,7 @@ void CDiandanPageUI::InitFoodShow()
 
 				CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-				pItem->SetYoutuModel(is_youtu);
+				pItem->SetYoutuModel(setting_xianshi_is_youtu);
 				pItem->SetFoodInfo(food);
 				pItem->UpdateShow();
 
@@ -418,7 +428,7 @@ void CDiandanPageUI::InitFoodShow()
 
 				CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-				pItem->SetYoutuModel(is_youtu);
+				pItem->SetYoutuModel(setting_xianshi_is_youtu);
 				pItem->SetFoodInfo(food);
 				pItem->UpdateShow();
 
@@ -441,7 +451,7 @@ void CDiandanPageUI::InitFoodShow()
 
 			CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-			pItem->SetYoutuModel(is_youtu);
+			pItem->SetYoutuModel(setting_xianshi_is_youtu);
 			pItem->SetFoodInfo(food);
 			pItem->UpdateShow();
 

zhipuzi_pos_windows/page/CSettingPageUI.cpp

@@ -967,15 +967,35 @@ void CSettingPageUI::InitControl()
 
 	//初始化展示设置
 	CCheckBoxUI* box_youtu = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_youtu")));
+	CCheckBoxUI* box_youtu_2 = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_youtu_2")));
+	CCheckBoxUI* box_youtu_3 = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_youtu_3")));
 	CCheckBoxUI* box_wutu = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_wutu")));
 	if (CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu") == "1")
 	{
 		box_youtu->Selected(true, false);
+		box_youtu_2->Selected(false, false);
+		box_youtu_3->Selected(false, false);
+		box_wutu->Selected(false, false);
+	}
+	else if (CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu") == "2")
+	{
+		box_youtu->Selected(false, false);
+		box_youtu_2->Selected(true, false);
+		box_youtu_3->Selected(false, false);
+		box_wutu->Selected(false, false);
+	}
+	else if (CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu") == "3")
+	{
+		box_youtu->Selected(false, false);
+		box_youtu_2->Selected(false, false);
+		box_youtu_3->Selected(true, false);
 		box_wutu->Selected(false, false);
 	}
 	else
 	{
 		box_youtu->Selected(false, false);
+		box_youtu_2->Selected(false, false);
+		box_youtu_3->Selected(false, false);
 		box_wutu->Selected(true, false);
 	}
 	
@@ -1740,6 +1760,14 @@ void CSettingPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 	{
 		CSetting::GetInstance()->SetParam("setting_xianshi_is_youtu", "1");
 	}
+	else if (name == _T("xianshi_setting_youtu_2"))
+	{
+		CSetting::GetInstance()->SetParam("setting_xianshi_is_youtu", "2");
+	}
+	else if (name == _T("xianshi_setting_youtu_3"))
+	{
+		CSetting::GetInstance()->SetParam("setting_xianshi_is_youtu", "3");
+	}
 	else if (name == _T("xianshi_setting_wutu"))
 	{
 		CSetting::GetInstance()->SetParam("setting_xianshi_is_youtu", "0");

zhipuzi_pos_windows/page/CShangpinCreatePageUI.h

@@ -7,7 +7,6 @@
 #include "../zhipuzi/CFoodtype.h"
 #include "../zhipuzi/CFoodpackage.h"
 
-#include "../control/CShangpinFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
 #include "../wnd/CModalWnd.h"

zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -163,38 +163,48 @@ void CShangpinPageUI::UpdateFoodtypePos()
 
 void CShangpinPageUI::InitFoodShow()
 {
-	bool is_youtu;
-	if (CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu") == "1")
-	{
-		is_youtu = true;
-	}
-	else
-	{
-		is_youtu = false;
-	}
+	std::string setting_xianshi_is_youtu = CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu");
 
 	m_foodLayout = static_cast<CTileLayoutUI*>(this->FindSubControl(_T("shangpin_foodlist")));
 	m_foodLayout->RemoveAll();
 
 	std::wstring xml_name;
 
-	if (is_youtu)
+	if (setting_xianshi_is_youtu == "1")
 	{
 		SIZE itemsize;
 		itemsize.cx = 130;
-		itemsize.cy = 220;
+		itemsize.cy = 200;
 		m_foodLayout->SetItemSize(itemsize);
 
-		xml_name = _T("shangpin_fooditem.xml");
+		xml_name = _T("diandan_fooditem_youtu.xml");
 	}
-	else
+	else if (setting_xianshi_is_youtu == "2")
 	{
 		SIZE itemsize;
-		itemsize.cx = 130;
+		itemsize.cx = 230;
 		itemsize.cy = 90;
 		m_foodLayout->SetItemSize(itemsize);
 
-		xml_name = _T("shangpin_fooditem_wutu.xml");
+		xml_name = _T("diandan_fooditem_youtu_2.xml");
+	}
+	else if (setting_xianshi_is_youtu == "3")
+	{
+		SIZE itemsize;
+		itemsize.cx = 140;
+		itemsize.cy = 120;
+		m_foodLayout->SetItemSize(itemsize);
+
+		xml_name = _T("diandan_fooditem_youtu_3.xml");
+	}
+	else
+	{
+		SIZE itemsize;
+		itemsize.cx = 140;
+		itemsize.cy = 100;
+		m_foodLayout->SetItemSize(itemsize);
+
+		xml_name = _T("diandan_fooditem_wutu.xml");
 	}
 
 	//如果当前一个分类都没有，那么就不处理了
@@ -217,9 +227,9 @@ void CShangpinPageUI::InitFoodShow()
 				CDialogBuilder builder;
 				CDialogBuilderCallbackEx cb;
 
-				CShangpinFoodItemUI* pItem = static_cast<CShangpinFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
+				CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-				pItem->SetYoutuModel(is_youtu);
+				pItem->SetYoutuModel(setting_xianshi_is_youtu);
 				pItem->SetFoodInfo(food);
 				pItem->UpdateShow();
 
@@ -239,9 +249,9 @@ void CShangpinPageUI::InitFoodShow()
 				CDialogBuilder builder;
 				CDialogBuilderCallbackEx cb;
 
-				CShangpinFoodItemUI* pItem = static_cast<CShangpinFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
+				CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-				pItem->SetYoutuModel(is_youtu);
+				pItem->SetYoutuModel(setting_xianshi_is_youtu);
 				pItem->SetFoodInfo(food);
 				pItem->UpdateShow();
 
@@ -262,9 +272,9 @@ void CShangpinPageUI::InitFoodShow()
 			CDialogBuilder builder;
 			CDialogBuilderCallbackEx cb;
 
-			CShangpinFoodItemUI* pItem = static_cast<CShangpinFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
+			CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-			pItem->SetYoutuModel(is_youtu);
+			pItem->SetYoutuModel(setting_xianshi_is_youtu);
 			pItem->SetFoodInfo(food);
 			pItem->UpdateShow();
 
@@ -278,9 +288,9 @@ void CShangpinPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 
-	if (name == L"shangpin_fooditem")
+	if (name == L"diandan_fooditem")
 	{
-		CShangpinFoodItemUI* fooditemUI = static_cast<CShangpinFoodItemUI*>(msg.pSender);
+		CDiandanFoodItemUI* fooditemUI = static_cast<CDiandanFoodItemUI*>(msg.pSender);
 
 		m_cur_click_food_item = fooditemUI;
 

zhipuzi_pos_windows/page/CShangpinPageUI.h

@@ -7,7 +7,7 @@
 #include "../zhipuzi/CFoodtype.h"
 #include "../zhipuzi/CFoodpackage.h"
 
-#include "../control/CShangpinFoodItemUI.h"
+#include "../control/CDiandanFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
 #include "../wnd/CModalWnd.h"
@@ -84,7 +84,7 @@ private:
 	std::string m_sousuo_foodname;
 
 	//当前点击的哪个商品
-	CShangpinFoodItemUI* m_cur_click_food_item;
+	CDiandanFoodItemUI* m_cur_click_food_item;
 
 	//模态对话框有关的
 	bool m_is_show_modal_wnd = false;

zhipuzi_pos_windows/page/CShangpinUpdatePageUI.h

@@ -7,7 +7,6 @@
 #include "../zhipuzi/CFoodtype.h"
 #include "../zhipuzi/CFoodpackage.h"
 
-#include "../control/CShangpinFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
 #include "../wnd/CModalWnd.h"

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -374,37 +374,47 @@ void CZhengcanDiandanPageUI::UpdateFoodtypePos()
 
 void CZhengcanDiandanPageUI::InitFoodShow()
 {
-	bool is_youtu;
-	if (CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu") == "1")
-	{
-		is_youtu = true;
-	}
-	else
-	{
-		is_youtu = false;
-	}
+	std::string setting_xianshi_is_youtu = CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu");
 
 	m_foodLayout = static_cast<CTileLayoutUI*>(this->FindSubControl(_T("diandan_foodlist")));
 	m_foodLayout->RemoveAll();
 
 	std::wstring xml_name;
 
-	if (is_youtu)
+	if (setting_xianshi_is_youtu == "1")
 	{
 		SIZE itemsize;
 		itemsize.cx = 130;
-		itemsize.cy = 220;
+		itemsize.cy = 200;
 		m_foodLayout->SetItemSize(itemsize);
 
-		xml_name = _T("diandan_fooditem.xml");
+		xml_name = _T("diandan_fooditem_youtu.xml");
 	}
-	else
+	else if (setting_xianshi_is_youtu == "2")
 	{
 		SIZE itemsize;
-		itemsize.cx = 130;
+		itemsize.cx = 230;
 		itemsize.cy = 90;
 		m_foodLayout->SetItemSize(itemsize);
 
+		xml_name = _T("diandan_fooditem_youtu_2.xml");
+	}
+	else if (setting_xianshi_is_youtu == "3")
+	{
+		SIZE itemsize;
+		itemsize.cx = 140;
+		itemsize.cy = 120;
+		m_foodLayout->SetItemSize(itemsize);
+
+		xml_name = _T("diandan_fooditem_youtu_3.xml");
+	}
+	else
+	{
+		SIZE itemsize;
+		itemsize.cx = 140;
+		itemsize.cy = 100;
+		m_foodLayout->SetItemSize(itemsize);
+
 		xml_name = _T("diandan_fooditem_wutu.xml");
 	}
 
@@ -428,7 +438,7 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 
 			CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-			pItem->SetYoutuModel(is_youtu);
+			pItem->SetYoutuModel(setting_xianshi_is_youtu);
 			pItem->SetFoodpackageInfo(food);
 			pItem->UpdateShow();
 
@@ -452,7 +462,7 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 
 				CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-				pItem->SetYoutuModel(is_youtu);
+				pItem->SetYoutuModel(setting_xianshi_is_youtu);
 				pItem->SetFoodInfo(food);
 				pItem->UpdateShow();
 
@@ -474,7 +484,7 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 
 				CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-				pItem->SetYoutuModel(is_youtu);
+				pItem->SetYoutuModel(setting_xianshi_is_youtu);
 				pItem->SetFoodInfo(food);
 				pItem->UpdateShow();
 
@@ -497,7 +507,7 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 
 			CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
-			pItem->SetYoutuModel(is_youtu);
+			pItem->SetYoutuModel(setting_xianshi_is_youtu);
 			pItem->SetFoodInfo(food);
 			pItem->UpdateShow();
 

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -288,7 +288,6 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="page\CSaomashouyinPageUI.h" />
     <ClInclude Include="page\CCaigouPageUI.h" />
     <ClInclude Include="page\CKucunPageUI.h" />
-    <ClInclude Include="control\CShangpinFoodItemUI.h" />
     <ClInclude Include="page\CZhengcanPageUI.h" />
     <ClInclude Include="page\CShangpinPageUI.h" />
     <ClInclude Include="tool\CAppEnv.h" />
@@ -420,7 +419,6 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClCompile Include="page\CSaomashouyinPageUI.cpp" />
     <ClCompile Include="page\CCaigouPageUI.cpp" />
     <ClCompile Include="page\CKucunPageUI.cpp" />
-    <ClCompile Include="control\CShangpinFoodItemUI.cpp" />
     <ClCompile Include="page\CZhengcanPageUI.cpp" />
     <ClCompile Include="page\CShangpinPageUI.cpp" />
     <ClCompile Include="tool\CAppEnv.cpp" />

zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj.filters

@@ -255,9 +255,6 @@
     <ClInclude Include="page\CShangpinPageUI.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="control\CShangpinFoodItemUI.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="page\CZhengcanPageUI.h">
       <Filter>头文件</Filter>
     </ClInclude>
@@ -626,9 +623,6 @@
     <ClCompile Include="page\CShangpinPageUI.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="control\CShangpinFoodItemUI.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="page\CZhengcanPageUI.cpp">
       <Filter>源文件</Filter>
     </ClCompile>