修复商品管理相关的bug

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

@@ -9,6 +9,10 @@
 					<Button name="shangpin_page_add_btn" width="320" height="60" padding="15,0,15,0" text="新建商品" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
 				</HorizontalLayout>
 				
+				<HorizontalLayout height="60" width="380" padding="0,20,0,0">
+					<Button name="shangpin_page_add_type_btn" width="320" height="60" padding="15,0,15,0" text="新建分类" textcolor="#FFFFFFFF" normalimage="file='btn_red_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_red_dianji.png' corner='5,5,5,5'" />
+				</HorizontalLayout>
+				
 				<Control></Control>
 				
 				<HorizontalLayout height="30" padding="0,0,0,80">
@@ -22,16 +26,11 @@
 			<Control width="1" bkcolor="#FFEBE8E8"></Control>
 			
 			<VerticalLayout name="shangpin_food_layout">
-				<HorizontalLayout name="shangpin_fenlei_layout" height="80" hscrollbar="true" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+				<VerticalLayout name="shangpin_fenlei_layout_scrolllayout" vscrollbar="true">
+					<HorizontalLayout name="shangpin_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 
-				</HorizontalLayout>
-				
-				<HorizontalLayout name="shangpin_page_add_type_layout" width="122" height="44" bordersize="1" bordercolor="#FF3CB371">
-					<Button name="shangpin_page_add_type_btn" width="120" height="42" padding="1,1,1,1" normalimage="" hotimage="" pushedimage=""  />
-					<Control bkimage="icon_add.png" width="14" height="14" float="true" pos="20,14,34,28" mouse="false"></Control>
-					<Label text="新建分类" textcolor="#FF3CB371" float="true" pos="40,7,120,35" mouse="false"></Label>
-				</HorizontalLayout>
-				
+					</HorizontalLayout>
+				</VerticalLayout>				
 				
 				<TileLayout name="shangpin_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="1" vscrollbar="true" hscrollbar="false">
 				

zhipuzi_pos_windows/helper/define.h

@@ -43,3 +43,5 @@
 #define WM_SETTING_TONGBU_SUCCESS 10601
 #define WM_SETTING_TONGBU_FAIL 10602
 
+//商品管理相关的
+#define WM_FOOD_HANDLE_SUCCESS 10701 //异步处理商品添加、修改、删除等的消息

zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp

@@ -15,9 +15,15 @@ CZhipuziHttpClient::CZhipuziHttpClient()
 
 	if (m_env == DEV)
 	{
+		/*
 		m_pingtai_url = "https://pf-api-dev3.zhipuzi.com/pos";
 		m_canyin_yewu_url = "https://cyapi-dev3.zhipuzi.com/pos";
 		m_lingshou_yewu_url = "https://lsapi-dev3.zhipuzi.com/pos";
+		*/
+
+		m_pingtai_url = "https://pf-api.zhipuzi.com/pos";
+		m_canyin_yewu_url = "https://cyapi.zhipuzi.com/pos";
+		m_lingshou_yewu_url = "https://lsapi.zhipuzi.com/pos";
 	}
 	else if (m_env == TEST)
 	{

zhipuzi_pos_windows/page/CShangpinCreatePageUI.cpp

@@ -396,6 +396,19 @@ void CShangpinCreatePageUI::HandleTextCapture(std::string content)
 	}
 }
 
+bool CShangpinCreatePageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	if (uMsg == WM_FOOD_HANDLE_SUCCESS)
+	{
+		//然后返回到商品页面
+		m_pMainWnd->SwitchPage(CMainWnd::SHANGPIN);
+
+		return true;
+	}
+
+	return false;
+}
+
 void CShangpinCreatePageUI::SetPos(RECT rc, bool bNeedInvalidate)
 {
 	m_nPageWidth = rc.right - rc.left;
@@ -705,8 +718,7 @@ void CShangpinCreatePageUI::HandleSave()
 	//走到这里说明商品保存成功了，接着把商品的数据更新到数据库
 	CFoodHandle::GetInstance()->UpdateOneFood(id);
 
-	//然后返回到商品页面
-	m_pMainWnd->SwitchPage(CMainWnd::SHANGPIN);
+	::PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
 }
 
 void CShangpinCreatePageUI::ShowError(std::wstring msg)

zhipuzi_pos_windows/page/CShangpinCreatePageUI.h

@@ -37,10 +37,7 @@ public:
 	void HandleTextCapture(std::string content);
 
 	//处理自定义消息，各个页面处理各个页面自己的（是自己处理的消息返回true，不是自己处理的消息返回false）
-	bool HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
-	{
-		return false;
-	}
+	bool HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 	void SetPos(RECT rc, bool bNeedInvalidate = true);
 

zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -129,27 +129,25 @@ void CShangpinPageUI::UpdateFoodtypePos()
 		num++;
 	}
 
-	CHorizontalLayoutUI* pNewType = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("shangpin_page_add_type_layout")));
-
-	int curRow = num / nMeihangNum + 1;
-	int curCol = num % nMeihangNum + 1;
-
-	RECT rect;
-	rect.left = (curCol - 1) * 140 + 10;
-	rect.right = rect.left + 130;
-	rect.top = (curRow - 1) * 52 + 10;
-	rect.bottom = rect.top + 42;
-
-	pNewType->SetFloat(true);
-	pNewType->SetPos(rect);
-
-	num++;
-
 	m_foodtype_mutex.unlock();
 
 	//调整区域高度
 	int lastRow = (num - 1) / nMeihangNum + 1;
 	pFenleiLayout->SetFixedHeight(lastRow * 52 + 10);
+
+	//处理滚动条问题
+	CVerticalLayoutUI* pFenleiScrollLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("shangpin_fenlei_layout_scrolllayout")));
+	if (lastRow > 2)
+	{
+		lastRow = 2;
+	}
+
+	pFenleiScrollLayout->SetFixedHeight(lastRow * 52 + 10);
+
+	SIZE size;
+	size.cx = 0;
+	size.cy = 0;
+	pFenleiScrollLayout->SetScrollPos(size);
 }
 
 void CShangpinPageUI::InitFoodShow()

zhipuzi_pos_windows/page/CShangpinUpdatePageUI.cpp

@@ -477,6 +477,19 @@ void CShangpinUpdatePageUI::HandleTextCapture(std::string content)
 
 }
 
+bool CShangpinUpdatePageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	if (uMsg == WM_FOOD_HANDLE_SUCCESS)
+	{
+		//然后返回到商品页面
+		m_pMainWnd->SwitchPage(CMainWnd::SHANGPIN);
+
+		return true;
+	}
+
+	return false;
+}
+
 void CShangpinUpdatePageUI::SetPos(RECT rc, bool bNeedInvalidate)
 {
 	m_nPageWidth = rc.right - rc.left;
@@ -757,8 +770,7 @@ void CShangpinUpdatePageUI::HandleSave()
 	//走到这里说明商品保存成功了，接着把商品的数据更新到数据库
 	CFoodHandle::GetInstance()->UpdateOneFood(id);
 
-	//然后返回到商品页面
-	m_pMainWnd->SwitchPage(CMainWnd::SHANGPIN);
+	::PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
 }
 
 void CShangpinUpdatePageUI::StartDelete()
@@ -811,8 +823,7 @@ void CShangpinUpdatePageUI::HandleDelete()
 	//本地数据库删除这个商品
 	CFoodHandle::GetInstance()->DeleteOndeFood(m_foodinfo.id);
 
-	//然后返回到商品页面
-	m_pMainWnd->SwitchPage(CMainWnd::SHANGPIN);
+	::PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
 }
 
 void CShangpinUpdatePageUI::ShowError(std::wstring msg)

zhipuzi_pos_windows/page/CShangpinUpdatePageUI.h

@@ -37,10 +37,7 @@ public:
 	void HandleTextCapture(std::string content);
 
 	//处理自定义消息，各个页面处理各个页面自己的（是自己处理的消息返回true，不是自己处理的消息返回false）
-	bool HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
-	{
-		return false;
-	}
+	bool HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 	void SetFoodinfo(CFood foodinfo)
 	{

zhipuzi_pos_windows/tool/CSqlite3.cpp

@@ -1270,7 +1270,7 @@ std::vector<CFood> CSqlite3::GetFoodByTypeid(std::string type_id, bool is_shouyi
 		sql += " AND type_id = '" + type_id + "'";
 	}
 
-	sql += " ORDER BY tag";
+	sql += " ORDER BY tag ASC";
 
 	sqlite3_stmt * stmt = NULL;