戳也做好了

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

@@ -17,7 +17,8 @@
 			
 			<Label float="true" name="waimai_order_list_refund_status" text="退款状态：" pos="350,156,800,186" />
 			
-			
+			<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" />
 		</HorizontalLayout>
 		
 		<HorizontalLayout width="200">

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

@@ -67,6 +67,8 @@
 					<Label name="waimai_order_info_page_delivery_time" height="30" text="配送时间：" />
 					<Label name="waimai_order_info_page_refund_status" height="30" text="退款状态：" />
 					<Label name="waimai_order_info_page_configmemo" height="30" text="商家备注：" />
+					
+					<Control name="waimai_order_info_page_huodaofukuan" bkimage="huodaofukuan.png" float="true" pos="200,70,312,140" />
 				</VerticalLayout>
 			</VerticalLayout>
 

bin/Win32/Debug/setup/乐外卖接单软件安装脚本.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "乐外卖接单软件"
-!define PRODUCT_VERSION "1.1.0.0"
+!define PRODUCT_VERSION "1.0.0.1"
 !define PRODUCT_PUBLISHER "深圳市迅享科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.lewaimai.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

lewaimai_pos_windows/control/CWaimaiOrderInfoUI.cpp

@@ -318,6 +318,15 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 	wstring wsPayType = _T("付款方式：") + CLewaimaiString::UTF8ToUnicode(order.m_pay_type);
 	pPayType->SetText(wsPayType.c_str());
 
+	if (CLewaimaiString::UTF8ToUnicode(order.m_pay_type) != L"货到付款")
+	{
+		this->FindSubControl(_T("waimai_order_info_page_huodaofukuan"))->SetVisible(true);
+	}
+	else
+	{
+		this->FindSubControl(_T("waimai_order_info_page_huodaofukuan"))->SetVisible(false);
+	}
+
 	//右侧按钮的控制
 	CButtonUI* confirm_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("waimai_order_info_page_confirme")));
 	CButtonUI* success_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("waimai_order_info_page_success")));

lewaimai_pos_windows/control/CWaimaiOrderItemUI.cpp

@@ -55,16 +55,33 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	{
 		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);
+
+		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());
 
+	//显示预约的戳
+	if (m_is_book == "1")
+	{
+		this->FindSubControl(L"waimai_order_list_yuyue")->SetVisible(true);
+	}
+	else
+	{
+		this->FindSubControl(L"waimai_order_list_yuyue")->SetVisible(false);
+	}
+
 	if (m_status == 1)
 	{
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetVisible(false);

lewaimai_pos_windows_server/conf/zhipuzi_pos_windows_server.conf

@@ -10,6 +10,6 @@ debug_pos_task_queue = prod-windows-pos-push
 release_pos_task_queue = prod-windows-pos-push
 
 #连接阿里云的mns需要用到的参数
-mns.accountendpoint = https://1733013318510961.mns.cn-hangzhou.aliyuncs.com/
-mns.accesskeyid = LTAIpYffXvFnEUzp
-mns.accesskeysecret = F3lqBxo6Uj9pJpLs7btMW5u30X5uKB
+mns.accountendpoint = https://1111769578085953.mns.cn-hangzhou.aliyuncs.com/
+mns.accesskeyid = 2HUnzc9XJV92PjvW
+mns.accesskeysecret = 20mMc8wuzlfC0r323b6oJqxlBPEyjW

lewaimai_pos_windows_server/lewaimai_pos_windows_server_linux.vcxproj.user

@@ -4,7 +4,7 @@
     <ShowAllFiles>true</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <RemoteTarget>906671837;172.16.81.50 (username=, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>-818669173;172.16.1.78 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggerCommand>/usr/local/lewaimai_pos_windows_server/bin/lewaimai_pos_windows_server_linux</RemoteDebuggerCommand>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerWorkingDirectory>/usr/local/lewaimai_pos_windows_server/bin</RemoteDebuggerWorkingDirectory>