1

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

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<Font id="diandan_price" name="微软雅黑" size="18" />
+	<Font id="shangpin_price" name="微软雅黑" size="18" />
 	<Font id="1" name="微软雅黑" size="14" />
 	
-	<ShangpinFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
+	<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>
 		<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>
 	</ShangpinFoodItem>
 </Window>

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

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<Font id="diandan_price" name="微软雅黑" size="18" />
+	<Font id="shangpin_price" name="微软雅黑" size="18" />
 	<Font id="1" name="微软雅黑" size="14" />
 	
-	<ShangpinFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,7,7">
+	<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="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="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,55,155,90" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
 	</ShangpinFoodItem>
 </Window>

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

@@ -6,16 +6,15 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-			<VerticalLayout width="490" bkcolor="#FFFFFFFF">
-				<Label text="建议使用web后台管理商品，更方便，功能更强" align="center" padding="0,30,0,0" font="20"></Label>
+			<VerticalLayout width="490" bkcolor="#FFFFFFFF">				
+				<HorizontalLayout height="60" width="400" padding="43,80,0,0">
+					<Button name="shangpin_page_add_btn" width="400" height="60" text="新建商品" textcolor="#FFFFFFFF" 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>
 				
 				<Control></Control>
-				<HorizontalLayout height="60" width="400" padding="43,0,0,0">
-					<Button name="diandan_page_add_btn" width="400" height="60" text="新建商品" textcolor="#FFFFFFFF" 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>
 				
 				<HorizontalLayout height="60" width="400" padding="43,30,0,80">
-					<Button name="diandan_page_tongbu_btn" width="400" height="60" text="同步服务器商品" textcolor="#FFFFFFFF" 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="shangpin_page_tongbu_btn" width="400" height="60" text="同步云端商品数据" textcolor="#FFFFFFFF" 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>
 			

zhipuzi_pos_windows/control/CShangpinFoodItemUI.cpp

@@ -39,113 +39,44 @@ void CShangpinFoodItemUI::SetFoodInfo(CFood info)
 	m_foodinfo = info;
 }
 
-void CShangpinFoodItemUI::SetFoodpackageInfo(CFoodpackage info)
-{
-	m_foodpackageinfo = info;
-
-	m_is_taocan = true;
-}
-
-void CShangpinFoodItemUI::SetIsTaocan(bool is_taocan)
-{
-	m_is_taocan = is_taocan;
-}
-
 CFood CShangpinFoodItemUI::GetFoodInfo()
 {
 	return m_foodinfo;
 }
 
-CFoodpackage CShangpinFoodItemUI::GetFoodpackageInfo()
-{
-	return m_foodpackageinfo;
-}
-
-bool CShangpinFoodItemUI::GetIsTaocan()
-{
-	return m_is_taocan;
-}
-
 void CShangpinFoodItemUI::UpdateShow()
 {
-	if (m_is_taocan)
+	if (m_is_youtu)
 	{
-		if (m_is_youtu)
-		{
-			CControlUI* pImage = static_cast<CControlUI*>(this->FindSubControl(_T("image")));
-
-			//获取本地图片的路径
-			std::wstring imagepath = m_foodpackageinfo.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_foodpackageinfo.name).c_str());
-
-		CLabelUI* pPrice = static_cast<CLabelUI*>(this->FindSubControl(_T("price")));
+		CControlUI* pImage = static_cast<CControlUI*>(this->FindSubControl(_T("image")));
 
-		wstring price = L"¥" + CLewaimaiString::UTF8ToUnicode(m_foodpackageinfo.price);
-
-		pPrice->SetText(price.c_str());
-
-		//属性商品，显示多属性标签
-		CLabelUI* pNature = static_cast<CLabelUI*>(this->FindSubControl(_T("nature")));
-		pNature->SetVisible(true);
-	}
-	else
-	{
-		if (m_is_youtu)
+		//获取本地图片的路径
+		std::wstring imagepath = m_foodinfo.getImageTmpPath();
+		if (CSystem::IsFileExist(imagepath.c_str()))
 		{
-			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());
-			}
+			//图片已经存在，直接显示
+			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")));
+	CLabelUI* pName = static_cast<CLabelUI*>(this->FindSubControl(_T("foodname")));
+	pName->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.name).c_str());
 
-		wstring price = L"¥" + CLewaimaiString::UTF8ToUnicode(m_foodinfo.price);
-		if (m_foodinfo.is_nature == "1")
-		{
-			price += L"起";
-		}
+	CLabelUI* pPrice = static_cast<CLabelUI*>(this->FindSubControl(_T("price")));
 
-		pPrice->SetText(price.c_str());
+	wstring price = L"¥" + CLewaimaiString::UTF8ToUnicode(m_foodinfo.price);
+	if (m_foodinfo.is_nature == "1")
+	{
+		price += L"起";
+	}
 
-		if (m_foodinfo.is_weight == "1")
-		{
-			//称重商品，显示称重的标签（称重的标签与属性的标签不同时存在，优先显示称重的）
-			CLabelUI* pChenzhong = static_cast<CLabelUI*>(this->FindSubControl(_T("chengzhong")));
-			pChenzhong->SetVisible(true);
-		}
-		else
-		{
-			if (m_foodinfo.is_nature == "1")
-			{
-				//属性商品，显示多属性标签
-				CLabelUI* pNature = static_cast<CLabelUI*>(this->FindSubControl(_T("nature")));
-				pNature->SetVisible(true);
-			}
-		}
+	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);
-		}
+	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);
 	}
 }
 

zhipuzi_pos_windows/control/CShangpinFoodItemUI.h

@@ -18,12 +18,8 @@ public:
 	void DoEvent(TEventUI& event);
 
 	void SetFoodInfo(CFood info);
-	void SetFoodpackageInfo(CFoodpackage info);
-	void SetIsTaocan(bool is_taocan);
 
 	CFood GetFoodInfo();
-	CFoodpackage GetFoodpackageInfo();
-	bool GetIsTaocan();
 
 	//Ë¢ÐÂÏÔʾ
 	void UpdateShow();
@@ -32,11 +28,7 @@ public:
 
 private:
 	CFood m_foodinfo;
-	CFoodpackage m_foodpackageinfo;
-
-	bool m_is_taocan = false;
 
 	//ĬÈÏÓÐͼģʽ
 	bool m_is_youtu = true;
-};
-
+};

zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -179,7 +179,7 @@ void CShangpinPageUI::InitFoodShow()
 			CDialogBuilder builder;
 			CDialogBuilderCallbackEx cb;
 
-			CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
+			CShangpinFoodItemUI* pItem = static_cast<CShangpinFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
 			pItem->SetYoutuModel(is_youtu);
 			pItem->SetFoodInfo(food);
@@ -201,7 +201,7 @@ void CShangpinPageUI::InitFoodShow()
 			CDialogBuilder builder;
 			CDialogBuilderCallbackEx cb;
 
-			CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
+			CShangpinFoodItemUI* pItem = static_cast<CShangpinFoodItemUI*>(builder.Create(xml_name.c_str(), (UINT)0, &cb, m_pManager));
 
 			pItem->SetYoutuModel(is_youtu);
 			pItem->SetFoodInfo(food);
@@ -219,7 +219,7 @@ void CShangpinPageUI::HandleClickMsg(TNotifyUI& msg)
 
 	if (name == L"shangpin_fooditem")
 	{
-		CDiandanFoodItemUI* fooditemUI = static_cast<CDiandanFoodItemUI*>(msg.pSender);
+		CShangpinFoodItemUI* fooditemUI = static_cast<CShangpinFoodItemUI*>(msg.pSender);
 
 		m_cur_click_food_item = fooditemUI;
 
@@ -232,6 +232,14 @@ void CShangpinPageUI::HandleClickMsg(TNotifyUI& msg)
 
 		StopSerachFood();
 	}
+	else if (name == L"shangpin_page_add_btn")
+	{
+
+	}
+	else if (name == L"shangpin_page_tongbu_btn")
+	{
+
+	}
 }
 
 //处理option切换事件
@@ -305,8 +313,6 @@ void CShangpinPageUI::HandleTextCapture(std::string content)
 
 void CShangpinPageUI::ClickFoodAction()
 {
-	bool is_taocan = m_cur_click_food_item->GetIsTaocan();
-
 	//点击普通商品之后的处理逻辑
 	CFood foodinfo = m_cur_click_food_item->GetFoodInfo();
 }

zhipuzi_pos_windows/page/CShangpinPageUI.h

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