订单列表改完了

bin/Win32/Debug/lewaimai_pos_windows/skin/waimai_order_item.xml

@@ -12,7 +12,7 @@
 			<Label float="true" name="waimai_order_list_init_date" text="下单时间：" pos="10,96,220,126" />
 			<Label float="true" name="waimai_order_list_price" text="价格：" pos="350,96,500,126" />
 			
-			<Label float="true" name="waimai_order_list_type" text="订单类型：" pos="10,126,182,156" />
+			<Label float="true" name="waimai_order_list_type" text="配送方式：" pos="10,126,400,156" />
 			
 			<Label float="true" name="waimai_order_list_delivery_date" text="配送时间：" pos="10,156,182,186" />
 			

bin/Win32/Release/lewaimai_pos_windows/skin/waimai_order_item.xml

@@ -12,7 +12,7 @@
 			<Label float="true" name="waimai_order_list_init_date" text="下单时间：" pos="10,96,220,126" />
 			<Label float="true" name="waimai_order_list_price" text="价格：" pos="350,96,500,126" />
 			
-			<Label float="true" name="waimai_order_list_type" text="订单类型：" pos="10,126,182,156" />
+			<Label float="true" name="waimai_order_list_type" text="配送方式：" pos="10,126,400,156" />
 			
 			<Label float="true" name="waimai_order_list_delivery_date" text="配送时间：" pos="10,156,182,186" />
 			

lewaimai_pos_windows/control/CWaimaiOrderItemUI.cpp

@@ -22,7 +22,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	m_init_date = orderinfo["order_date"].GetString();
 
 	m_is_selftake = orderinfo["is_selftake"].GetString();
-	//m_delivery_date = orderinfo["delivery_date"].GetString();
+	m_delivery_date = orderinfo["delivery_time"].GetString();
 
 	m_restaurant_number = orderinfo["restaurant_number"].GetString();
 
@@ -31,6 +31,8 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	m_from_type = orderinfo["from_type"].GetString();
 	m_is_book = orderinfo["is_book"].GetString();
 
+	m_delivery_mode = orderinfo["delivery_mode"].GetString();
+
 	std::wstring name_show = L"姓名：" + CLewaimaiString::UTF8ToUnicode(m_name);
 	this->FindSubControl(L"waimai_order_list_name")->SetText(name_show.c_str());
 
@@ -56,24 +58,32 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	std::wstring delivery_date;
 	if (m_is_selftake == "1")
 	{
-		order_type = L"订单类型：到店自取";
-		//delivery_date = L"自取时间：" + CLewaimaiString::UTF8ToUnicode(m_delivery_date);
+		order_type = L"配送方式：到店自取";
+
+		delivery_date = L"自取时间：" + CLewaimaiString::UTF8ToUnicode(m_delivery_date);
 
 		this->FindSubControl(L"waimai_order_list_ziqu")->SetVisible(true);
 	}
 	else
 	{
-		order_type = L"订单类型：外卖配送";
-		//delivery_date = L"配送时间：" + CLewaimaiString::UTF8ToUnicode(m_delivery_date);
+		order_type = L"配送方式：外卖配送";
+
+		if (m_delivery_mode == "1")
+		{
+			order_type += L"（平台专送）";
+		}
+		else if (m_delivery_mode == "2")
+		{
+			order_type += L"（商家自配送）";
+		}
+
+		delivery_date = L"配送时间：" + CLewaimaiString::UTF8ToUnicode(m_delivery_date);
 
 		this->FindSubControl(L"waimai_order_list_ziqu")->SetVisible(false);
 	}
 
 	this->FindSubControl(L"waimai_order_list_type")->SetText(order_type.c_str());
-
-
-
-	//this->FindSubControl(L"waimai_order_list_delivery_date")->SetText(delivery_date.c_str());
+	this->FindSubControl(L"waimai_order_list_delivery_date")->SetText(delivery_date.c_str());
 
 	//显示预约的戳
 	if (m_is_book == "1")
@@ -177,4 +187,11 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetText(refund_status_text.c_str());
 	}
+
+	//如果是平台专送的，商家不能设为成功和失败
+	if (m_delivery_mode == "1")
+	{
+		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_fail")->SetVisible(false);
+	}
 }

lewaimai_pos_windows/control/CWaimaiOrderItemUI.h

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