优化了一下副屏

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Window>
 	<!-- 购物车行：直接子项 = 每列一个（本项目 DuiLib 会把直接子项按索引对齐到表头列，勿包整体容器）。
-	     根 inset 10 与 ListHeader 对齐，商品200 + 单价80 + 数量80 + 金额80（总和 440 <= 440） -->
-	<ListContainerElement name="diandan_cart_item" height="56" inset="10,0,10,0">
-		<VerticalLayout width="200">
-			<Label name="diandan_cart_item_name" width="200" height="56" font="18" align="left" valign="vcenter" endellipsis="true"/>
-			<Label name="diandan_cart_item_nature" width="200" height="42" align="left" textcolor="#FF808080" visible="false" wordbreak="true" endellipsis="true"/>
+	     根 inset 与 ListHeader 同宽（左10 / 右15）；商品 227 + 数量 64 + 金额 64 = 355，左列 380。
+	     行高：单行 56，套餐/属性双行 98（由 CFupingWnd.cpp 的 SetFixedHeight 决定） -->
+	<ListContainerElement name="diandan_cart_item" height="56" inset="10,0,15,0">
+		<VerticalLayout width="227">
+			<Label name="diandan_cart_item_name" width="227" height="56" font="16" align="left" valign="vcenter" endellipsis="true"/>
+			<Label name="diandan_cart_item_nature" width="227" height="42" font="12" align="left" textcolor="#FF808080" visible="false" wordbreak="true" endellipsis="true"/>
 		</VerticalLayout>
-		<Label name="diandan_cart_item_singleprice" width="80" font="16" align="center" valign="vcenter"/>
-		<Label name="diandan_cart_item_num" width="80" font="16" align="center" valign="vcenter"/>
-		<Label name="diandan_cart_item_price" width="80" font="118" align="right" valign="vcenter"/>
+		<Label name="diandan_cart_item_num" width="64" font="14" align="center" valign="vcenter"/>
+		<Label name="diandan_cart_item_price" width="64" font="114" align="right" valign="vcenter"/>
 	</ListContainerElement>
 </Window>

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

@@ -3,50 +3,45 @@
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >		
 		<HorizontalLayout>
-			<VerticalLayout width="460">
+			<VerticalLayout width="380">
 						<HorizontalLayout height="105" bkcolor="0xFF3CB371">
 			<VerticalLayout padding="0,22,0,14">
-				<Label text="欢 迎 光 临" font="14" textcolor="#FFFFFFFF" align="center" height="22"></Label>
-				<Label name="shopname" text="" font="130" textcolor="#FFFFFFFF" align="center" height="40"></Label>
+				<Label text="欢 迎 光 临" font="13" textcolor="#FFFFFFFF" align="center" height="22"></Label>
+				<Label name="shopname" text="" font="126" textcolor="#FFFFFFFF" align="center" height="40"></Label>
 			</VerticalLayout>
 		</HorizontalLayout>
 				
-				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 				
 							<List name="list_diandan_cart" padding="0,10,0,0" itemlinecolor="#FF000000" vscrollbar="true">
-				<ListHeader inset="10,0,10,0"/>
-				<ListHeaderItem text="商品" width="200" height="40" font="15" textcolor="#FF5F6368" align="left" />
-				<ListHeaderItem text="单价" width="80" height="40" font="15" textcolor="#FF5F6368" align="center" />
-				<ListHeaderItem text="数量" width="80" height="40" font="15" textcolor="#FF5F6368" align="center" />
-				<ListHeaderItem text="金额" width="80" height="40" font="15" textcolor="#FF5F6368" align="right" />
+				<ListHeader inset="10,0,15,0"/>
+				<ListHeaderItem text="商品" width="227" height="40" font="13" textcolor="#FF5F6368" align="left" />
+				<ListHeaderItem text="数量" width="64" height="40" font="13" textcolor="#FF5F6368" align="center" />
+				<ListHeaderItem text="金额" width="64" height="40" font="13" textcolor="#FF5F6368" align="right" />
 			</List>
 				
 							<!-- 已优惠 明细行 -->
 			<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="32" visible="false">
-				<Label text="已优惠" font="15" textcolor="#FF8A9099" align="left" padding="15,0,0,0"></Label>
+				<Label text="已优惠" font="14" textcolor="#FF8A9099" align="left" padding="15,0,0,0"></Label>
 				<Control></Control>
 				<Label name="diandan_page_youhui_tishi" text="" font="114" textcolor="#FFE14B4A" align="right" padding="0,0,15,0"></Label>
 			</HorizontalLayout>
 
-			<!-- 1px 分隔线 -->
-			<Control height="1" bkcolor="#FFEBE8E8"></Control>
 
 			<!-- 其他费用 明细行 -->
 			<HorizontalLayout name="diandan_page_otherprice_layout" height="32" visible="false">
-				<Label text="其他费用" font="15" textcolor="#FF8A9099" align="left" padding="15,0,0,0"></Label>
+				<Label text="其他费用" font="14" textcolor="#FF8A9099" align="left" padding="15,0,0,0"></Label>
 				<Control></Control>
 				<Label name="diandan_page_otherprice" text="" font="114" textcolor="#FF5F6368" align="right" padding="0,0,15,0"></Label>
 			</HorizontalLayout>
 
 			<!-- 金色总价条 -->
 			<HorizontalLayout height="56" bkcolor="0xFFF3E9D2">
-				<Label text="应付合计" font="118" textcolor="#FF234D33" align="left" padding="15,0,0,0"></Label>
+				<Label text="应付合计" font="16" textcolor="#FF234D33" align="left" padding="15,0,0,0"></Label>
 				<Control></Control>
-				<Label name="diandan_page_totalprice" text="¥0.00" font="128" textcolor="#FF234D33" align="right" padding="0,0,15,0"></Label>
+				<Label name="diandan_page_totalprice" text="¥0.00" font="124" textcolor="#FF234D33" align="right" padding="0,0,15,0"></Label>
 			</HorizontalLayout>
 			</VerticalLayout>
 			
-			<Control width="1" bkcolor="#FFEBE8E8"></Control>
 			
 			<VerticalLayout bkcolor="0xFF3CB371">
 				<HorizontalLayout>

zhipuzi_pos_windows/wnd/CFupingWnd.cpp

@@ -193,10 +193,10 @@ void CFupingWnd::HandleFupingImage()
 		CControlUI* imageControl = static_cast<CControlUI*>(m_pm.FindControl(L"lunbo_image"));
 		imageControl->SetBkImage(image_path.c_str());
 
-		//等待3秒钟，换下一张
-		CSystem::my_sleep(3);
+		//等待5秒钟，换下一张
+		CSystem::my_sleep(5);
 
-		//3秒轮播一次
+		//5秒轮播一次
 		m_curImageNum++;
 
 		continue;
@@ -229,9 +229,6 @@ void CFupingWnd::UpdateShow(CDiandanOrder& order, double total_youhui, double to
 			CLabelUI* pName = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_name")));
 			pName->SetText(CLewaimaiString::UTF8ToUnicode(item.getNameShow()).c_str());
 
-			CLabelUI* pSinglePrice = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_singleprice")));
-			pSinglePrice->SetText(CLewaimaiString::UTF8ToUnicode(item.price).c_str());
-
 			CLabelUI* pNum = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_num")));
 			pNum->SetText(CLewaimaiString::UTF8ToUnicode(item.num).c_str());
 
@@ -249,9 +246,6 @@ void CFupingWnd::UpdateShow(CDiandanOrder& order, double total_youhui, double to
 			CLabelUI* pName = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_name")));
 			pName->SetText(CLewaimaiString::UTF8ToUnicode(item.getNameShow()).c_str());
 
-			CLabelUI* pSinglePrice = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_singleprice")));
-			pSinglePrice->SetText(CLewaimaiString::UTF8ToUnicode(item.price).c_str());
-
 			CLabelUI* pNum = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_num")));
 			pNum->SetText(CLewaimaiString::UTF8ToUnicode(item.num).c_str());
 
@@ -330,9 +324,6 @@ void CFupingWnd::UpdateShow(CZhengcanOrder& order, double total_youhui, double t
 			CLabelUI* pName = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_name")));
 			pName->SetText(CLewaimaiString::UTF8ToUnicode(item.getNameShow()).c_str());
 
-			CLabelUI* pSinglePrice = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_singleprice")));
-			pSinglePrice->SetText(CLewaimaiString::UTF8ToUnicode(item.price).c_str());
-
 			CLabelUI* pNum = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_num")));
 			pNum->SetText(CLewaimaiString::UTF8ToUnicode(item.num).c_str());
 
@@ -350,9 +341,6 @@ void CFupingWnd::UpdateShow(CZhengcanOrder& order, double total_youhui, double t
 			CLabelUI* pName = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_name")));
 			pName->SetText(CLewaimaiString::UTF8ToUnicode(item.getNameShow()).c_str());
 
-			CLabelUI* pSinglePrice = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_singleprice")));
-			pSinglePrice->SetText(CLewaimaiString::UTF8ToUnicode(item.price).c_str());
-
 			CLabelUI* pNum = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_num")));
 			pNum->SetText(CLewaimaiString::UTF8ToUnicode(item.num).c_str());
 
@@ -414,9 +402,6 @@ void CFupingWnd::UpdateShow(CZhengcanOrder& order, double total_youhui, double t
 				pEle->AddCustomAttribute(L"is_tuicai", L"0");
 			}
 
-			CLabelUI* pSinglePrice = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_singleprice")));
-			pSinglePrice->SetText(CLewaimaiString::UTF8ToUnicode(item.price).c_str());
-
 			CLabelUI* pNum = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_num")));
 			pNum->SetText(CLewaimaiString::UTF8ToUnicode(item.num).c_str());