1

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

@@ -49,7 +49,7 @@
 		</VerticalLayout>
 		
 		<VerticalLayout name="login_loading" height="200">
-			<Label text="登录中..." align="center" padding="0,150,0,0" font="0"></Label>
+			<Label text="登录中..." align="center" padding="0,120,0,0" font="0"></Label>
 		</VerticalLayout>
 		
 		<VerticalLayout name="login_init_data_ing" height="200">

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

@@ -20,6 +20,10 @@
 			
 			<Control name="waimai_order_list_yuyue" bkimage="yuyue.png" float="true" pos="250,120,362,190" />
 			<Control name="waimai_order_list_ziqu" bkimage="ziti.png" float="true" pos="400,120,512,190" />
+			
+			<Control name="waimai_order_list_meituan_icon" bkimage="meituan_icon.png" visible="false" float="true" pos="490,5,520,35" />
+			<Control name="waimai_order_list_eleme_icon" bkimage="eleme_icon.png" visible="false" float="true" pos="490,5,520,35" />
+			<Control name="waimai_order_list_zhipuzi_icon" bkimage="zhipuzi_waimai_icon.png" visible="false" float="true" pos="490,5,520,35" />
 		</HorizontalLayout>
 		
 		<HorizontalLayout width="200">

zhipuzi_pos_windows/control/CWaimaiOrderItemUI.cpp

@@ -28,6 +28,8 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 
 	m_orderid = orderinfo["id"].GetString();
 
+	m_from_type = orderinfo["from_type"].GetString();
+
 	std::wstring name_show = L"姓名：" + CLewaimaiString::UTF8ToUnicode(m_name);
 	this->FindSubControl(L"waimai_order_list_name")->SetText(name_show.c_str());
 
@@ -76,6 +78,23 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 		this->FindSubControl(L"waimai_order_list_yuyue")->SetVisible(true);
 	}
 
+	CControlUI* meituan_icon = this->FindSubControl(L"waimai_order_list_meituan_icon");
+	CControlUI* eleme_icon = this->FindSubControl(L"waimai_order_list_eleme_icon");
+	CControlUI* zhipuzi_icon = this->FindSubControl(L"waimai_order_list_zhipuzi_icon");
+
+	if (m_from_type == CLewaimaiString::UnicodeToUTF8(L"美团外卖"))
+	{
+		meituan_icon->SetVisible(true);
+	}
+	else if (m_from_type == CLewaimaiString::UnicodeToUTF8(L"饿了么"))
+	{
+		eleme_icon->SetVisible(true);
+	}
+	else
+	{
+		zhipuzi_icon->SetVisible(true);
+	}
+
 	if (m_status == 1)
 	{
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetVisible(false);

zhipuzi_pos_windows/control/CWaimaiOrderItemUI.h

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

zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp

@@ -138,6 +138,15 @@ bool CZhipuziHttpClient::Login(std::string& errmsg)
 
 	lwm_sess_token = v_data["lwm_sess_token"].GetString();
 
+	m_shop_id = v_data["shop_id"].GetString();
+	if (atoi(m_shop_id.c_str()) == 0)
+	{
+		LOG_INFO("login failed! shop_id is 0");
+		errmsg = CLewaimaiString::UnicodeToUTF8(L"当前账号未关联店铺，请登录智铺子商家app关联店铺");
+
+		return false;
+	}
+
 	//保存店铺信息
 	CShopinfo::GetInstance()->InitShopinfoByLogin(v_data);
 
@@ -155,6 +164,7 @@ bool CZhipuziHttpClient::Request(std::string url, std::map<string, string> param
 	params["nonce"] = nonce;
 	params["timestamp"] = timestamp;
 	params["url"] = m_yewu_url + url;
+	params["shop_id"] = m_shop_id;
 
 	//计算签名
 	std::string postString;
@@ -232,6 +242,7 @@ bool CZhipuziHttpClient::RequestNew(std::string url, std::map<string, string> pa
 	params["nonce"] = nonce;
 	params["timestamp"] = timestamp;
 	params["lwm_sess_token"] = lwm_sess_token;
+	params["shop_id"] = m_shop_id;
 
 	//计算签名
 	std::string postString;

zhipuzi_pos_windows/network/CZhipuziHttpClient.h

@@ -55,6 +55,9 @@ public:
 	//身份token
 	std::string lwm_sess_token;
 
+	//当前绑定的shop_id
+	std::string m_shop_id;
+
 	//htttp代理相关的参数
 	CZhipuziHttpProxy m_http_proxy;