开始优化副屏

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Window> 
+	<ListContainerElement name="diandan_cart_item" width="460" height="42">
+		<VerticalLayout>
+			<HorizontalLayout height="42"> 
+				<Label name="diandan_cart_item_name" width="220" height="42" align="left" valign="vcenter" padding="10,0,0,0"  endellipsis="true"/>
+				<Label name="diandan_cart_item_singleprice" width="80" align="center"/> 
+				<Label name="diandan_cart_item_num" width="80" align="center"/> 
+				<Label name="diandan_cart_item_price" width="80" align="center"/>
+			</HorizontalLayout>
+			<Label name="diandan_cart_item_nature" width="220" height="42" align="left" padding="10,0,10,0" textcolor="#FF808080" visible="false" multiline="true" endellipsis="true" />
+		</VerticalLayout>
+	</ListContainerElement> 
+</Window>

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

@@ -2,16 +2,17 @@
 <Window>
 	<Font id="0" name="微软雅黑" size="22" />
 	<Font id="1" name="微软雅黑" size="36" />
+	<Font id="20" name="微软雅黑" size="20" />
 	<Font id="24" name="微软雅黑" size="24" />
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >		
 		<HorizontalLayout>
-			<VerticalLayout width="380">
+			<VerticalLayout width="460">
 				<HorizontalLayout height="50">
-					<Label text="欢迎光临" font="1" align="center" textcolor="#FFFF8910"></Label>
+					<Label text="欢迎光临！" font="1" align="center" textcolor="#FFFF8910"></Label>
 				</HorizontalLayout>
 
-				<HorizontalLayout height="48">
+				<HorizontalLayout height="30" padding="0,10,0,15">
 					<Label name="shopname" text="" font="0" align="center"></Label>
 				</HorizontalLayout>
 				
@@ -20,6 +21,7 @@
 				<List name="list_diandan_cart" padding="0,10,0,0" itemlinecolor="#FF000000" vscrollbar="true">
 					<ListHeader inset="10,0,0,0"/>
 					<ListHeaderItem text="商品" width="220" align="left" />
+					<ListHeaderItem text="单价" width="80" align="center" />
 					<ListHeaderItem text="数量" width="80" align="center" />
 					<ListHeaderItem text="金额" width="80" align="center" />
 				</List>
@@ -30,12 +32,11 @@
 				
 				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 				
-				<VerticalLayout height="90">
-					<HorizontalLayout height="70">
-						<Label name="diandan_page_otherprice" text="" width="160" align="left" padding="15,0,0,0"></Label>
-						<Label name="diandan_page_totalprice" text="总价：¥0.00" font="24" textcolor="#FFFF0000" width="190" align="right" padding="0,0,15,0"></Label>
-					</HorizontalLayout>
-				</VerticalLayout>
+				<HorizontalLayout height="100">
+					<Label name="diandan_page_otherprice" text="" font="20" width="260" align="left" padding="15,40,0,0" multiline="true" endellipsis="true"></Label>
+					<Control></Control>
+					<Label name="diandan_page_totalprice" text="总价：¥0.00" font="24" textcolor="#FFFF0000" width="170" align="right" padding="0,8,15,0"></Label>
+				</HorizontalLayout>
 			</VerticalLayout>
 			
 			<Control width="1" bkcolor="#FFEBE8E8"></Control>

zhipuzi_pos_windows/wnd/CFupingWnd.cpp

@@ -220,7 +220,7 @@ void CFupingWnd::UpdateShow(CDiandanOrder& order, double total_youhui, double to
 		CDiandanOrderItem item = order.getDiandanOrderItem(i);
 
 		CDialogBuilder builder;
-		CListContainerElementUI* pEle = static_cast<CListContainerElementUI*>(builder.Create(_T("diandan_cart_item.xml"), (UINT)0, NULL, &m_pm));
+		CListContainerElementUI* pEle = static_cast<CListContainerElementUI*>(builder.Create(_T("fuping_cart_item.xml"), (UINT)0, NULL, &m_pm));
 
 		pList->Add(pEle);
 
@@ -229,6 +229,9 @@ 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());
 
@@ -246,6 +249,9 @@ 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());