Browse Source

完成了订单详情页面的框架

zhangyang 6 years ago
parent
commit
9c7ccaafe6

File diff suppressed because it is too large
+ 8 - 13
bin/Win32/Debug/zhipuzi_pos_windows/skin/GameRes/main.xml


BIN
bin/Win32/Debug/zhipuzi_pos_windows/zhipuzi_pos_windows.exe


+ 2 - 0
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj

@@ -194,6 +194,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="wnd\CWaimaiOrderInfoUI.h" />
     <ClInclude Include="network\CMessagePush.h" />
     <ClInclude Include="order\CWaimaiOrder.h" />
     <ClInclude Include="tool\CPosPrinter.h" />
@@ -217,6 +218,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="wnd\OrderListUI.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="wnd\CWaimaiOrderInfoUI.cpp" />
     <ClCompile Include="network\CMessagePush.cpp" />
     <ClCompile Include="order\CWaimaiOrder.cpp" />
     <ClCompile Include="tool\CPosPrinter.cpp" />

+ 6 - 0
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.filters

@@ -78,6 +78,9 @@
     <ClInclude Include="network\CMessagePush.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="wnd\CWaimaiOrderInfoUI.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="lewaimai_dispatch_windows.cpp">
@@ -137,6 +140,9 @@
     <ClCompile Include="network\CMessagePush.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="wnd\CWaimaiOrderInfoUI.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="conf\dispatch.conf" />

+ 9 - 0
lewaimai_dispatch/wnd/CWaimaiOrderInfoUI.cpp

@@ -0,0 +1,9 @@
+#include "../pch/pch.h"
+#include "CWaimaiOrderInfoUI.h"
+
+#include "ControlEx.h"
+
+void CWaimaiOrderInfoUI::DoEvent(TEventUI& event)
+{
+	CHorizontalLayoutUI::DoEvent(event);
+}

+ 29 - 0
lewaimai_dispatch/wnd/CWaimaiOrderInfoUI.h

@@ -0,0 +1,29 @@
+#pragma once
+
+class CWaimaiOrderInfoUI : public CHorizontalLayoutUI
+{
+public:
+	CWaimaiOrderInfoUI()
+	{
+
+	}
+
+	//刷新当前页面的内容,注意这个函数不会改变当前的订单状态以及“页数”
+	void DoEvent(TEventUI& event);
+
+	void SetStatus(int status)
+	{
+		m_status = status;
+	}
+
+	void SetPage(int n)
+	{
+		m_page = n;
+	}
+
+private:
+	int m_status = 1; //1:未处理 2:已确认 3:配送中 4:成功 5:失败 6:退款中
+	int m_page = 1;
+
+	int m_total_page; //总页数
+};

+ 5 - 0
lewaimai_dispatch/wnd/ControlEx.h

@@ -4,6 +4,7 @@
 
 #include "CWaimaiOrderItemUI.h"
 #include "OrderListUI.h"
+#include "CWaimaiOrderInfoUI.h"
 
 class CDialogBuilderCallbackEx : public IDialogBuilderCallback
 {
@@ -18,6 +19,10 @@ public:
 		{
 			return new CWaimaiOrderItemUI;
 		}
+		else if (_tcscmp(pstrClass, _T("WaimaiOrderInfo")) == 0)
+		{
+			return new CWaimaiOrderInfoUI;
+		}
 
 		return NULL;
 	}