1、订单详情的操作按钮还没处理

2、退款中的订单，同意退款的情况还没处理

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

@@ -19,6 +19,9 @@
 			<Button name="waimai_order_list_confirme" float="true" pos="100,112,180,150" text="确认" textcolor="#FFFFFFFF"/>
 			<Button name="waimai_order_list_success" float="true" pos="100,112,180,150" text="设为成功" textcolor="#FFFFFFFF"/>
 			<Button name="waimai_order_list_fail" float="true" pos="100,160,180,198" text="设为失败" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Red_Click.png' corner='5,5,5,5'"/>
+			
+			<Button name="waimai_order_list_agree" float="true" pos="100,112,180,150" text="同意退款" textcolor="#FFFFFFFF"/>
+			<Button name="waimai_order_list_disagree" float="true" pos="100,160,180,198" text="拒绝退款" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Red_Click.png' corner='5,5,5,5'"/>
 		</HorizontalLayout>
 	</WaimaiOrderItem>
 </Window>

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

@@ -16,6 +16,7 @@
     			<HorizontalLayout childpadding="20" inset="10,16,10,10" >    				
     				<Control />
     				<Option name="main_waimai" text="外卖" width="64" group="menubar" selected="true" hotimage="tab_back.bmp" selectedimage="headerctrl_down.bmp" selectedhotimage="headerctrl_hot.bmp" />
+					<Option name="main_setting" text="设置" width="64" group="menubar" hotimage="tab_back.bmp" selectedimage="headerctrl_down.bmp" selectedhotimage="headerctrl_hot.bmp" />
     			</HorizontalLayout>
     			<HorizontalLayout width="94" >
     				<Button name="minbtn" maxwidth="26" maxheight="18" normalimage="file='frame_btn_min.bmp' source='0,0,26,18' mask='#FFFF00FF'" hotimage="file='frame_btn_min.bmp' source='26,0,52,18' mask='#FFFF00FF'" pushedimage="file='frame_btn_min.bmp' source='52,0,78,18' mask='#FFFF00FF'"/>
@@ -38,12 +39,13 @@
 					
 					<HorizontalLayout>
 						<HorizontalLayout width="250" padding="20,20,20,0">
-							<VerticalLayout height="400" bkcolor="#FFFFFFFF" childpadding="20" inset="20,20,20,0">
+							<VerticalLayout height="400" bkcolor="#FFFFFFFF" childpadding="15" inset="20,20,20,0">
 								<Option name="waimai_open_switch" selected="true" text="未处理" group="waimai_status_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 								<Option name="waimai_confirmed_switch" text="已确认" group="waimai_status_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 								<Option name="waimai_delivery_switch" text="配送中" group="waimai_status_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 								<Option name="waimai_success_switch" text="成功" group="waimai_status_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 								<Option name="waimai_fail_switch" text="失败"  group="waimai_status_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
+								<Option name="waimai_cancel_switch" text="已取消"  group="waimai_status_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 								<Option name="waimai_refund_switch" text="退款中" group="waimai_status_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 							</VerticalLayout>
 						</HorizontalLayout>

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

@@ -60,9 +60,13 @@
 
 			<HorizontalLayout width="250" height="400" bkcolor="#FFFFFFFF" padding="0,20,0,0">
 				<Button name="waimai_order_info_page_print" float="true" pos="60,60,190,98" 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="waimai_order_info_page_confirme" float="true" pos="60,108,190,146" text="确认" textcolor="#FFFF0FFFF" />
 				<Button name="waimai_order_info_page_success" float="true" pos="60,108,190,146" text="设为成功" textcolor="#FFFF0FFFF" />
 				<Button name="waimai_order_info_page_fail" float="true" pos="60,156,190,192" text="设为失败" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" />
+				
+				<Button name="waimai_order_info_page_agree" float="true" pos="60,108,190,146" text="同意退款" textcolor="#FFFF0FFFF" />
+				<Button name="waimai_order_info_page_disagree" float="true" pos="60,156,190,192" text="拒绝退款" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" />
 			</HorizontalLayout>
 		</HorizontalLayout>
 	</WaimaiOrderInfo>

lewaimai_dispatch/order/CWaimaiOrder.cpp

@@ -301,4 +301,88 @@ bool CWaimaiOrder::FailOrder(std::string order_id, std::string reason)
 	string count = v_count.GetString();
 
 	return true;
+}
+
+bool CWaimaiOrder::AgreeRefund(std::string order_id)
+{
+	std::string url = "/waimaiorder/agreerefund";
+
+	//请求外卖的未处理订单
+	std::map<string, string> params;
+	params["order_id"] = order_id;
+	std::string response;
+
+	CZhipuziHttpClient::RequestOld(url.c_str(), params, response);
+
+	rapidjson::Document document;
+	document.Parse(response.c_str());
+
+	if (document.HasParseError())
+	{
+		LOG_INFO("parse response error!");
+		return false;
+	}
+
+	if (!document.HasMember("errcode") || !document.HasMember("errmsg") || !document.HasMember("data"))
+	{
+		LOG_INFO("json error!");
+		return false;
+	}
+
+	rapidjson::Value& v_errcode = document["errcode"];
+	int errcode = v_errcode.GetInt();
+	if (errcode != 0)
+	{
+		LOG_INFO("response failed! message:" << document["errmsg"].GetString());
+		return false;
+	}
+
+	//获得数据成功
+	rapidjson::Value& data = document["data"];
+	rapidjson::Value& v_count = data["count"];
+	string count = v_count.GetString();
+
+	return true;
+}
+
+bool CWaimaiOrder::DisagreeRefund(std::string order_id)
+{
+	std::string url = "/waimaiorder/disagreerefund";
+
+	//请求外卖的未处理订单
+	std::map<string, string> params;
+	params["order_id"] = order_id;
+	std::string response;
+
+	CZhipuziHttpClient::RequestOld(url.c_str(), params, response);
+
+	rapidjson::Document document;
+	document.Parse(response.c_str());
+
+	if (document.HasParseError())
+	{
+		LOG_INFO("parse response error!");
+		return false;
+	}
+
+	if (!document.HasMember("errcode") || !document.HasMember("errmsg") || !document.HasMember("data"))
+	{
+		LOG_INFO("json error!");
+		return false;
+	}
+
+	rapidjson::Value& v_errcode = document["errcode"];
+	int errcode = v_errcode.GetInt();
+	if (errcode != 0)
+	{
+		LOG_INFO("response failed! message:" << document["errmsg"].GetString());
+		return false;
+	}
+
+	//获得数据成功
+	rapidjson::Value& data = document["data"];
+	rapidjson::Value& v_count = data["count"];
+	string count = v_count.GetString();
+
+	return true;
 }

lewaimai_dispatch/order/CWaimaiOrder.h

@@ -38,6 +38,9 @@ public:
 	bool SuccessOrder(std::string order_id);
 	bool FailOrder(std::string order_id, std::string reason);
 
+	bool AgreeRefund(std::string order_id);
+	bool DisagreeRefund(std::string order_id);
+
 public:
 	std::string m_order_id;
 	std::string m_shop_id;

lewaimai_dispatch/wnd/CGameFrameWnd.cpp

@@ -47,77 +47,7 @@ void CGameFrameWnd::Notify(TNotifyUI& msg)
     }
     else if(msg.sType == _T("selectchanged"))
     {
-        CDuiString name = msg.pSender->GetName();
-
-		//先判断主页面的tab
-		if (name == _T("main_waimai"))
-		{
-			CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
-			if (pControl && pControl->GetCurSel() != 0)
-			{
-				pControl->SelectItem(0);
-			}
-		}
-		else if (name == _T("main_saomaxiadan"))
-		{
-			CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
-			if (pControl && pControl->GetCurSel() != 2)
-			{
-				pControl->SelectItem(2);
-			}
-		}
-		else if (name == _T("main_setting"))
-		{
-			CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
-			if (pControl && pControl->GetCurSel() != 3)
-			{
-				pControl->SelectItem(3);
-			}
-		}
-		else if (name == _T("main_web"))
-		{
-			CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
-			if (pControl && pControl->GetCurSel() != 4)
-			{
-				pControl->SelectItem(4);
-			}
-		}
-
-		//判断外卖的tab
-        else if(name == _T("waimai_open_switch") || name == _T("waimai_confirmed_switch") || name == _T("waimai_delivery_switch") || name == _T("waimai_success_switch") || name == _T("waimai_fail_switch") || name == _T("waimai_refund_switch"))
-        {
-            OrderListUI* orderlist = static_cast<OrderListUI*>(m_pm.FindControl(_T("orderlist")));
-
-			//切换状态全部重新开始从第1页
-			orderlist->SetPage(1);
-
-			if (name == _T("waimai_open_switch"))
-			{
-				orderlist->SetStatus(1);
-			}
-			else if (name == _T("waimai_confirmed_switch"))
-			{
-				orderlist->SetStatus(2);
-			}
-			else if (name == _T("waimai_delivery_switch"))
-			{
-				orderlist->SetStatus(3);
-			}
-			else if (name == _T("waimai_success_switch"))
-			{
-				orderlist->SetStatus(4);
-			}
-			else if (name == _T("waimai_fail_switch"))
-			{
-				orderlist->SetStatus(5);
-			}
-			else if (name == _T("waimai_refund_switch"))
-			{
-				orderlist->SetStatus(6);
-			}
-
-            orderlist->Refresh();
-        }
+		HandleSelectChangeMsg(msg);
     }
     else if(msg.sType == _T("itemclick"))
     {
@@ -242,6 +172,38 @@ void CGameFrameWnd::HandleClickMsg(TNotifyUI& msg)
 			orderlist->RemoveAt(index);
 		}
 	}
+	else if (name == _T("waimai_order_list_agree"))
+	{
+		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		std::string waimai_order_id = item->getOrderID();
+
+		CWaimaiOrder order;
+		bool ret = order.AgreeRefund(waimai_order_id);
+
+		if (ret)
+		{
+			//同意退款之后，订单变为失败状态
+			OrderListUI* orderlist = static_cast<OrderListUI*>(m_pm.FindControl(_T("orderlist")));
+			int index = orderlist->GetItemIndex(item);
+			orderlist->RemoveAt(index);
+		}
+	}
+	else if (name == _T("waimai_order_list_disagree"))
+	{
+		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		std::string waimai_order_id = item->getOrderID();
+
+		CWaimaiOrder order;
+		bool ret = order.DisagreeRefund(waimai_order_id);
+
+		if (ret)
+		{
+			//不同意退款，订单还是退款中，等待第三方客服处理
+			//OrderListUI* orderlist = static_cast<OrderListUI*>(m_pm.FindControl(_T("orderlist")));
+			//int index = orderlist->GetItemIndex(item);
+			//orderlist->RemoveAt(index);
+		}
+	}
 	else if (name == _T("waimai_order_list_info"))
 	{
 		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent());
@@ -254,6 +216,7 @@ void CGameFrameWnd::HandleClickMsg(TNotifyUI& msg)
 
 		//刷新订单详情页数据
 		CWaimaiOrderInfoUI* order_info_page = static_cast<CWaimaiOrderInfoUI*>(m_pm.FindControl(_T("waimaiorder_info_page")));
+		order_info_page->SetDate(order);
 		order_info_page->Refresh(order);
 
 		//显示订单详情页的内容
@@ -291,6 +254,85 @@ void CGameFrameWnd::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
+void CGameFrameWnd::HandleSelectChangeMsg(TNotifyUI& msg)
+{
+	CDuiString name = msg.pSender->GetName();
+
+	//先判断主页面的tab
+	if (name == _T("main_waimai"))
+	{
+		CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
+		if (pControl && pControl->GetCurSel() != 0)
+		{
+			pControl->SelectItem(0);
+		}
+	}
+	else if (name == _T("main_saomaxiadan"))
+	{
+		CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
+		if (pControl && pControl->GetCurSel() != 2)
+		{
+			pControl->SelectItem(2);
+		}
+	}
+	else if (name == _T("main_setting"))
+	{
+		CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
+		if (pControl && pControl->GetCurSel() != 3)
+		{
+			pControl->SelectItem(3);
+		}
+	}
+	else if (name == _T("main_web"))
+	{
+		CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("switch")));
+		if (pControl && pControl->GetCurSel() != 4)
+		{
+			pControl->SelectItem(4);
+		}
+	}
+
+	//判断外卖的tab
+	else if (name == _T("waimai_open_switch") || name == _T("waimai_confirmed_switch") || name == _T("waimai_delivery_switch") || name == _T("waimai_success_switch") || name == _T("waimai_fail_switch") || name == _T("waimai_cancel_switch") || name == _T("waimai_refund_switch"))
+	{
+		OrderListUI* orderlist = static_cast<OrderListUI*>(m_pm.FindControl(_T("orderlist")));
+
+		//切换状态全部重新开始从第1页
+		orderlist->SetPage(1);
+
+		if (name == _T("waimai_open_switch"))
+		{
+			orderlist->SetStatus(1);
+		}
+		else if (name == _T("waimai_confirmed_switch"))
+		{
+			orderlist->SetStatus(2);
+		}
+		else if (name == _T("waimai_delivery_switch"))
+		{
+			orderlist->SetStatus(3);
+		}
+		else if (name == _T("waimai_success_switch"))
+		{
+			orderlist->SetStatus(4);
+		}
+		else if (name == _T("waimai_fail_switch"))
+		{
+			orderlist->SetStatus(5);
+		}
+		else if (name == _T("waimai_cancel_switch"))
+		{
+			orderlist->SetStatus(6);
+		}
+		else if (name == _T("waimai_refund_switch"))
+		{
+			orderlist->SetStatus(7);
+		}
+
+		orderlist->Refresh();
+	}
+}
+
 LRESULT CGameFrameWnd::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     LRESULT lRes = 0;

lewaimai_dispatch/wnd/CGameFrameWnd.h

@@ -37,6 +37,8 @@ public:
 
 	void HandleClickMsg(TNotifyUI& msg);
 
+	void HandleSelectChangeMsg(TNotifyUI& msg);
+
     LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
     LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

lewaimai_dispatch/wnd/CWaimaiOrderInfoUI.cpp

@@ -275,38 +275,61 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 	CButtonUI* success_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("waimai_order_info_page_success")));
 	CButtonUI* fail_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("waimai_order_info_page_fail")));
 
+	CButtonUI* agree_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("waimai_order_info_page_agreee")));
+	CButtonUI* disagree_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("waimai_order_info_page_disagree")));
+
 	if (_tcscmp(CLewaimaiString::UTF8ToUnicode(order.m_order_status).c_str(), _T("未处理")) == 0)
 	{
 		confirm_button->SetVisible(true);
 		success_button->SetVisible(false);
 		fail_button->SetVisible(true);
+
+		agree_button->SetVisible(false);
+		disagree_button->SetVisible(false);
 	}
 	else if (_tcscmp(CLewaimaiString::UTF8ToUnicode(order.m_order_status).c_str(), _T("已确认")) == 0)
 	{
 		confirm_button->SetVisible(false);
 		success_button->SetVisible(true);
 		fail_button->SetVisible(true);
+
+		agree_button->SetVisible(false);
+		disagree_button->SetVisible(false);
 	}
 	else if (_tcscmp(CLewaimaiString::UTF8ToUnicode(order.m_order_status).c_str(), _T("交易成功")) == 0)
 	{
 		confirm_button->SetVisible(false);
 		success_button->SetVisible(false);
 		fail_button->SetVisible(false);
+
+		agree_button->SetVisible(false);
+		disagree_button->SetVisible(false);
 	}
 	else if (_tcscmp(CLewaimaiString::UTF8ToUnicode(order.m_order_status).c_str(), _T("交易失败")) == 0)
 	{
 		confirm_button->SetVisible(false);
 		success_button->SetVisible(false);
 		fail_button->SetVisible(false);
+
+		agree_button->SetVisible(false);
+		disagree_button->SetVisible(false);
 	}
 	else if (_tcscmp(CLewaimaiString::UTF8ToUnicode(order.m_order_status).c_str(), _T("已取消")) == 0)
 	{
 		confirm_button->SetVisible(false);
 		success_button->SetVisible(false);
 		fail_button->SetVisible(false);
+
+		agree_button->SetVisible(false);
+		disagree_button->SetVisible(false);
 	}
 	else if (_tcscmp(CLewaimaiString::UTF8ToUnicode(order.m_order_status).c_str(), _T("退款中")) == 0)
 	{
+		confirm_button->SetVisible(false);
+		success_button->SetVisible(false);
+		fail_button->SetVisible(false);
 
+		agree_button->SetVisible(true);
+		disagree_button->SetVisible(true);
 	}
 }

lewaimai_dispatch/wnd/CWaimaiOrderInfoUI.h

@@ -13,6 +13,14 @@ public:
 	//刷新当前页面的内容，注意这个函数不会改变当前的订单状态以及“页数”
 	void DoEvent(TEventUI& event);
 
+	void SetDate(CWaimaiOrder& order)
+	{
+		m_order = order;
+	}
+
 	//根据外卖订单数据，刷新订单详情页的显示
 	void Refresh(CWaimaiOrder& order);
+
+public:
+	CWaimaiOrder m_order;
 };

lewaimai_dispatch/wnd/CWaimaiOrderItemUI.cpp

@@ -66,23 +66,44 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(true);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_fail")->SetVisible(true);
+
+		this->FindSubControl(L"waimai_order_list_agree")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_disagree")->SetVisible(false);
 	}
 	else if (m_status == 2 || m_status == 3)
 	{
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(true);
 		this->FindSubControl(L"waimai_order_list_fail")->SetVisible(true);
+
+		this->FindSubControl(L"waimai_order_list_agree")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_disagree")->SetVisible(false);
 	}
 	else if (m_status == 4 || m_status == 5)
 	{
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_fail")->SetVisible(false);
+
+		this->FindSubControl(L"waimai_order_list_agree")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_disagree")->SetVisible(false);
 	}
 	else if (m_status == 6)
 	{
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_fail")->SetVisible(false);
+
+		this->FindSubControl(L"waimai_order_list_agree")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_disagree")->SetVisible(false);
+	}
+	else if (m_status == 7)
+	{
+		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_fail")->SetVisible(false);
+
+		this->FindSubControl(L"waimai_order_list_agree")->SetVisible(true);
+		this->FindSubControl(L"waimai_order_list_disagree")->SetVisible(true);
 	}
 }

lewaimai_dispatch/wnd/CWaimaiOrderItemUI.h

@@ -49,6 +49,6 @@ private:
 
 	std::string m_orderid;
 
-	int m_status = 1; //1：未处理 2：已确认 3：配送中 4：成功 5：失败 6：退款中
+	int m_status = 1; //1：未处理 2：已确认 3：配送中 4：成功 5：失败 6：已取消 7：退款中
 };
 

lewaimai_dispatch/wnd/OrderListUI.cpp

@@ -30,6 +30,10 @@ void OrderListUI::Refresh()
 	}
 	else if (m_status == 6)
 	{
+		url = "/waimaiorder/getcancelledlist";
+	}
+	else if (m_status == 7)
+	{
 		url = "/waimaiorder/getrefundlist";
 	}
 

lewaimai_dispatch/wnd/OrderListUI.h

@@ -41,7 +41,7 @@ private:
     DWORD m_dwDelayNum;
     DWORD m_dwDelayLeft;
 
-    int m_status = 1; //1：未处理 2：已确认 3：配送中 4：成功 5：失败 6：退款中
+    int m_status = 1; //1：未处理 2：已确认 3：配送中 4：成功 5：失败 6：已取消 7：退款中
 	int m_page = 1;
 
 	int m_total_page; //总页数

zhipuzi_pos_windows.sln

@@ -9,36 +9,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zhipuzi_pos_windows_server"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
-		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Debug|ARM.ActiveCfg = Debug|Win32
-		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Debug|x64.ActiveCfg = Debug|x64
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Debug|x64.Build.0 = Debug|x64
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Debug|x86.ActiveCfg = Debug|Win32
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Debug|x86.Build.0 = Debug|Win32
-		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Release|ARM.ActiveCfg = Release|Win32
-		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Release|ARM64.ActiveCfg = Release|Win32
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Release|x64.ActiveCfg = Release|x64
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Release|x64.Build.0 = Release|x64
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Release|x86.ActiveCfg = Release|Win32
 		{1D694BE0-D976-4F29-8997-3308ADFFF413}.Release|x86.Build.0 = Release|Win32
-		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Debug|ARM.ActiveCfg = Debug|Win32
-		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Debug|x64.ActiveCfg = Debug|x64
 		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Debug|x64.Build.0 = Debug|x64
 		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Debug|x86.ActiveCfg = Debug|Win32
 		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Debug|x86.Build.0 = Debug|Win32
-		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Release|ARM.ActiveCfg = Release|Win32
-		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Release|ARM64.ActiveCfg = Release|Win32
 		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Release|x64.ActiveCfg = Release|x64
 		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Release|x64.Build.0 = Release|x64
 		{2FF637C1-9F58-473C-A156-25EFE35C2FD7}.Release|x86.ActiveCfg = Release|Win32