挂单UI

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

@@ -7,9 +7,9 @@
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
-		<VerticalLayout name="guadan_wnd_layout" vscrollbar="true" padding="0,10,0,10">
+		<VerticalLayout name="guadan_wnd_layout" vscrollbar="true" padding="12,10,12,10" childpadding="12">
 		
 		</VerticalLayout>
 		
 	</VerticalLayout>
-</Window>
+</Window>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="700,650" caption="0,0,0,36" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
-	<HorizontalLayout name="guadan_food_item" bkcolor="#FFFFFFFF" height="40" padding="15,0,15,0">
-		<Label name="food_name" width="350"></Label>
-		<Label name="food_num" width="150"></Label>
-		<Label name="food_price" width="250"></Label>
+	<HorizontalLayout name="guadan_food_item" bkcolor="#00000000" height="36" padding="18,0,18,0">
+		<Label name="food_name" height="36" font="13" textcolor="#FF1F2329" valign="vcenter" endellipsis="true" padding="0,0,10,0"/>
+		<Label name="food_num" width="84" height="36" font="13" textcolor="#FF5F6368" align="center" valign="vcenter"/>
+		<Label name="food_price" width="110" height="36" font="113" textcolor="#FF1F2329" align="right" valign="vcenter"/>
 	</HorizontalLayout>
-</Window>
+</Window>

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

@@ -1,26 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="700,800" caption="0,0,0,36" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
-	<VerticalLayout name="guadan_order_layout" bkcolor="#FFFFFFFF" padding="30,20,30,0" bordersize="1" bordercolor="#FFEAEAEA">
-		<HorizontalLayout>
-			<Label name="guadan_order_num" text="" width="30" height="40" padding="15,0,0,0"></Label>
-			<Label name="guadan_order_time" text="" width="300" height="40" padding="20,0,0,0"></Label>
-			<Control></Control>
+	<VerticalLayout name="guadan_order_layout" bkimage="file='bb_card8.png' corner='8,8,8,8'">
+		<!-- 卡片头部 44：序号药丸 + 时间 + 件数药丸 -->
+		<HorizontalLayout height="44" padding="18,0,18,0" childvalign="vcenter" childpadding="10">
+			<Label name="guadan_order_num" text="" width="48" height="24" bkimage="gd_num_pill.png" font="113" textcolor="#FFFFFFFF" align="center" valign="vcenter"/>
+			<Label name="guadan_order_time" text="" width="320" height="44" font="13" textcolor="#FF5F6368" valign="vcenter"/>
+			<Control/>
+			<Label name="guadan_order_count" text="" width="76" height="22" bkimage="gd_count_pill.png" font="12" textcolor="#FF2E9B5C" align="center" valign="vcenter"/>
 		</HorizontalLayout>
 		
-		<Control height="1" bkcolor="#FFEAEAEA" padding="15,0,15,0"></Control>
+		<!-- 列名条 30：列宽与明细行严格一致（数量 84 居中 / 金额 110 右对齐） -->
+		<HorizontalLayout height="30" bkcolor="#FFF7F8FA" padding="18,0,18,0">
+			<Label text="商品" height="30" font="12" textcolor="#FF8A9099" valign="vcenter" padding="0,0,10,0"/>
+			<Label text="数量" width="84" height="30" font="12" textcolor="#FF8A9099" align="center" valign="vcenter"/>
+			<Label text="金额" width="110" height="30" font="12" textcolor="#FF8A9099" align="right" valign="vcenter"/>
+		</HorizontalLayout>
 		
 		<VerticalLayout name="guadan_foodlist_layout">
 		
 		</VerticalLayout>
 		
-		<Control height="1" bkcolor="#FFEAEAEA" padding="15,0,15,0"></Control>
+		<Control height="1" bkcolor="#FFF0F1F3" padding="18,0,18,0"/>
 		
-		<HorizontalLayout height="70" valign="center" padding="15,0,0,0">
-			<Label name="guandan_order_zongjia" text="" width="200" height="70"></Label>
-			<Control></Control>
-			<Button name="guadan_order_delete" textcolor="#FFFFFFFF" align="center" width="120" height="45" padding="0,13,0,0" text="删除此单" normalimage="file='btn_border_red.png' corner='5,5,5,5'" hotimage="file='btn_border_red_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_red_Click.png' corner='5,5,5,5'" />
-			<Button name="guadan_order_queren" textcolor="#FFFFFFFF" align="center" width="120" height="45" padding="20,13,20,0" text="取出此单" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+		<!-- 底部 64：总价 + 删除(白底红描边) + 取出(实心绿 r8)
+		     childvalign="vcenter" 让子项在整行内垂直居中；childpadding="10" 给两个按钮留间距 -->
+		<HorizontalLayout height="64" padding="18,0,18,0" childvalign="vcenter" childpadding="10">
+			<Label name="guandan_order_zongjia" text="" width="220" height="34" font="114" textcolor="#FF1F2329" valign="vcenter" showhtml="true"/>
+			<Control/>
+			<Button name="guadan_order_delete" text="删除此单" width="96" height="34" font="13" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'" />
+			<Button name="guadan_order_queren" text="取出此单" width="96" height="34" font="113" textcolor="#FFFFFFFF" normalimage="file='gd_btn_green_n.png' corner='8,8,8,8'" hotimage="file='gd_btn_green_h.png' corner='8,8,8,8'" pushedimage="file='gd_btn_green_p.png' corner='8,8,8,8'" />
 		</HorizontalLayout>
 	</VerticalLayout>
-</Window>
+</Window>

zhipuzi_pos_windows/wnd/CGuadanWnd.cpp

@@ -205,9 +205,11 @@ void CGuadanWnd::RefreshOrder()
 
 		//这个是订单内部的展示商品的区域
 		CVerticalLayoutUI* pFoodLayout = static_cast<CVerticalLayoutUI*>(pEle->FindSubControl(_T("guadan_foodlist_layout")));
-		pFoodLayout->SetFixedHeight(curOrder.getItemNum() * 40);
+		//C1：明细行高 36（与 guadan_wnd_food_item.xml 的 height 一致）
+		pFoodLayout->SetFixedHeight(curOrder.getItemNum() * 36);
 
-		pEle->SetFixedHeight(curOrder.getItemNum() * 40 + 112);
+		//C1：44(头部) + 30(列名条) + N*36(明细) + 1(分隔) + 64(底部) = N*36 + 139，留 1px 余量
+		pEle->SetFixedHeight(curOrder.getItemNum() * 36 + 140);
 
 		for (int i = 0; i < curOrder.getItemNum(); i++)
 		{
@@ -228,7 +230,9 @@ void CGuadanWnd::RefreshOrder()
 		}
 
 		CLabelUI* pPrice = static_cast<CLabelUI*>(pEle->FindSubControl(_T("guandan_order_zongjia")));
-		pPrice->SetText((L"商品总价：" + CLewaimaiString::UTF8ToUnicode(curOrder.getTotalPriceShow())).c_str());
+		//v98：金额用 16px 粗体 + 深绿并带「元」（mini-html，XML 需 showhtml="true"）
+		pPrice->SetText((L"商品总价：<f 116><c #2E9B5C>" + CLewaimaiString::UTF8ToUnicode(curOrder.getTotalPriceShow()) + L" 元</c>").c_str());
+		pPrice->SetFont(pPrice->GetFont());	//清 mini-html 文本缓存
 
 		CLabelUI* pNum = static_cast<CLabelUI*>(pEle->FindSubControl(_T("guadan_order_num")));
 		pNum->SetText((L"#" + std::to_wstring(order_num + 1)).c_str());
@@ -236,6 +240,13 @@ void CGuadanWnd::RefreshOrder()
 		CLabelUI* pTime = static_cast<CLabelUI*>(pEle->FindSubControl(_T("guadan_order_time")));
 		pTime->SetText(CLewaimaiString::UTF8ToUnicode(curOrder.m_guadan_time).c_str());
 
+		//C1：头部右侧件数药丸
+		CLabelUI* pCount = static_cast<CLabelUI*>(pEle->FindSubControl(_T("guadan_order_count")));
+		if (pCount != NULL)
+		{
+			pCount->SetText((L"共" + std::to_wstring(curOrder.getTotalNum()) + L"件").c_str());
+		}
+
 		//给按钮加属性，点击的时候好判断并且处理
 		CButtonUI* pDelete = static_cast<CButtonUI*>(pEle->FindSubControl(_T("guadan_order_delete")));
 		pDelete->AddCustomAttribute(L"order_num", std::to_wstring(order_num).c_str());