完成订单的UI优化，以及会员的部分UI优化

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

@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="600,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
-	
+
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
 		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
-			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<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>
-		
-		<HorizontalLayout>
-			<VerticalLayout>
-				<Label name="name" text="" height="30" padding="30,100,0,0" align="center" font="20"/>
-				
-				<HorizontalLayout height="56" valign="center" padding="30,100,0,20">
-					<Control></Control>
-					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="250" padding="0,0,0,0" 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'" />
-					<Control></Control>
-				</HorizontalLayout>
-			</VerticalLayout>
+
+		<!-- 正文区：高 290，文字水平+垂直居中，左右内边距 50，16px #1F2329（对齐设计稿 .ctext-wrap/.ctext） -->
+		<HorizontalLayout height="290" childalign="center" childvalign="vcenter" padding="50,0,50,0">
+			<Label name="name" text="" font="16" textcolor="#FF1F2329" align="center" wordbreak="true" width="500" height="30"/>
 		</HorizontalLayout>
-		
+
+		<!-- 确认按钮：250x40 水平居中，底部留白 60（对齐设计稿 margin:0 auto 60px） -->
+		<HorizontalLayout height="40" childalign="center">
+			<Button name="save" text="确认" textcolor="#FFFFFFFF" height="40" width="250" 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'" font="114"/>
+		</HorizontalLayout>
+		<Control height="60"/>
+
 	</VerticalLayout>
-</Window>
+</Window>

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

@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Window> 
-	<ListContainerElement name="diannei_order_info_page_listitem" height="30" minheight="30"> 
-		<HorizontalLayout height="38"> 
-			<Label name="diannei_order_info_page_listitem_foodname" /> 
-			<Label name="diannei_order_info_page_listitem_quantity" width="200" align="center"/> 
-			<Label name="diannei_order_info_page_listitem_price" width="200" align="center"/> 
-		</HorizontalLayout> 
-	</ListContainerElement> 
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>
+	<ListContainerElement name="diannei_order_info_page_listitem" height="34" minheight="34" bordercolor="#FFF0F1F3" bordersize="0,0,0,1">
+		<Label name="diannei_order_info_page_listitem_foodname" font="13" textcolor="#FF1F2329" align="left" textpadding="11,0,0,0" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+		<Label name="diannei_order_info_page_listitem_quantity" width="167" align="center" font="13" textcolor="#FF1F2329" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+		<Label name="diannei_order_info_page_listitem_price" width="194" align="center" font="13" textcolor="#FF1F2329" bordercolor="#FFE8EAED" bordersize="0,0,1,0" />
+	</ListContainerElement>
 </Window>

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

@@ -1,24 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<DianneiOrderItem height="170" bkcolor="#FFFFFFFF" padding="15,15,15,0" borderround="10,10">
-		<HorizontalLayout>
-			<Label float="true" name="diannei_order_list_order_num" text="订单号：" pos="10,6,320,36" />
-			<Label float="true" name="diannei_order_list_qucanhao" text="取餐码：" pos="350,6,582,36" />			
-			
-			<Label float="true" name="diannei_order_list_zhuowei" text="桌位：" pos="10,36,320,66" />
-			<Label float="true" name="diannei_order_list_renshu" text="人数：" pos="350,36,600,66" />			
-			
-			<Label float="true" name="diannei_order_list_init_date" text="下单时间：" pos="10,66,300,96" />
-			
-			<Label float="true" name="diannei_order_list_zhifu_type" text="支付方式：" pos="10,96,400,126" />
-			<Label float="true" name="diannei_order_list_price" text="价格：" pos="350,96,500,126" />
-			
-			<Label float="true" name="diannei_order_list_from" text="订单来源：" pos="10,126,500,156" />
-		</HorizontalLayout>
-		
-		<HorizontalLayout width="200">
-			<Button name="diannei_order_list_info" float="true" pos="100,6,180,44" text="详情" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-			<Button name="diannei_order_list_print" float="true" pos="100,54,180,92" text="打印" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-		</HorizontalLayout>
+	<DianneiOrderItem height="178">
+		<VerticalLayout>
+			<Control height="18" bkcolor="#FFF5F7FA" />
+			<VerticalLayout height="160" bkimage="file='waimai_card_bg.png' corner='8,8,8,8'" padding="20,0,20,0">
+				<Control name="diannei_order_item_leftbar" float="true" pos="0,0,4,160" bkimage="waimai_bar_green.png" />
+				<HorizontalLayout height="160">
+					<HorizontalLayout>
+						<Label float="true" name="diannei_order_list_order_num" text="订单号" pos="20,20,110,50" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_order_num_val" pos="110,20,560,50" textcolor="#FF1F2329" />
+						<Label float="true" name="diannei_order_list_zhuowei" text="桌位" pos="20,50,110,80" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_zhuowei_val" pos="110,50,560,80" textcolor="#FF1F2329" />
+						<Label float="true" name="diannei_order_list_zhifu_type" text="支付方式" pos="20,80,110,110" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_zhifu_type_val" pos="110,80,560,110" textcolor="#FF1F2329" />
+						<Label float="true" name="diannei_order_list_from" text="订单来源" pos="20,110,110,140" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_from_val" pos="110,110,560,140" textcolor="#FF1F2329" />
+
+						<Label float="true" name="diannei_order_list_qucanhao" text="取餐码" pos="620,20,710,50" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_qucanhao_val" pos="710,20,1180,50" textcolor="#FF1F2329" />
+						<Label float="true" name="diannei_order_list_renshu" text="人数" pos="620,50,710,80" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_renshu_val" pos="710,50,1180,80" textcolor="#FF1F2329" />
+						<Label float="true" name="diannei_order_list_init_date" text="下单时间" pos="620,80,710,110" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_init_date_val" pos="710,80,1180,110" textcolor="#FF1F2329" />
+						<Label float="true" name="diannei_order_list_price" text="价格" pos="620,110,710,140" textcolor="#FF8A9099" />
+						<Label float="true" name="diannei_order_list_price_val" pos="710,110,1180,140" textcolor="#FF509962" />
+					</HorizontalLayout>
+
+					<HorizontalLayout width="120">
+						<Button name="diannei_order_list_info" float="true" pos="0,43,100,75" text="详情" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+						<Button name="diannei_order_list_print" float="true" pos="0,84,100,116" text="打印" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+					</HorizontalLayout>
+				</HorizontalLayout>
+			</VerticalLayout>
+		</VerticalLayout>
 	</DianneiOrderItem>
-</Window>
+</Window>

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

@@ -2,60 +2,101 @@
 <Window>
 	<DianneiOrderInfoPage>
 		<VerticalLayout>
-			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-				<Button name="diannei_order_info_page_return" float="true" pos="20,6,120,38" text="返回" textcolor="#FFFFFFFF"/>
+			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+				<Button name="diannei_order_info_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+				<Label text="订单详情" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
 			</HorizontalLayout>
 
-			<HorizontalLayout>
+			<HorizontalLayout bkcolor="#FFF5F7FA">
 				<VerticalLayout name="diannei_order_info_page_orderlayout" padding="20,20,20,20" vscrollbar="true">
-					<VerticalLayout name="diannei_order_info_page_layout_1" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="20,20,20,20" borderround="10,10" >
-						<HorizontalLayout height="30">
-							<Label float="true" name="diannei_order_info_page_order_num" text="订单号：" pos="0,0,500,20" />
+					<VerticalLayout name="diannei_order_info_page_layout_1" bkcolor="#FFFFFFFF" padding="0,0,0,8" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<HorizontalLayout height="41">
+							<Label text="订单号" width="80" height="41" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_order_num" text="-" height="41" font="13" textcolor="#FF1F2329" />
 						</HorizontalLayout>
 
-						<Control height="1" bkcolor="#FFEAEAEA" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
 
-						<List name="diannei_order_info_page_foodlist">
-							<ListHeader />
-							<ListHeaderItem text="商品" align="left" />
-							<ListHeaderItem text="数量" width="200" align="center" />
-							<ListHeaderItem text="单价" width="200" align="center" />
-						</List>  
+						<Control height="12" />
 
-						<Control height="10" />
+						<List name="diannei_order_info_page_foodlist">
+							<ListHeader height="35" bkcolor="#FFF5F7FA" bordercolor="#FFE8EAED" bordersize="1" />
+							<ListHeaderItem text="商品" align="left" font="13" textcolor="#FF8A9099" textpadding="11,0,0,0" />
+							<ListHeaderItem text="数量" width="167" align="center" font="13" textcolor="#FF8A9099" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+							<ListHeaderItem text="单价" width="194" align="center" font="13" textcolor="#FF8A9099" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+						</List>
 
-						<Label name="dianneiorder_info_page_memo" minheight="30" wordbreak="true" text="备注：" />
+						<Control height="12" />
 
-						<Control height="1" bkcolor="#FFEAEAEA" />
+						<HorizontalLayout height="30">
+							<Label text="备注" width="80" height="30" font="13" textcolor="#FF8A9099" />
+							<Label name="dianneiorder_info_page_memo" text="-" height="30" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 
-						<VerticalLayout name="diannei_order_info_page_fees">				
+						<VerticalLayout name="diannei_order_info_page_fees">
 
 						</VerticalLayout>
-						
-						<Control name="diannei_order_info_page_fees_line" height="1" bkcolor="#FFEAEAEA" />
-						
-						<Label name="diannei_order_info_page_totalprice" height="40" padding="0,0,30,0" align="right" text="总计：" />
+
+						<Control name="diannei_order_info_page_fees_line" height="1" bkcolor="#FFFFFFFF" />
+
+						<HorizontalLayout name="diannei_order_info_page_totalprice" height="36">
+							<Control />
+							<Label name="diannei_order_info_page_totalprice_lab" text="总计：" height="36" autocalcwidth="true" align="right" font="13" textcolor="#FF1F2329" />
+							<Label name="diannei_order_info_page_totalprice_val" text="0.00" height="36" autocalcwidth="true" align="right" font="120" textcolor="#FF509962" />
+						</HorizontalLayout>
+					</VerticalLayout>
+
+					<VerticalLayout name="diannei_order_info_page_layout_2" height="132" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="用餐信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout height="31">
+							<Label text="桌号" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_zhuohao" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="人数" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_renshu" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 					</VerticalLayout>
 
-					<VerticalLayout name="diannei_order_info_page_layout_2" height="105" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="20,20,20,20" borderround="10,10">
-						<Label name="diannei_order_info_page_zhuohao" text="桌号：" height="30" />
-						<Label name="diannei_order_info_page_renshu" text="人数：" height="30" />
-					</VerticalLayout>			
-					
-					<VerticalLayout name="diannei_order_info_page_layout_3" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="20,20,20,20" borderround="10,10">
-						<Label name="diannei_order_info_page_qucanma" text="取餐码：" height="30" />
-						<Label name="diannei_order_info_page_init_date" text="下单时间：" height="30" />
-						<Label name="diannei_order_info_page_type" height="30" text="订单来源：" />
-						<Label name="diannei_order_info_page_pay_type" height="30" text="付款方式：" />
-						<Label name="diannei_order_info_page_refund_status" height="30" text="退款状态：" />						
+					<VerticalLayout name="diannei_order_info_page_layout_3" height="225" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="订单信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout height="31">
+							<Label text="取餐码" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_qucanma" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="下单时间" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_init_date" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="订单来源" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_type" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="付款方式" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_pay_type" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="退款状态" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="diannei_order_info_page_refund_status" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 					</VerticalLayout>
 				</VerticalLayout>
 
-				<HorizontalLayout width="250" height="200" bkcolor="#FFFFFFFF" padding="0,20,20,0" borderround="10,10">
-					<Button name="diannei_order_info_page_print" float="true" pos="50,60,200,98" text="打印" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-					<Button name="diannei_order_info_page_refund" float="true" pos="50,108,200,146" text="退款" textcolor="#FFFFFFFF" 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'" />
+				<HorizontalLayout width="250" height="400">
+					<Button name="diannei_order_info_page_print" float="true" pos="0,20,230,60" text="打印" normalimage="file='btn_border_white.png' corner='6,6,6,6'" hotimage="file='btn_border_white_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_white_Click.png' corner='6,6,6,6'" />
+					<Button name="diannei_order_info_page_refund" float="true" pos="0,72,230,112" text="退款" textcolor="#FFFFFFFF" normalimage="file='btn_border_red.png' corner='6,6,6,6'" hotimage="file='btn_border_red_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_red_Click.png' corner='6,6,6,6'" />
 				</HorizontalLayout>
 			</HorizontalLayout>
 		</VerticalLayout>
 	</DianneiOrderInfoPage>
-</Window>
+</Window>

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

@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<DianneiOrderListPage>
-		<VerticalLayout>
+		<VerticalLayout bkcolor="#FFF5F7FA">
 			<HorizontalLayout height="53" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 				<VerticalLayout width="300" height="53">
 					<Button name="orderlist_waimai" text="外卖订单" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_waimai_line" visible="false" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+					<Control name="orderlist_waimai_line" visible="false" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
-				
+
 				<VerticalLayout width="300" height="53">
-					<Button name="orderlist_diannei" text="店内订单" textcolor="#FF43A947" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_diannei_line" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+					<Button name="orderlist_diannei" text="店内订单" textcolor="#FF60A753" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="orderlist_diannei_line" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
 			</HorizontalLayout>
-			
-			<Control height="1" bkcolor="#FFEAEAEA" padding="0,0,0,0"></Control>
-			
-			<HorizontalLayout bkcolor="#FFFFFFFF" height="70">
-				<Button name="orderlist_diandan_btn" text="点单订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF60B177"></Button>
-				
-				<Button name="orderlist_zhengcan_btn" text="正餐订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
-				
-				<Button name="orderlist_shoukuan_btn" text="收款订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
+
+			<Control height="1" bkcolor="#FFE8EAED" padding="0,0,0,0"></Control>
+
+			<HorizontalLayout height="56" bkcolor="#FFFFFFFF">
+				<HorizontalLayout width="700" height="38" padding="20,9,0,0">
+					<Control float="true" pos="0,0,700,38" bkimage="file='seg_track.png' corner='10,10,10,10'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_diandan" float="true" pos="4,3,232,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_zhengcan" visible="false" float="true" pos="236,3,464,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_shoukuan" visible="false" float="true" pos="468,3,696,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Button name="orderlist_diandan_btn" text="点单订单" font="13" textcolor="#FF60A753" float="true" pos="4,3,232,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+					<Button name="orderlist_zhengcan_btn" text="正餐订单" font="13" textcolor="#FF5F6368" float="true" pos="236,3,464,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+					<Button name="orderlist_shoukuan_btn" text="收款订单" font="13" textcolor="#FF5F6368" float="true" pos="468,3,696,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+				</HorizontalLayout>
 			</HorizontalLayout>
 
-			<HorizontalLayout>										
+			<Control height="1" bkcolor="#FFE8EAED" padding="0,0,0,0"></Control>
+
+			<HorizontalLayout>
 				<VerticalLayout name="orderlist" vscrollbar="true">
-				
+
 				</VerticalLayout>
-				
+
 				<HorizontalLayout name="main_orderlist_loading">
 					<Control></Control>
 					<VerticalLayout width="24">
@@ -41,16 +47,16 @@
 					<Control></Control>
 				</HorizontalLayout>
 			</HorizontalLayout>
-			
-			<Control height="1" bkcolor="#FFEAEAEA"></Control>
+
+			<Control height="1" bkcolor="#FFE8EAED"></Control>
 
 			<HorizontalLayout height="52" bkcolor="#FFFFFFFF" >
 				<Control />
-				<Button name="diannei_order_list_refresh" width="70" height="44" padding="20,4,0,0" text="刷新" textcolor="#FFFFFFFF" />
-				<Button name="diannei_order_list_last" width="70" height="44" padding="20,4,0,0" text="上一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Button name="diannei_order_list_next" width="70" height="44" padding="20,4,0,0" text="下一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Label name="diannei_order_list_page" width="150" height="44" padding="20,4,0,0" />
+				<Button name="diannei_order_list_refresh" width="64" height="36" padding="13,8,0,0" text="刷新" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'" />
+				<Button name="diannei_order_list_last" width="77" height="36" padding="13,8,0,0" text="上一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+				<Button name="diannei_order_list_next" width="77" height="36" padding="13,8,0,0" text="下一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+				<Label name="diannei_order_list_page" width="110" height="36" padding="13,8,0,0" textcolor="#FF5F6368" />
 			</HorizontalLayout>
 		</VerticalLayout>
 	</DianneiOrderListPage>
-</Window>
+</Window>

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

@@ -5,54 +5,66 @@
 			<Label name="shoukuan_version" text="添加会员" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
-		
-		<HorizontalLayout visible="true" name="shoukuan_before_pay_layout">
-			<VerticalLayout height="520" padding="0,20,0,0">					
-				<HorizontalLayout height="50" padding="0,20,0,0">
-					<Label text="手机号：" font="18" float="true" pos="30,12,180,40"/>
-					<Edit name="phone_edit" float="true" pos="128,12,355,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+
+		<!-- ===== 对齐设计稿 .add-body（padding 10,8,0,22；form 426；gap 24；keypad 320）===== -->
+		<HorizontalLayout visible="true" name="shoukuan_before_pay_layout" padding="22,10,8,0" childpadding="24">
+
+			<!-- 左表单：固定 426 宽；行高 40；标签 124 与控件之间无间距 -->
+			<VerticalLayout width="426" height="458">
+				<HorizontalLayout height="40" childvalign="vcenter">
+					<Label text="手机号：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Edit name="phone_edit" width="292" height="34" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" bkcolor="#FFFFFFFF" nativebkcolor="#FFFFFFFF" tipvalue="请输入会员手机号" tipvaluecolor="#FF8A9099" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" focusedimage="file='gd_input_p.png' corner='8,8,8,8'"/>
 				</HorizontalLayout>
-				
-				<HorizontalLayout height="50" padding="0,35,0,0">
-					<Label text="密码登录" font="18" float="true" pos="30,12,180,40" />
-					<CheckBox name="password_pay_open" selected="true" float="true" pos="128,12,200,57" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+
+				<HorizontalLayout height="40" childvalign="vcenter">
+					<Label text="密码登录" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<CheckBox name="password_pay_open" selected="true" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" hotimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 				</HorizontalLayout>
-				
-				<HorizontalLayout height="50" padding="0,35,0,0">
-					<Label text="登录密码：" font="18" float="true" pos="30,12,180,40"/>
-					<Edit name="password_edit" password="true" float="true" pos="128,12,355,48" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+
+				<HorizontalLayout height="40" childvalign="vcenter">
+					<Label text="登录密码：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Edit name="password_edit" password="true" width="292" height="34" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" bkcolor="#FFFFFFFF" nativebkcolor="#FFFFFFFF" tipvalue="请输入登录密码" tipvaluecolor="#FF8A9099" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" focusedimage="file='gd_input_p.png' corner='8,8,8,8'"/>
 				</HorizontalLayout>
-				
-				<HorizontalLayout height="56" valign="center" padding="30,100,0,20">
-					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="380" padding="0,0,0,0" 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'" />
+
+				<HorizontalLayout height="34" childvalign="vcenter">
+					<Label name="shoukuanresult" font="14" width="426" height="34" wordbreak="true" text="" visible="false" textcolor="#FFE14B4A" align="center" />
+				</HorizontalLayout>
+
+				<Control />
+
+				<HorizontalLayout height="40">
+					<Button name="save" text="确认" textcolor="#FFFFFFFF" height="40" width="426" 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'" font="114"/>
+				</HorizontalLayout>
+
+				<!-- 底部留白 60，使确认按钮底边距与设计稿一致 -->
+				<Control height="60" />
+			</VerticalLayout>
+
+			<!-- 右侧数字键盘：320 宽；键 100x110；列距 10；行距 6 -->
+			<VerticalLayout width="320" height="458" childpadding="6">
+				<HorizontalLayout width="320" height="110" childpadding="10">
+					<Button name="jianpan_1" text="1" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_2" text="2" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_3" text="3" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+				</HorizontalLayout>
+				<HorizontalLayout width="320" height="110" childpadding="10">
+					<Button name="jianpan_4" text="4" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_5" text="5" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_6" text="6" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+				</HorizontalLayout>
+				<HorizontalLayout width="320" height="110" childpadding="10">
+					<Button name="jianpan_7" text="7" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_8" text="8" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_9" text="9" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+				</HorizontalLayout>
+				<HorizontalLayout width="320" height="110" childpadding="10">
+					<Button name="jianpan_qingkong" text="清空" font="15" textcolor="#FF5F6368" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_0" text="0" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+					<Button name="jianpan_x" text="×" font="24" textcolor="#FF5F6368" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
 				</HorizontalLayout>
 			</VerticalLayout>
-			
-			<HorizontalLayout width="340" height="406" bkcolor="#FFF3F3F3">
-				<Button name="jianpan_1" text="1" font="24" heiht="60" width="60" float="true" pos="10,0,110,90" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_2" text="2" font="24" heiht="60" width="60" float="true" pos="120,0,220,90" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_3" text="3" font="24" heiht="60" width="60" float="true" pos="230,0,330,90" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				
-				<Button name="jianpan_4" text="4" font="24" heiht="60" width="60" float="true" pos="10,100,110,190" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_5" text="5" font="24" heiht="60" width="60" float="true" pos="120,100,220,190" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_6" text="6" font="24" heiht="60" width="60" float="true" pos="230,100,330,190" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				
-				<Button name="jianpan_7" text="7" font="24" heiht="60" width="60" float="true" pos="10,200,110,290" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_8" text="8" font="24" heiht="60" width="60" float="true" pos="120,200,220,290" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_9" text="9" font="24" heiht="60" width="60" float="true" pos="230,200,330,290" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				
-				<Button name="jianpan_qingkong" text="清空" font="24" heiht="60" width="60" float="true" pos="10,300,110,390" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_0" text="0" font="24" heiht="60" width="60" float="true" pos="120,300,220,390" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_x" text="X" font="24" heiht="60" width="60" float="true" pos="230,300,330,390" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-			</HorizontalLayout>
-		</HorizontalLayout>
-		
-		<HorizontalLayout height="50" padding="0,20,0,0">
-			<Control></Control>
-			<Label name="shoukuanresult" font="18" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
-			<Control></Control>
 		</HorizontalLayout>
-		
+
 		<VerticalLayout name="shoukuan_paying_layout" visible="false">
 			<HorizontalLayout name="shoukuan_paying_loading" height="24" padding="0, 20, 0, 20">
 				<Control></Control>
@@ -65,30 +77,30 @@
 				</VerticalLayout>
 				<Control></Control>
 			</HorizontalLayout>
-			
+
 			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额：" font="32" textcolor="0xFF60B177" align="center"></Label>
-			
+
 			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF60B177" align="center"></Label>
-			
+
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功，则请确认客户不再进行支付时再关闭此窗口，按【Esc】取消本次支付" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
-		
-		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
+
+		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
 			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款：" font="32" textcolor="0xFF60B177" align="center"></Label>
-			
+
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
-		
+
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
 			<HorizontalLayout height="100" padding="0,20,0,0">
 				<Control></Control>
 				<Control bkimage="pay_fail.png" width="100" height="100" align="center"></Control>
 				<Control></Control>
 			</HorizontalLayout>
-			
+
 			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="32" textcolor="0xFFD33E3A" align="center"></Label>
-			
+
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
-</Window>
+</Window>

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

@@ -17,7 +17,7 @@
 
 				<Control height="12" />
 
-				<Button name="huiiyuan_page_sousuo_btn" height="46" text="搜索" font="15" textcolor="#FFFFFFFF" 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'" />
+				<Button name="huiiyuan_page_sousuo_btn" height="46" text="搜索" font="15" 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'" />
 
 				<Control />
 
@@ -134,17 +134,17 @@
 						<Label text="常用操作" font="12" textcolor="#FF8A9099" height="20" />
 						<Control height="10" />
 						<HorizontalLayout height="40" childpadding="10">
-							<Button name="huiiyuan_page_chongzhi_btn" width="110" height="40" text="会员充值" font="15" textcolor="#FFFFFFFF" 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'" disabledimage="file='btn_gray_disabled.png' corner='8,8,8,8'" />
-							<Button name="huiiyuan_page_xiugaiziliao_btn" width="100" height="40" text="修改资料" font="15" textcolor="#FF60B177" normalimage="file='btn_border_green.png' corner='8,8,8,8'" hotimage="file='btn_border_green_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_green_Click.png' corner='8,8,8,8'" />
+							<Button name="huiiyuan_page_chongzhi_btn" width="110" height="40" text="会员充值" font="15" 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'" disabledimage="file='btn_gray_disabled.png' corner='8,8,8,8'" />
+							<Button name="huiiyuan_page_xiugaiziliao_btn" width="100" height="40" text="修改资料" font="15" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'" />
 							<Button name="huiiyuan_page_xiugaipassword_btn" width="118" height="40" text="修改登录密码" font="15" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'" />
 							<Button name="huiiyuan_page_bangka_btn" width="100" height="40" text="绑定实体卡" font="15" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'" disabledimage="file='btn_gray_disabled.png' corner='8,8,8,8'" />
 							<Button name="huiiyuan_page_guashi_btn" width="100" height="40" text="挂失实体卡" font="15" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'" disabledimage="file='btn_gray_disabled.png' corner='8,8,8,8'" />
 							<Button name="huiiyuan_page_dongjie_btn" width="100" height="40" text="会员冻结" font="15" textcolor="#FFFFFFFF" normalimage="file='btn_red_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_red_dianji.png' corner='5,5,5,5'" />
-							<Button name="huiiyuan_page_jiedong_btn" width="100" height="40" text="会员解冻" font="15" textcolor="#FFFFFFFF" visible="false" 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'" />
+							<Button name="huiiyuan_page_jiedong_btn" width="100" height="40" text="会员解冻" font="15" textcolor="#FFFFFFFF" visible="false" 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>
 				</VerticalLayout>
 			</VerticalLayout>
 		</HorizontalLayout>
 	</HuiyuanPage>
-</Window>
+</Window>

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

@@ -4,41 +4,44 @@
 		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="修改登录密码" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
-		</HorizontalLayout>		
+		</HorizontalLayout>
 
-		<VerticalLayout padding="0,0,0,0">
-			<VerticalLayout height="300">
-				<HorizontalLayout height="34" padding="0,15,0,0">
-					<Label name="member_phone" text="手机号：" font="18" float="true" pos="30,0,280,34"/>
-				</HorizontalLayout>
-				
-				<HorizontalLayout height="45" padding="0,15,0,0">
-					<Label text="密码登录" font="18" float="true" pos="30,0,180,45" />
-					<CheckBox name="password_pay_open" selected="true" float="true" pos="128,0,200,45" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+		<VerticalLayout padding="22,10,22,60">
+			<HorizontalLayout height="40" childvalign="vcenter">
+				<Label text="手机号：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+				<Label name="member_phone" text="" width="400" height="34" textcolor="#FF1F2329" font="13" align="left" valign="center"/>
+			</HorizontalLayout>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="密码登录" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<CheckBox name="password_pay_open" selected="true" width="46" height="26" maxheight="26" normalimage="file='gd_switch_off.png'" hotimage="file='gd_switch_off.png'" selectedimage="file='gd_switch_on.png'"/>
 				</HorizontalLayout>
-				
-				<HorizontalLayout height="34" padding="0,15,0,0">
-					<Label text="登录密码：" font="18" float="true" pos="30,0,180,34"/>
-					<Edit name="password_edit" password="true" float="true" pos="128,0,355,34" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+			</HorizontalLayout>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="登录密码：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Edit name="password_edit" password="true" width="292" height="34" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" pushedimage="file='gd_input_p.png' corner='8,8,8,8'"/>
 				</HorizontalLayout>
-				
-				<HorizontalLayout height="34" padding="0,15,0,0">
-					<Label text="确认密码：" font="18" float="true" pos="30,0,180,34"/>
-					<Edit name="password_edit_2" password="true" float="true" pos="128,0,355,34" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+			</HorizontalLayout>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="确认密码：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Edit name="password_edit_2" password="true" width="292" height="34" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" bkcolor="#FFFFFFFF" nativebkcolor="#FFFFFFFF" tipvalue="请再次输入登录密码" tipvaluecolor="#FF8A9099" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" focusedimage="file='gd_input_p.png' corner='8,8,8,8'"/>
 				</HorizontalLayout>
-			</VerticalLayout>
-			
-			<HorizontalLayout height="50" padding="0,20,0,0">
-				<Control></Control>
-				<Label name="shoukuanresult" font="18" width="380" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
-				<Control></Control>
 			</HorizontalLayout>
-			
-			<HorizontalLayout height="50" valign="center" padding="235,0,0,0">
-				<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="330" padding="0,0,0,0" 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'" />
+
+			<HorizontalLayout height="34" childalign="center">
+				<Label name="shoukuanresult" font="14" width="500" height="34" wordbreak="true" text="" visible="false" textcolor="#FFE14B4A" align="center" />
+			</HorizontalLayout>
+
+			<Control />
+
+			<HorizontalLayout height="40" childalign="center">
+				<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="40" width="432" 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'" font="114"/>
 			</HorizontalLayout>
-			
-			<Control></Control>
 		</VerticalLayout>
     </VerticalLayout>
-</Window>
+</Window>

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

@@ -4,61 +4,63 @@
 		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="修改会员资料" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
-		</HorizontalLayout>		
+		</HorizontalLayout>
 
-		<VerticalLayout padding="0,0,0,0">
-			<HorizontalLayout height="420">
-				<VerticalLayout width="420">
-					<HorizontalLayout height="36" padding="0,15,0,0">
-						<Label name="member_phone" text="手机号：" font="18" float="true" pos="30,0,280,36"/>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="36" padding="0,15,0,0">
-						<Label text="会员卡号：" font="18" float="true" pos="30,0,180,36"/>
-						<Edit name="kahao_edit" float="true" pos="128,0,355,36" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="36" padding="0,15,0,0">
-						<Label text="会员姓名：" font="18" float="true" pos="30,0,180,36"/>
-						<Edit name="name_edit" float="true" pos="128,0,355,36" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="36" padding="0,15,0,0">
-						<Label text="会员性别：" font="18" width="80" height="36" padding="30,0,0,0" />
-						
-						<HorizontalLayout padding="20,0,0,0" width="40" height="30">
-							<CheckBox name="xingbie_setting_nan" group="jinezhuaqu_setting_type" selected="true" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-							<Label name="xingbie_setting_nan_name" text="男" width="300" padding="10,0,0,0"/>
-						</HorizontalLayout>
-						<HorizontalLayout padding="20,0,0,0" width="40" height="30">
-							<CheckBox name="xingbie_setting_nv" group="jinezhuaqu_setting_type" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-							<Label name="xingbie_setting_nv_name" text="女" width="300" padding="10,0,0,0"/>
-						</HorizontalLayout>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="36" padding="0,15,0,0">
-						<Label text="会员地址：" font="18" float="true" pos="30,0,180,36"/>
-						<Edit name="address_edit" float="true" pos="128,0,355,36" normalimage="file='Chat_InputBox_BG.png' corner='4,4,4,4'" hotimage="file='Chat_InputBox_BG_Hover.png' corner='4,4,4,4'" />
+		<VerticalLayout padding="22,10,22,60">
+			<HorizontalLayout height="40" childvalign="vcenter">
+				<Label text="手机号：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+				<Label name="member_phone" text="" width="400" height="34" textcolor="#FF1F2329" font="13" align="left" valign="center"/>
+			</HorizontalLayout>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="会员卡号：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Edit name="kahao_edit" width="292" height="34" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" pushedimage="file='gd_input_p.png' corner='8,8,8,8'"/>
+				</HorizontalLayout>
+			</HorizontalLayout>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="会员姓名：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Edit name="name_edit" width="292" height="34" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" pushedimage="file='gd_input_p.png' corner='8,8,8,8'"/>
+				</HorizontalLayout>
+			</HorizontalLayout>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="会员性别：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<HorizontalLayout childpadding="7" childvalign="vcenter">
+						<CheckBox name="xingbie_setting_nan" group="jinezhuaqu_setting_type" selected="true" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+						<Label name="xingbie_setting_nan_name" text="男" height="34" autocalcwidth="true" textcolor="#FF5F6368" font="13" valign="center"/>
+						<CheckBox padding="9,0,0,0" name="xingbie_setting_nv" group="jinezhuaqu_setting_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+						<Label name="xingbie_setting_nv_name" text="女" height="34" autocalcwidth="true" textcolor="#FF5F6368" font="13" valign="center"/>
 					</HorizontalLayout>
-					
-					<HorizontalLayout height="36" padding="0,15,0,0">
-						<Label text="会员生日：" font="18" float="true" pos="30,0,180,36"/>
-						<Datetime name="shengri_date" float="true" pos="128,0,308,36" width="180" height="36" bordersize="1" bordercolor="#FF000000"></Datetime>
-					</HorizontalLayout>	
-				</VerticalLayout>
-				
-				<HorizontalLayout height="50" padding="0,200,0,0">
-					<Control></Control>
-					<Label name="shoukuanresult" font="18" width="380" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
-					<Control></Control>
 				</HorizontalLayout>
-			</HorizontalLayout>	
-			
-			<HorizontalLayout height="50" valign="center" padding="235,0,0,0">
-				<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="330" padding="0,0,0,0" 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'" />
 			</HorizontalLayout>
-			
-			<Control></Control>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="会员地址：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Edit name="address_edit" width="292" height="34" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" normalimage="file='gd_input_n.png' corner='8,8,8,8'" hotimage="file='gd_input_h.png' corner='8,8,8,8'" pushedimage="file='gd_input_p.png' corner='8,8,8,8'"/>
+				</HorizontalLayout>
+			</HorizontalLayout>
+
+			<HorizontalLayout height="40">
+				<HorizontalLayout childvalign="vcenter">
+					<Label text="会员生日：" width="124" height="34" textcolor="#FF5F6368" font="13" align="left" valign="center"/>
+					<Datetime name="shengri_date" width="292" height="34" timeformat="yyyy-MM-dd" textcolor="#FF1F2329" font="13" textpadding="11,0,11,0" bkcolor="#FFFFFFFF" bordersize="1" bordercolor="#FFCCD0D5" borderround="8,8"/>
+				</HorizontalLayout>
+			</HorizontalLayout>
+
+			<HorizontalLayout height="34" childalign="center">
+				<Label name="shoukuanresult" font="14" width="500" height="34" wordbreak="true" text="" visible="false" textcolor="#FFE14B4A" align="center" />
+			</HorizontalLayout>
+
+			<Control />
+
+			<HorizontalLayout height="40" childalign="center">
+				<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="40" width="432" 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'" font="114"/>
+			</HorizontalLayout>
 		</VerticalLayout>
     </VerticalLayout>
-</Window>
+</Window>

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

@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<ShoukuanOrderItem height="170" bkcolor="#FFFFFFFF" padding="15,15,15,0" borderround="10,10">
-		<HorizontalLayout>
-			<Label float="true" name="shoukuan_order_list_order_num" text="订单号：" pos="10,6,320,36" />
-			
-			<Label float="true" name="shoukuan_order_list_price" text="金额：" pos="10,36,500,66" />
-			
-			<Label float="true" name="shoukuan_order_list_init_date" text="下单时间：" pos="10,66,300,96" />
-			
-			<Label float="true" name="shoukuan_order_list_zhifu_type" text="支付方式：" pos="10,96,400,126" />
-			
-			<Label float="true" name="shoukuan_order_list_from" text="订单来源：" pos="10,126,282,156" />
-		</HorizontalLayout>
-		
-		<HorizontalLayout width="200">
-			<Button name="shoukuan_order_list_info" float="true" pos="100,6,180,44" text="详情" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-			<Button name="shoukuan_order_list_print" float="true" pos="100,54,180,92" text="打印" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-		</HorizontalLayout>
+	<ShoukuanOrderItem height="148">
+		<VerticalLayout>
+			<Control height="18" bkcolor="#FFF5F7FA" />
+			<VerticalLayout height="130" bkimage="file='waimai_card_bg.png' corner='8,8,8,8'" padding="20,0,20,0">
+				<Control name="shoukuan_order_item_leftbar" float="true" pos="0,0,4,130" bkimage="waimai_bar_green.png" />
+				<HorizontalLayout height="130">
+					<HorizontalLayout>
+						<Label float="true" name="shoukuan_order_list_order_num" text="订单号" pos="20,20,110,50" textcolor="#FF8A9099" />
+						<Label float="true" name="shoukuan_order_list_order_num_val" pos="110,20,560,50" textcolor="#FF1F2329" />
+						<Label float="true" name="shoukuan_order_list_zhifu_type" text="支付方式" pos="20,50,110,80" textcolor="#FF8A9099" />
+						<Label float="true" name="shoukuan_order_list_zhifu_type_val" pos="110,50,560,80" textcolor="#FF1F2329" />
+						<Label float="true" name="shoukuan_order_list_from" text="订单来源" pos="20,80,110,110" textcolor="#FF8A9099" />
+						<Label float="true" name="shoukuan_order_list_from_val" pos="110,80,560,110" textcolor="#FF1F2329" />
+
+						<Label float="true" name="shoukuan_order_list_price" text="金额" pos="620,20,710,50" textcolor="#FF8A9099" />
+						<Label float="true" name="shoukuan_order_list_price_val" pos="710,20,1180,50" textcolor="#FF509962" />
+						<Label float="true" name="shoukuan_order_list_init_date" text="下单时间" pos="620,50,710,80" textcolor="#FF8A9099" />
+						<Label float="true" name="shoukuan_order_list_init_date_val" pos="710,50,1180,80" textcolor="#FF1F2329" />
+					</HorizontalLayout>
+
+					<HorizontalLayout width="120">
+						<Button name="shoukuan_order_list_info" float="true" pos="0,28,100,60" text="详情" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+						<Button name="shoukuan_order_list_print" float="true" pos="0,69,100,101" text="打印" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+					</HorizontalLayout>
+				</HorizontalLayout>
+			</VerticalLayout>
+		</VerticalLayout>
 	</ShoukuanOrderItem>
-</Window>
+</Window>

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

@@ -2,26 +2,53 @@
 <Window>
 	<ShoukuanOrderInfoPage>
 		<VerticalLayout>
-			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-				<Button name="shoukuan_order_info_page_return" float="true" pos="20,6,120,38" text="返回" textcolor="#FFFFFFFF"/>
+			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+				<Button name="shoukuan_order_info_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+				<Label text="订单详情" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
 			</HorizontalLayout>
 
-			<HorizontalLayout>
-				<VerticalLayout name="shoukuan_order_info_page_orderlayout" padding="20,20,20,20" vscrollbar="true">	
-					<VerticalLayout name="shoukuan_order_info_page_layout_3" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="20,20,20,20" borderround="10,10">
-						<Label name="shoukuan_order_info_page_order_num" text="订单号：" height="30" />
-						<Label name="shoukuan_order_info_page_order_price" text="金额：" height="30" />
-						<Label name="shoukuan_order_info_page_init_date" text="下单时间：" height="30" />
-						<Label name="shoukuan_order_info_page_type" height="30" text="订单来源：" />
-						<Label name="shoukuan_order_info_page_pay_type" height="30" text="付款方式：" />
-						<Label name="shoukuan_order_info_page_refund_status" height="30" text="退款状态：" />					
+			<HorizontalLayout bkcolor="#FFF5F7FA">
+				<VerticalLayout name="shoukuan_order_info_page_orderlayout" padding="20,20,20,20" vscrollbar="true">
+					<VerticalLayout name="shoukuan_order_info_page_layout_3" height="256" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="订单信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout height="31">
+							<Label text="订单号" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="shoukuan_order_info_page_order_num" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="金额" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="shoukuan_order_info_page_order_price" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="下单时间" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="shoukuan_order_info_page_init_date" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="订单来源" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="shoukuan_order_info_page_type" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="付款方式" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="shoukuan_order_info_page_pay_type" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="退款状态" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="shoukuan_order_info_page_refund_status" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 					</VerticalLayout>
 				</VerticalLayout>
 
-				<HorizontalLayout width="250" height="200" bkcolor="#FFFFFFFF" padding="0,20,20,0" borderround="10,10">
-					<Button name="shoukuan_order_info_page_refund" float="true" pos="50,60,200,98" text="退款" textcolor="#FFFFFFFF" 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'" />
+				<HorizontalLayout width="250" height="400">
+					<Button name="shoukuan_order_info_page_refund" float="true" pos="0,20,230,60" text="退款" textcolor="#FFFFFFFF" normalimage="file='btn_border_red.png' corner='6,6,6,6'" hotimage="file='btn_border_red_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_red_Click.png' corner='6,6,6,6'" />
 				</HorizontalLayout>
 			</HorizontalLayout>
 		</VerticalLayout>
 	</ShoukuanOrderInfoPage>
-</Window>
+</Window>

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

@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<ShoukuanOrderListPage>
-		<VerticalLayout>
+		<VerticalLayout bkcolor="#FFF5F7FA">
 			<HorizontalLayout height="53" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 				<VerticalLayout width="300" height="53">
 					<Button name="orderlist_waimai" text="外卖订单" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_waimai_line" visible="false" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+					<Control name="orderlist_waimai_line" visible="false" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
-				
+
 				<VerticalLayout width="300" height="53">
-					<Button name="orderlist_diannei" text="店内订单" textcolor="#FF43A947" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_shoukuan_line" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+					<Button name="orderlist_diannei" text="店内订单" textcolor="#FF60A753" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="orderlist_shoukuan_line" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
 			</HorizontalLayout>
-			
-			<Control height="1" bkcolor="#FFEAEAEA" padding="0,0,0,0"></Control>
-			
-			<HorizontalLayout bkcolor="#FFFFFFFF" height="70">
-				<Button name="orderlist_diandan_btn" text="点单订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
-				
-				<Button name="orderlist_zhengcan_btn" text="正餐订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
-				
-				<Button name="orderlist_shoukuan_btn" text="收款订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF60B177"></Button>
+
+			<Control height="1" bkcolor="#FFE8EAED" padding="0,0,0,0"></Control>
+
+			<HorizontalLayout height="56" bkcolor="#FFFFFFFF">
+				<HorizontalLayout width="700" height="38" padding="20,9,0,0">
+					<Control float="true" pos="0,0,700,38" bkimage="file='seg_track.png' corner='10,10,10,10'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_diandan" visible="false" float="true" pos="4,3,232,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_zhengcan" visible="false" float="true" pos="236,3,464,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_shoukuan" float="true" pos="468,3,696,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Button name="orderlist_diandan_btn" text="点单订单" font="13" textcolor="#FF5F6368" float="true" pos="4,3,232,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+					<Button name="orderlist_zhengcan_btn" text="正餐订单" font="13" textcolor="#FF5F6368" float="true" pos="236,3,464,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+					<Button name="orderlist_shoukuan_btn" text="收款订单" font="13" textcolor="#FF60A753" float="true" pos="468,3,696,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+				</HorizontalLayout>
 			</HorizontalLayout>
 
-			<HorizontalLayout>										
+			<Control height="1" bkcolor="#FFE8EAED" padding="0,0,0,0"></Control>
+
+			<HorizontalLayout>
 				<VerticalLayout name="orderlist" vscrollbar="true">
-				
+
 				</VerticalLayout>
-				
+
 				<HorizontalLayout name="main_orderlist_loading">
 					<Control></Control>
 					<VerticalLayout width="24">
@@ -41,16 +47,16 @@
 					<Control></Control>
 				</HorizontalLayout>
 			</HorizontalLayout>
-			
-			<Control height="1" bkcolor="#FFEAEAEA"></Control>
+
+			<Control height="1" bkcolor="#FFE8EAED"></Control>
 
 			<HorizontalLayout height="52" bkcolor="#FFFFFFFF" >
 				<Control />
-				<Button name="shoukuan_order_list_refresh" width="70" height="44" padding="20,4,0,0" text="刷新" textcolor="#FFFFFFFF" />
-				<Button name="shoukuan_order_list_last" width="70" height="44" padding="20,4,0,0" text="上一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Button name="shoukuan_order_list_next" width="70" height="44" padding="20,4,0,0" text="下一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Label name="shoukuan_order_list_page" width="150" height="44" padding="20,4,0,0" />
+				<Button name="shoukuan_order_list_refresh" width="64" height="36" padding="13,8,0,0" text="刷新" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'" />
+				<Button name="shoukuan_order_list_last" width="77" height="36" padding="13,8,0,0" text="上一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+				<Button name="shoukuan_order_list_next" width="77" height="36" padding="13,8,0,0" text="下一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+				<Label name="shoukuan_order_list_page" width="110" height="36" padding="13,8,0,0" textcolor="#FF5F6368" />
 			</HorizontalLayout>
 		</VerticalLayout>
 	</ShoukuanOrderListPage>
-</Window>
+</Window>

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

@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Window> 
-	<ListContainerElement name="waimai_order_info_page_listitem" height="30" minheight="30"> 
-		<HorizontalLayout height="38"> 
-			<Label name="waimai_order_info_page_listitem_foodname" /> 
-			<Label name="waimai_order_info_page_listitem_quantity" width="200" align="center"/> 
-			<Label name="waimai_order_info_page_listitem_price" width="200" align="center"/> 
-		</HorizontalLayout> 
-	</ListContainerElement> 
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>
+	<ListContainerElement name="waimai_order_info_page_listitem" height="34" minheight="34" bordercolor="#FFF0F1F3" bordersize="0,0,0,1">
+		<Label name="waimai_order_info_page_listitem_foodname" font="13" textcolor="#FF1F2329" align="left" textpadding="11,0,0,0" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+		<Label name="waimai_order_info_page_listitem_quantity" width="167" align="center" font="13" textcolor="#FF1F2329" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+		<Label name="waimai_order_info_page_listitem_price" width="194" align="center" font="13" textcolor="#FF1F2329" bordercolor="#FFE8EAED" bordersize="0,0,1,0" />
+	</ListContainerElement>
 </Window>

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

@@ -1,64 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<WaimaiOrderItem height="280" bkcolor="#FFFFFFFF" padding="0,20,20,0" borderround="10,10">
-		<HorizontalLayout height="200">
+	<WaimaiOrderItem height="258">
+		<Control height="18" bkcolor="#FFF5F7FA" />
+		<VerticalLayout height="240" bkimage="file='waimai_card_bg.png' corner='8,8,8,8'" padding="0,0,20,0">
+		<Control name="waimai_order_item_leftbar" float="true" pos="0,0,4,240" bkimage="waimai_bar_green.png" />
+		<HorizontalLayout height="188">
 			<HorizontalLayout>
-				<Label float="true" name="waimai_order_list_from" text="订单来源：" pos="330,6,530,36" />
-				<Label float="true" name="waimai_order_list_phone" text="电话：" pos="330,36,530,66" />
-				<Label float="true" name="waimai_order_list_price" text="价格：" pos="330,96,530,126" />
-				<Label float="true" name="waimai_order_list_delivery_date" text="配送时间：" pos="330,126,530,156" />
-				
-				<Label float="true" name="waimai_order_list_liushuihao" text="流水号：" pos="10,6,220,36" />
-				<Label float="true" name="waimai_order_list_name" text="姓名：" pos="10,36,182,66" />				
-				<Label float="true" name="waimai_order_list_address" text="地址：" pos="10,66,700,96" />				
-				<Label float="true" name="waimai_order_list_init_date" text="下单时间：" pos="10,96,220,126" />		
-				<Label float="true" name="waimai_order_list_type" text="配送方式：" pos="10,126,400,156" />
-				<Label float="true" name="waimai_order_list_order_num" text="订单号：" pos="10,156,320,186" />
-				
-				<Label float="true" name="waimai_order_list_refund_status" text="退款状态：" pos="330,156,730,186" />
-				
-				<Control name="waimai_order_list_yuyue" bkimage="yuyue.png" float="true" pos="180,120,292,190" />
-				<Control name="waimai_order_list_ziqu" bkimage="ziti.png" float="true" pos="330,120,442,190" />
-				
-				<Control name="waimai_order_list_meituan_icon" bkimage="meituan_icon.png" visible="false" float="true" pos="420,5,450,35" />
-				<Control name="waimai_order_list_eleme_icon" bkimage="eleme_icon.png" visible="false" float="true" pos="420,5,450,35" />
-				<Control name="waimai_order_list_zhipuzi_icon" bkimage="zhipuzi_waimai_icon.png" visible="false" float="true" pos="420,5,450,35" />
+				<Label float="true" name="waimai_order_list_liushuihao" text="流水号" pos="20,12,92,42" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_liushuihao_val" pos="92,12,220,42" textcolor="#FF1F2329" />
+				<Label float="true" name="waimai_order_list_name" text="姓名" pos="20,39,92,69" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_name_val" pos="92,39,182,69" textcolor="#FF1F2329" />
+				<Label float="true" name="waimai_order_list_address" text="地址" pos="20,66,92,96" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_address_val" pos="92,66,520,96" textcolor="#FF1F2329" />
+				<Label float="true" name="waimai_order_list_init_date" text="下单时间" pos="20,93,92,123" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_init_date_val" pos="92,93,300,123" textcolor="#FF1F2329" />
+				<Label float="true" name="waimai_order_list_type" text="订单类型" pos="20,120,92,150" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_type_val" pos="92,120,300,150" textcolor="#FF1F2329" />
+				<Label float="true" name="waimai_order_list_order_num" text="订单号" pos="20,147,92,177" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_order_num_val" pos="92,147,320,177" textcolor="#FF1F2329" />
+
+				<Label float="true" name="waimai_order_list_from" text="订单来源" pos="529,12,601,42" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_phone" text="电话" pos="529,39,601,69" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_phone_val" pos="601,39,801,69" textcolor="#FF1F2329" />
+				<Label float="true" name="waimai_order_list_price" text="价格" pos="529,66,601,96" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_price_val" pos="601,66,731,96" textcolor="#FF509962" />
+				<Label float="true" name="waimai_order_list_delivery_date" text="配送时间" pos="529,93,601,123" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_delivery_date_val" pos="601,93,801,123" textcolor="#FF1F2329" />
+				<Label float="true" name="waimai_order_list_refund_status" text="退款状态" pos="529,120,601,150" textcolor="#FF8A9099" />
+				<Label float="true" name="waimai_order_list_refund_status_val" pos="601,120,920,150" textcolor="#FF1F2329" />
+
+				<Control name="waimai_order_list_yuyue" bkimage="yuyue.png" float="true" pos="180,100,292,170" />
+				<Control name="waimai_order_list_ziqu" bkimage="ziti.png" float="true" pos="330,100,442,170" />
+
+				<Control name="waimai_order_list_meituan_icon" bkimage="meituan_icon.png" visible="false" float="true" pos="601,12,631,42" />
+				<Control name="waimai_order_list_eleme_icon" bkimage="eleme_icon.png" visible="false" float="true" pos="601,12,631,42" />
+				<Control name="waimai_order_list_zhipuzi_icon" bkimage="zhipuzi_waimai_icon.png" visible="false" float="true" pos="601,12,631,42" />
 			</HorizontalLayout>
-			
+
 			<HorizontalLayout width="120">
-				<Button name="waimai_order_list_info" float="true" pos="20,6,100,44" text="详情" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-				<Button name="waimai_order_list_print" float="true" pos="20,54,100,92" text="打印" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-				
-				<Button name="waimai_order_list_confirme" float="true" pos="20,107,100,150" text="确认" textcolor="#FFFFFFFF"/>
-				<Button name="waimai_order_list_success" float="true" pos="20,107,100,150" text="设为成功" textcolor="#FFFFFFFF" normalimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"/>
-				<Button name="waimai_order_list_fail" float="true" pos="20,155,100,198" text="设为失败" textcolor="#FFFFFFFF" 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="waimai_order_list_agree" float="true" pos="20,107,100,150" text="同意退款" textcolor="#FFFFFFFF" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Button name="waimai_order_list_disagree" float="true" pos="20,155,100,198" text="拒绝退款" textcolor="#FFFFFFFF" 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="waimai_order_list_info" float="true" pos="0,16,100,48" text="详情" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'"/>
+				<Button name="waimai_order_list_print" float="true" pos="0,57,100,89" text="打印" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'"/>
+
+				<Button name="waimai_order_list_confirme" float="true" pos="0,96,100,128" text="确认" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'"/>
+				<Button name="waimai_order_list_success" float="true" pos="0,96,100,128" text="设为成功" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'"/>
+				<Button name="waimai_order_list_fail" float="true" pos="0,136,100,168" text="设为失败" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_red.png' corner='6,6,6,6'" hotimage="file='waimai_btn_red_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_red.png' corner='6,6,6,6'"/>
+
+				<Button name="waimai_order_list_agree" float="true" pos="0,96,100,128" text="同意退款" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'" />
+				<Button name="waimai_order_list_disagree" float="true" pos="0,136,100,168" text="拒绝退款" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_red.png' corner='6,6,6,6'" hotimage="file='waimai_btn_red_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_red.png' corner='6,6,6,6'"/>
 			</HorizontalLayout>
 		</HorizontalLayout>
-		
-		<Control height="1" bkcolor="#FFEAEAEA" padding="10,5,10,0"></Control>
-		
-		<HorizontalLayout>
+
+		<Control height="1" bkcolor="#FFEAEAEA" padding="10,0,10,0"></Control>
+
+		<HorizontalLayout height="51">
 			<HorizontalLayout name="waimai_order_list_ziqu_layout">
-				<Label name="waimai_order_list_ziqu_qucanhao" font="18" width="300" padding="20,0,0,0"></Label>
-				
+				<VerticalLayout padding="20,12,0,0">
+					<Label name="waimai_order_list_ziqu_qucanhao" font="14" height="24"></Label>
+				</VerticalLayout>
+
 				<Control></Control>
-				
-				<Button name="waimai_order_list_ziqu_hujiaoqucan" width="220" height="48" padding="0,16,20,0" text="呼叫取餐" textcolor="#FFFFFFFF" normalimage="file='btn_border_blue.png' corner='5,5,5,5'" hotimage="file='btn_border_blue_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_blue_Click.png' corner='5,5,5,5'"/>
+
+				<Button name="waimai_order_list_ziqu_hujiaoqucan" width="220" height="36" padding="0,7,20,0" text="呼叫取餐" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'"/>
 			</HorizontalLayout>
-			
+
 			<HorizontalLayout name="waimai_order_list_peisong_layout">
-				<Label name="waimai_order_list_peisong_type" font="18" width="300" padding="20,0,0,0"></Label>
-				
+				<VerticalLayout padding="20,12,0,0">
+					<Label name="waimai_order_list_peisong_type" font="14" height="24"></Label>
+				</VerticalLayout>
+
 				<Control></Control>
-				
-				<Button name="waimai_order_list_peisong_fadan" width="220" height="48" padding="0,16,20,0" text="发第三方配送" textcolor="#FFFFFFFF" normalimage="file='btn_border_blue.png' corner='5,5,5,5'" hotimage="file='btn_border_blue_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_blue_Click.png' corner='5,5,5,5'"/>
-				
-				<Label name="waimai_order_list_peisong_fadan_info" font="18" width="300" align="right" padding="20,0,20,0" textcolor="#FF00CED1"></Label>
-				<Button name="waimai_order_list_peisong_quxiaofadan" width="220" height="48" padding="0,16,20,0" text="取消发单" textcolor="#FFFFFFFF" normalimage="file='btn_border_blue.png' corner='5,5,5,5'" hotimage="file='btn_border_blue_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_blue_Click.png' corner='5,5,5,5'"/>
+
+				<Button name="waimai_order_list_peisong_fadan" width="220" height="36" padding="0,7,20,0" text="发第三方配送" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'"/>
+
+				<Label name="waimai_order_list_peisong_fadan_info" font="14" width="300" align="right" padding="20,0,20,0" textcolor="#FF00CED1"></Label>
+				<Button name="waimai_order_list_peisong_quxiaofadan" width="220" height="36" padding="0,7,20,0" text="取消发单" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'"/>
 			</HorizontalLayout>
 		</HorizontalLayout>
+		</VerticalLayout>
 	</WaimaiOrderItem>
-</Window>
+</Window>

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

@@ -2,92 +2,154 @@
 <Window>
 	<WaimaiOrderInfoPage>
 		<VerticalLayout>
-			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-				<Button name="waimai_order_info_page_return" float="true" pos="20,6,120,38" text="返回" textcolor="#FFFFFFFF"/>
+			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+				<Button name="waimai_order_info_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+				<Label text="订单详情" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
 			</HorizontalLayout>
 
-			<HorizontalLayout>
+			<HorizontalLayout bkcolor="#FFF5F7FA">
 				<VerticalLayout name="waimai_order_info_page_orderlayout" padding="20,20,20,20" vscrollbar="true">
-					<VerticalLayout name="waimai_order_info_page_layout_1" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="10,0,10,0" borderround="10,10" >
-						<HorizontalLayout height="50">
-							<Label float="true" name="waimai_order_info_page_liushuihao" text="#1" pos="10, 10, 60, 40" />
-							<Label float="true" name="waimai_order_info_page_order_num" text="订单号：" pos="80, 10, 500, 40" />
+					<!-- ===== 卡1 · 商品与费用（高 = 41+1+12+表头35+行34n+12+备注30+费用30f+1+36+8）===== -->
+					<VerticalLayout name="waimai_order_info_page_layout_1" bkcolor="#FFFFFFFF" padding="0,0,0,8" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1" >
+						<HorizontalLayout height="41">
+							<Label float="true" name="waimai_order_info_page_liushuihao" text="#1" font="115" textcolor="#FF1F2329" pos="0, 10, 60, 33" />
+							<Label float="true" name="waimai_order_info_page_order_num" text="订单号" font="13" textcolor="#FF8A9099" pos="52, 10, 560, 33" />
 						</HorizontalLayout>
 
-						<Control height="1" bkcolor="#FFEAEAEA" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
 
-						<List name="waimai_order_info_page_foodlist">
-							<ListHeader />
-							<ListHeaderItem text="商品" align="left" />
-							<ListHeaderItem text="数量" width="200" align="center" />
-							<ListHeaderItem text="单价" width="200" align="center" />
-						</List>  
+						<Control height="12" />
 
-						<Control height="10" />
+						<List name="waimai_order_info_page_foodlist">
+							<ListHeader height="35" bkcolor="#FFF5F7FA" bordercolor="#FFE8EAED" bordersize="1" />
+							<ListHeaderItem text="商品" align="left" font="13" textcolor="#FF8A9099" textpadding="11,0,0,0" />
+							<ListHeaderItem text="数量" width="167" align="center" font="13" textcolor="#FF8A9099" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+							<ListHeaderItem text="单价" width="194" align="center" font="13" textcolor="#FF8A9099" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+						</List>
 
-						<Label name="waimaorder_info_page_memo" minheight="30" wordbreak="true" text="备注：" />
+						<Control height="12" />
 
-						<Control height="1" bkcolor="#FFEAEAEA" />
+						<HorizontalLayout name="waimaorder_info_page_memo" height="30">
+							<Label text="备注" width="80" height="30" font="13" textcolor="#FF8A9099" />
+							<Label name="waimaorder_info_page_memo_val" text="-" height="30" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 
-						<VerticalLayout name="waimai_order_info_page_fees">				
+						<VerticalLayout name="waimai_order_info_page_fees">
 
 						</VerticalLayout>
-						
-						<Control name="waimai_order_info_page_fees_line" height="1" bkcolor="#FFEAEAEA" />
-						
-						<Label name="waimai_order_info_page_totalprice" height="40" padding="0,0,30,0" align="right" text="总计：" />
+
+						<Control name="waimai_order_info_page_fees_line" height="1" bkcolor="#FFFFFFFF" />
+
+					<HorizontalLayout name="waimai_order_info_page_totalprice" height="36">
+						<Control />
+						<Label name="waimai_order_info_page_totalprice_lab" text="总计：" height="36" autocalcwidth="true" align="right" font="13" textcolor="#FF1F2329" />
+						<Label name="waimai_order_info_page_totalprice_val" text="0.00" height="36" autocalcwidth="true" align="right" font="120" textcolor="#FF509962" />
+					</HorizontalLayout>
+					</VerticalLayout>
+
+					<!-- ===== 卡2 · 顾客信息（高 194 = 41+1+12+31×4+16）===== -->
+					<VerticalLayout name="waimai_order_info_page_layout_2" height="194" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="顾客信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout name="waimai_order_info_page_name" height="31">
+							<Label text="姓名" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_name_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_phone" height="31">
+							<Label text="电话" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_phone_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_address" height="31">
+							<Label text="地址" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_address_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_init_date" height="31">
+							<Label text="下单时间" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_init_date_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 					</VerticalLayout>
 
-					<VerticalLayout name="waimai_order_info_page_layout_2" height="150" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="10,0,10,0" borderround="10,10">
-						<Label text="顾客信息" height="30" />
-						<Control height="1" bkcolor="#FFEAEAEA" />
-						<Label name="waimai_order_info_page_name" text="姓名：" height="30" />
-						<Label name="waimai_order_info_page_phone" text="电话：" height="30" />
-						<Label name="waimai_order_info_page_address" text="地址：" height="30" />
-						<Label name="waimai_order_info_page_init_date" text="下单时间：" height="30" />
+					<!-- ===== 卡3 · 骑手信息（高 164 = 41+1+12+31×3+16）===== -->
+					<VerticalLayout name="waimai_order_info_page_qishouinfo" height="164" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="骑手信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout name="waimai_order_info_page_qishou_name" height="31">
+							<Label text="骑手姓名" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_qishou_name_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_qishou_phone" height="31">
+							<Label text="骑手电话" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_qishou_phone_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_qishou_type" height="31">
+							<Label text="骑手类型" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_qishou_type_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 					</VerticalLayout>
-						
-					<VerticalLayout name="waimai_order_info_page_qishouinfo" height="120" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="10,0,10,0" borderround="10,10">
-						<Label text="骑手信息" height="30" />
-						<Control height="1" bkcolor="#FFEAEAEA" />
-						<Label name="waimai_order_info_page_qishou_name" text="骑手姓名：" height="30" />
-						<Label name="waimai_order_info_page_qishou_phone" text="骑手电话：" height="30" />
-						<Label name="waimai_order_info_page_qishou_type" text="骑手类型：" height="30" />
-					</VerticalLayout>				
-					
-					<VerticalLayout name="waimai_order_info_page_layout_3" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="10,0,10,0" borderround="10,10">
-						<Label text="订单信息" height="30" />
-						<Control height="1" bkcolor="#FFEAEAEA" />
-						<Label name="waimai_order_info_page_shopname" height="30" text="店铺名字：" />
-						<Label name="waimai_order_info_page_take_food_code" height="30" text="取餐号：" />
-						<Label name="waimai_order_info_page_status" height="30" text="订单状态：" />
-						<Label name="waimai_order_info_page_type" height="30" text="订单来源：" />
-						<Label name="waimai_order_info_page_pay_type" height="30" text="付款方式：" />
+
+					<!-- ===== 卡4 · 订单信息（高度由 C++ 计算：固定 70 + 31×字段数）===== -->
+					<VerticalLayout name="waimai_order_info_page_layout_3" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="订单信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout name="waimai_order_info_page_shopname" height="31">
+							<Label text="店铺名字" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_shopname_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_take_food_code" height="31">
+							<Label name="waimai_order_info_page_take_food_code_lab" text="取餐号" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_take_food_code_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_status" height="31">
+							<Label text="订单状态" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_status_val" text="-" padding="0,6,0,3" font="12" textcolor="#FF509962" bkcolor="#FFEBF7F0" borderround="4,4" textpadding="10,0,10,0" autocalcwidth="true" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_type" height="31">
+							<Label text="订单来源" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_type_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_pay_type" height="31">
+							<Label text="付款方式" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_pay_type_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 						<VerticalLayout name="waimai_order_info_page_field">
 
 						</VerticalLayout>
-						<Label name="waimai_order_info_page_delivery_type" height="30" text="配送方式：" />
-						<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" />
+						<HorizontalLayout name="waimai_order_info_page_delivery_type" height="31">
+							<Label text="配送方式" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_delivery_type_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_delivery_time" height="31">
+							<Label name="waimai_order_info_page_delivery_time_lab" text="配送时间" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_delivery_time_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_refund_status" height="31">
+							<Label text="退款状态" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_refund_status_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<HorizontalLayout name="waimai_order_info_page_configmemo" height="31">
+							<Label text="商家备注" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="waimai_order_info_page_configmemo_val" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+						<Control name="waimai_order_info_page_huodaofukuan" bkimage="huodaofukuan.png" float="true" pos="842,126,946,182" />
 					</VerticalLayout>
 				</VerticalLayout>
 
-				<HorizontalLayout width="250" height="400" bkcolor="#FFFFFFFF" padding="0,20,20,0" borderround="10,10">
-					<Button name="waimai_order_info_page_print" float="true" pos="50,60,200,98" text="打印" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-					
-					<Button name="waimai_order_info_page_confirme" float="true" pos="50,108,200,146" text="确认" textcolor="#FFFF0FFFF" />
-					<Button name="waimai_order_info_page_success" float="true" pos="50,108,200,146" text="设为成功" textcolor="#FFFF0FFFF" />
-					<Button name="waimai_order_info_page_fail" float="true" pos="50,156,200,192" text="设为失败" textcolor="#FFFFFFFF" 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="waimai_order_info_page_agree" float="true" pos="50,108,200,146" text="同意退款" textcolor="#FFFF0FFFF" />
-					<Button name="waimai_order_info_page_disagree" float="true" pos="50,156,200,192" text="拒绝退款" textcolor="#FFFFFFFF" 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="waimai_order_info_page_refund" float="true" pos="50,108,200,146" text="退款" textcolor="#FFFFFFFF" 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'" />
+				<HorizontalLayout width="250" height="400">
+					<Button name="waimai_order_info_page_print" float="true" pos="0,20,230,60" text="打印" normalimage="file='btn_border_white.png' corner='6,6,6,6'" hotimage="file='btn_border_white_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_white_Click.png' corner='6,6,6,6'" />
+
+					<Button name="waimai_order_info_page_confirme" float="true" pos="0,72,230,112" text="确认" textcolor="#FFFFFFFF" />
+					<Button name="waimai_order_info_page_success" float="true" pos="0,72,230,112" text="设为成功" textcolor="#FFFFFFFF" />
+					<Button name="waimai_order_info_page_fail" float="true" pos="0,124,230,164" text="设为失败" textcolor="#FFFFFFFF" normalimage="file='btn_border_red.png' corner='6,6,6,6'" hotimage="file='btn_border_red_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_red_Click.png' corner='6,6,6,6'" />
+
+					<Button name="waimai_order_info_page_agree" float="true" pos="0,72,230,112" text="同意退款" textcolor="#FFFFFFFF" />
+					<Button name="waimai_order_info_page_disagree" float="true" pos="0,124,230,164" text="拒绝退款" textcolor="#FFFFFFFF" normalimage="file='btn_border_red.png' corner='6,6,6,6'" hotimage="file='btn_border_red_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_red_Click.png' corner='6,6,6,6'" />
+
+					<Button name="waimai_order_info_page_refund" float="true" pos="0,72,230,112" text="退款" textcolor="#FFFFFFFF" normalimage="file='btn_border_red.png' corner='6,6,6,6'" hotimage="file='btn_border_red_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_red_Click.png' corner='6,6,6,6'" />
 				</HorizontalLayout>
 			</HorizontalLayout>
 		</VerticalLayout>
 	</WaimaiOrderInfoPage>
-</Window>
+</Window>

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

@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<WaimaiOrderListPage>
-		<VerticalLayout>
+		<VerticalLayout bkcolor="#FFF5F7FA">
 			<HorizontalLayout height="53" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 				<VerticalLayout width="300" height="53">
-					<Button name="orderlist_waimai" text="外卖订单" textcolor="#FF43A947" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_waimai_line" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+				<Button name="orderlist_waimai" text="外卖订单" textcolor="#FF60A753" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+				<Control name="orderlist_waimai_line" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
 				
 				<VerticalLayout width="300" height="53">
 					<Button name="orderlist_diannei" text="店内订单" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_diannei_line" visible="false" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+					<Control name="orderlist_diannei_line" visible="false" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
 			</HorizontalLayout>
 
+			<Control height="1" bkcolor="#FFE8EAED" />
+
 			<HorizontalLayout>
 				<HorizontalLayout width="220" padding="20,20,20,0">
-					<VerticalLayout height="500" inset="20,20,20,0" bkcolor="#FFFFFFFF">
-						<Option name="waimai_open_switch" text="未处理" textcolor="#FF666666" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='tab_n.png' corner='5,5,5,5'" selectedimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" hottextcolor="#FFFFFF" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_confirmed_switch" text="已确认" textcolor="#FF666666" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='tab_n.png' corner='5,5,5,5'" selectedimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" hottextcolor="#FFFFFF" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_delivery_switch" text="配送中" textcolor="#FF666666" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='tab_n.png' corner='5,5,5,5'" selectedimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" hottextcolor="#FFFFFF" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_success_switch" text="成功" textcolor="#FF666666" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='tab_n.png' corner='5,5,5,5'" selectedimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" hottextcolor="#FFFFFF" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_fail_switch" text="失败"  textcolor="#FF666666" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='tab_n.png' corner='5,5,5,5'" selectedimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" hottextcolor="#FFFFFF" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_cancel_switch" text="已取消"  textcolor="#FF666666" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='tab_n.png' corner='5,5,5,5'" selectedimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" hottextcolor="#FFFFFF" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_refund_switch" text="退款中" textcolor="#FF666666" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='tab_n.png' corner='5,5,5,5'" selectedimage="file='shuzi_btn_push.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" hottextcolor="#FFFFFF" selectedtextcolor="#FFFFFFFF" />
+					<VerticalLayout height="500" inset="20,20,20,0">
+						<Option name="waimai_open_switch" text="未处理" textcolor="#FF5F6368" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='waimai_tab_normal.png' corner='6,6,6,6'" selectedimage="file='waimai_tab_selected.png' corner='6,6,6,6'" hotimage="file='waimai_tab_hover.png' corner='6,6,6,6'" hottextcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" />
+						<Option name="waimai_confirmed_switch" text="已确认" textcolor="#FF5F6368" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='waimai_tab_normal.png' corner='6,6,6,6'" selectedimage="file='waimai_tab_selected.png' corner='6,6,6,6'" hotimage="file='waimai_tab_hover.png' corner='6,6,6,6'" hottextcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" />
+						<Option name="waimai_delivery_switch" text="配送中" textcolor="#FF5F6368" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='waimai_tab_normal.png' corner='6,6,6,6'" selectedimage="file='waimai_tab_selected.png' corner='6,6,6,6'" hotimage="file='waimai_tab_hover.png' corner='6,6,6,6'" hottextcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" />
+						<Option name="waimai_success_switch" text="成功" textcolor="#FF5F6368" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='waimai_tab_normal.png' corner='6,6,6,6'" selectedimage="file='waimai_tab_selected.png' corner='6,6,6,6'" hotimage="file='waimai_tab_hover.png' corner='6,6,6,6'" hottextcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" />
+						<Option name="waimai_fail_switch" text="失败"  textcolor="#FF5F6368" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='waimai_tab_normal.png' corner='6,6,6,6'" selectedimage="file='waimai_tab_selected.png' corner='6,6,6,6'" hotimage="file='waimai_tab_hover.png' corner='6,6,6,6'" hottextcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" />
+						<Option name="waimai_cancel_switch" text="已取消"  textcolor="#FF5F6368" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='waimai_tab_normal.png' corner='6,6,6,6'" selectedimage="file='waimai_tab_selected.png' corner='6,6,6,6'" hotimage="file='waimai_tab_hover.png' corner='6,6,6,6'" hottextcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" />
+						<Option name="waimai_refund_switch" text="退款中" textcolor="#FF5F6368" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='waimai_tab_normal.png' corner='6,6,6,6'" selectedimage="file='waimai_tab_selected.png' corner='6,6,6,6'" hotimage="file='waimai_tab_hover.png' corner='6,6,6,6'" hottextcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" />
 					</VerticalLayout>
 				</HorizontalLayout>
 										
@@ -48,10 +50,10 @@
 			
 			<HorizontalLayout height="52" bkcolor="#FFFFFFFF" >
 				<Control />
-				<Button name="waimai_order_list_refresh" width="70" height="44" padding="20,4,0,0" text="刷新" textcolor="#FFFFFFFF" />
-				<Button name="waimai_order_list_last" width="70" height="44" padding="20,4,0,0" text="上一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Button name="waimai_order_list_next" width="70" height="44" padding="20,4,0,0" text="下一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Label name="waimai_order_list_page" width="150" height="44" padding="20,4,0,0" />
+			<Button name="waimai_order_list_refresh" width="64" height="36" padding="13,8,0,0" text="刷新" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'" />
+			<Button name="waimai_order_list_last" width="77" height="36" padding="13,8,0,0" text="上一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+			<Button name="waimai_order_list_next" width="77" height="36" padding="13,8,0,0" text="下一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+			<Label name="waimai_order_list_page" width="110" height="36" padding="13,8,0,0" textcolor="#FF5F6368" />
 			</HorizontalLayout>
 		</VerticalLayout>
 	</WaimaiOrderListPage>

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

@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Window> 
-	<ListContainerElement name="zhengcan_order_info_page_listitem" height="30" minheight="30"> 
-		<HorizontalLayout height="38"> 
-			<Label name="zhengcan_order_info_page_listitem_foodname" /> 
-			<Label name="zhengcan_order_info_page_listitem_quantity" width="200" align="center"/> 
-			<Label name="zhengcan_order_info_page_listitem_price" width="200" align="center"/> 
-		</HorizontalLayout> 
-	</ListContainerElement> 
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>
+	<ListContainerElement name="zhengcan_order_info_page_listitem" height="34" minheight="34" bordercolor="#FFF0F1F3" bordersize="0,0,0,1">
+		<Label name="zhengcan_order_info_page_listitem_foodname" font="13" textcolor="#FF1F2329" align="left" textpadding="11,0,0,0" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+		<Label name="zhengcan_order_info_page_listitem_quantity" width="167" align="center" font="13" textcolor="#FF1F2329" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+		<Label name="zhengcan_order_info_page_listitem_price" width="194" align="center" font="13" textcolor="#FF1F2329" bordercolor="#FFE8EAED" bordersize="0,0,1,0" />
+	</ListContainerElement>
 </Window>

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

@@ -1,21 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<ZhengcanOrderItem height="130" bkcolor="#FFFFFFFF" padding="15,15,15,0" borderround="10,10">
-		<HorizontalLayout>
-			<Label float="true" name="zhengcan_order_list_order_num" text="订单号：" pos="10,6,320,36" />		
-			
-			<Label float="true" name="zhengcan_order_list_zhuowei" text="桌位：" pos="10,36,202,66" />
-			<Label float="true" name="zhengcan_order_list_renshu" text="人数：" pos="350,36,600,66" />			
-			
-			<Label float="true" name="zhengcan_order_list_init_date" text="下单时间：" pos="10,66,300,96" />
-			
-			<Label float="true" name="zhengcan_order_list_zhifu_type" text="支付方式：" pos="10,96,400,126" />
-			<Label float="true" name="zhengcan_order_list_price" text="价格：" pos="350,96,500,126" />
-		</HorizontalLayout>
-		
-		<HorizontalLayout width="200">
-			<Button name="zhengcan_order_list_info" float="true" pos="100,6,180,44" text="详情" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-			<Button name="zhengcan_order_list_print" float="true" pos="100,54,180,92" text="打印" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
-		</HorizontalLayout>
+	<ZhengcanOrderItem height="148">
+		<VerticalLayout>
+			<Control height="18" bkcolor="#FFF5F7FA" />
+			<VerticalLayout height="130" bkimage="file='waimai_card_bg.png' corner='8,8,8,8'" padding="20,0,20,0">
+				<Control name="zhengcan_order_item_leftbar" float="true" pos="0,0,4,130" bkimage="waimai_bar_green.png" />
+				<HorizontalLayout height="130">
+					<HorizontalLayout>
+						<Label float="true" name="zhengcan_order_list_order_num" text="订单号" pos="20,20,110,50" textcolor="#FF8A9099" />
+						<Label float="true" name="zhengcan_order_list_order_num_val" pos="110,20,560,50" textcolor="#FF1F2329" />
+						<Label float="true" name="zhengcan_order_list_zhuowei" text="桌位" pos="20,50,110,80" textcolor="#FF8A9099" />
+						<Label float="true" name="zhengcan_order_list_zhuowei_val" pos="110,50,560,80" textcolor="#FF1F2329" />
+						<Label float="true" name="zhengcan_order_list_zhifu_type" text="支付方式" pos="20,80,110,110" textcolor="#FF8A9099" />
+						<Label float="true" name="zhengcan_order_list_zhifu_type_val" pos="110,80,560,110" textcolor="#FF1F2329" />
+
+						<Label float="true" name="zhengcan_order_list_renshu" text="人数" pos="620,20,710,50" textcolor="#FF8A9099" />
+						<Label float="true" name="zhengcan_order_list_renshu_val" pos="710,20,1180,50" textcolor="#FF1F2329" />
+						<Label float="true" name="zhengcan_order_list_init_date" text="下单时间" pos="620,50,710,80" textcolor="#FF8A9099" />
+						<Label float="true" name="zhengcan_order_list_init_date_val" pos="710,50,1180,80" textcolor="#FF1F2329" />
+						<Label float="true" name="zhengcan_order_list_price" text="价格" pos="620,80,710,110" textcolor="#FF8A9099" />
+						<Label float="true" name="zhengcan_order_list_price_val" pos="710,80,1180,110" textcolor="#FF509962" />
+					</HorizontalLayout>
+
+					<HorizontalLayout width="120">
+						<Button name="zhengcan_order_list_info" float="true" pos="0,28,100,60" text="详情" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+						<Button name="zhengcan_order_list_print" float="true" pos="0,69,100,101" text="打印" textcolor="#FF1F2329" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+					</HorizontalLayout>
+				</HorizontalLayout>
+			</VerticalLayout>
+		</VerticalLayout>
 	</ZhengcanOrderItem>
-</Window>
+</Window>

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

@@ -2,58 +2,95 @@
 <Window>
 	<ZhengcanOrderInfoPage>
 		<VerticalLayout>
-			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-				<Button name="zhengcan_order_info_page_return" float="true" pos="20,6,120,38" text="返回" textcolor="#FFFFFFFF"/>
+			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+				<Button name="zhengcan_order_info_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+				<Label text="订单详情" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
 			</HorizontalLayout>
 
-			<HorizontalLayout>
+			<HorizontalLayout bkcolor="#FFF5F7FA">
 				<VerticalLayout name="zhengcan_order_info_page_orderlayout" padding="20,20,20,20" vscrollbar="true">
-					<VerticalLayout name="zhengcan_order_info_page_layout_1" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="20,20,20,20" borderround="10,10" >
-						<HorizontalLayout height="30">
-							<Label float="true" name="zhengcan_order_info_page_order_num" text="订单号：" pos="0,0,500,20" />
+					<VerticalLayout name="zhengcan_order_info_page_layout_1" bkcolor="#FFFFFFFF" padding="0,0,0,8" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<HorizontalLayout height="41">
+							<Label text="订单号" width="80" height="41" font="13" textcolor="#FF8A9099" />
+							<Label name="zhengcan_order_info_page_order_num" text="-" height="41" font="13" textcolor="#FF1F2329" />
 						</HorizontalLayout>
 
-						<Control height="1" bkcolor="#FFEAEAEA" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
 
-						<List name="zhengcan_order_info_page_foodlist">
-							<ListHeader />
-							<ListHeaderItem text="商品" align="left" />
-							<ListHeaderItem text="数量" width="200" align="center" />
-							<ListHeaderItem text="单价" width="200" align="center" />
-						</List>  
+						<Control height="12" />
 
-						<Control height="10" />
+						<List name="zhengcan_order_info_page_foodlist">
+							<ListHeader height="35" bkcolor="#FFF5F7FA" bordercolor="#FFE8EAED" bordersize="1" />
+							<ListHeaderItem text="商品" align="left" font="13" textcolor="#FF8A9099" textpadding="11,0,0,0" />
+							<ListHeaderItem text="数量" width="167" align="center" font="13" textcolor="#FF8A9099" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+							<ListHeaderItem text="单价" width="194" align="center" font="13" textcolor="#FF8A9099" bordercolor="#FFE8EAED" bordersize="1,0,0,0" />
+						</List>
 
-						<Label name="dianneiorder_info_page_memo" minheight="30" wordbreak="true" text="备注：" />
+						<Control height="12" />
 
-						<Control height="1" bkcolor="#FFEAEAEA" />
+						<HorizontalLayout height="30">
+							<Label text="备注" width="80" height="30" font="13" textcolor="#FF8A9099" />
+							<Label name="dianneiorder_info_page_memo" text="-" height="30" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 
-						<VerticalLayout name="zhengcan_order_info_page_fees">				
+						<VerticalLayout name="zhengcan_order_info_page_fees">
 
 						</VerticalLayout>
-						
-						<Control name="zhengcan_order_info_page_fees_line" height="1" bkcolor="#FFEAEAEA" />
-						
-						<Label name="zhengcan_order_info_page_totalprice" height="40" padding="0,0,30,0" align="right" text="总计：" />
+
+						<Control name="zhengcan_order_info_page_fees_line" height="1" bkcolor="#FFFFFFFF" />
+
+						<HorizontalLayout name="zhengcan_order_info_page_totalprice" height="36">
+							<Control />
+							<Label name="zhengcan_order_info_page_totalprice_lab" text="总计：" height="36" autocalcwidth="true" align="right" font="13" textcolor="#FF1F2329" />
+							<Label name="zhengcan_order_info_page_totalprice_val" text="0.00" height="36" autocalcwidth="true" align="right" font="120" textcolor="#FF509962" />
+						</HorizontalLayout>
+					</VerticalLayout>
+
+					<VerticalLayout name="zhengcan_order_info_page_layout_2" height="132" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="用餐信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout height="31">
+							<Label text="桌号" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="zhengcan_order_info_page_zhuohao" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="人数" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="zhengcan_order_info_page_renshu" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 					</VerticalLayout>
 
-					<VerticalLayout name="zhengcan_order_info_page_layout_2" height="105" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="20,20,20,20" borderround="10,10">
-						<Label name="zhengcan_order_info_page_zhuohao" text="桌号：" height="30" />
-						<Label name="zhengcan_order_info_page_renshu" text="人数：" height="30" />
-					</VerticalLayout>			
-					
-					<VerticalLayout name="zhengcan_order_info_page_layout_3" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="20,20,20,20" borderround="10,10">
-						<Label name="zhengcan_order_info_page_init_date" text="下单时间：" height="30" />
-						<Label name="zhengcan_order_info_page_type" height="30" text="订单来源：" />
-						<Label name="zhengcan_order_info_page_pay_type" height="30" text="付款方式：" />
-						<Label name="zhengcan_order_info_page_refund_status" height="30" text="退款状态：" />						
+					<VerticalLayout name="zhengcan_order_info_page_layout_3" height="194" bkcolor="#FFFFFFFF" padding="0,0,0,16" inset="20,0,20,0" borderround="10,10" bordercolor="#FFE8EAED" bordersize="1">
+						<Label text="订单信息" font="115" height="41" />
+						<Control height="1" bkcolor="#FFF0F1F3" />
+						<Control height="12" />
+						<HorizontalLayout height="31">
+							<Label text="下单时间" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="zhengcan_order_info_page_init_date" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="订单来源" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="zhengcan_order_info_page_type" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="付款方式" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="zhengcan_order_info_page_pay_type" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
+
+						<HorizontalLayout height="31">
+							<Label text="退款状态" width="80" height="31" font="13" textcolor="#FF8A9099" />
+							<Label name="zhengcan_order_info_page_refund_status" text="-" height="31" font="13" textcolor="#FF1F2329" />
+						</HorizontalLayout>
 					</VerticalLayout>
 				</VerticalLayout>
 
-				<HorizontalLayout width="250" height="200" bkcolor="#FFFFFFFF" padding="0,20,20,0" borderround="10,10">
-					<Button name="zhengcan_order_info_page_refund" float="true" pos="50,108,200,146" text="退款" textcolor="#FFFFFFFF" 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'" />
+				<HorizontalLayout width="250" height="400">
+					<Button name="zhengcan_order_info_page_refund" float="true" pos="0,20,230,60" text="退款" textcolor="#FFFFFFFF" normalimage="file='btn_border_red.png' corner='6,6,6,6'" hotimage="file='btn_border_red_Hover.png' corner='6,6,6,6'" pushedimage="file='btn_border_red_Click.png' corner='6,6,6,6'" />
 				</HorizontalLayout>
 			</HorizontalLayout>
 		</VerticalLayout>
 	</ZhengcanOrderInfoPage>
-</Window>
+</Window>

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

@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<ZhengcanOrderListPage>
-		<VerticalLayout>
+		<VerticalLayout bkcolor="#FFF5F7FA">
 			<HorizontalLayout height="53" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 				<VerticalLayout width="300" height="53">
 					<Button name="orderlist_waimai" text="外卖订单" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_waimai_line" visible="false" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+					<Control name="orderlist_waimai_line" visible="false" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
-				
+
 				<VerticalLayout width="300" height="53">
-					<Button name="orderlist_diannei" text="店内订单" textcolor="#FF43A947" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-					<Control name="orderlist_diannei_line" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+					<Button name="orderlist_diannei" text="店内订单" textcolor="#FF60A753" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="orderlist_diannei_line" height="3" bkcolor="#FF60A753" padding="70,0,70,0"></Control>
 				</VerticalLayout>
 			</HorizontalLayout>
-			
-			<Control height="1" bkcolor="#FFEAEAEA" padding="0,0,0,0"></Control>
-			
-			<HorizontalLayout bkcolor="#FFFFFFFF" height="70">
-				<Button name="orderlist_diandan_btn" text="点单订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
-				
-				<Button name="orderlist_zhengcan_btn" text="正餐订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF60B177"></Button>
-				
-				<Button name="orderlist_shoukuan_btn" text="收款订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
+
+			<Control height="1" bkcolor="#FFE8EAED" padding="0,0,0,0"></Control>
+
+			<HorizontalLayout height="56" bkcolor="#FFFFFFFF">
+				<HorizontalLayout width="700" height="38" padding="20,9,0,0">
+					<Control float="true" pos="0,0,700,38" bkimage="file='seg_track.png' corner='10,10,10,10'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_diandan" visible="false" float="true" pos="4,3,232,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_zhengcan" float="true" pos="236,3,464,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Control name="orderlist_seg_line_shoukuan" visible="false" float="true" pos="468,3,696,35" bkimage="file='seg_active.png' corner='8,8,8,8'" mouse="false"></Control>
+					<Button name="orderlist_diandan_btn" text="点单订单" font="13" textcolor="#FF5F6368" float="true" pos="4,3,232,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+					<Button name="orderlist_zhengcan_btn" text="正餐订单" font="13" textcolor="#FF60A753" float="true" pos="236,3,464,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+					<Button name="orderlist_shoukuan_btn" text="收款订单" font="13" textcolor="#FF5F6368" float="true" pos="468,3,696,35" align="center" valign="center" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00000000"></Button>
+				</HorizontalLayout>
 			</HorizontalLayout>
 
-			<HorizontalLayout>										
+			<Control height="1" bkcolor="#FFE8EAED" padding="0,0,0,0"></Control>
+
+			<HorizontalLayout>
 				<VerticalLayout name="orderlist" vscrollbar="true">
-				
+
 				</VerticalLayout>
-				
+
 				<HorizontalLayout name="main_orderlist_loading">
 					<Control></Control>
 					<VerticalLayout width="24">
@@ -41,16 +47,16 @@
 					<Control></Control>
 				</HorizontalLayout>
 			</HorizontalLayout>
-			
-			<Control height="1" bkcolor="#FFEAEAEA"></Control>
+
+			<Control height="1" bkcolor="#FFE8EAED"></Control>
 
 			<HorizontalLayout height="52" bkcolor="#FFFFFFFF" >
 				<Control />
-				<Button name="zhengcan_order_list_refresh" width="70" height="44" padding="20,4,0,0" text="刷新" textcolor="#FFFFFFFF" />
-				<Button name="zhengcan_order_list_last" width="70" height="44" padding="20,4,0,0" text="上一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Button name="zhengcan_order_list_next" width="70" height="44" padding="20,4,0,0" text="下一页" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-				<Label name="zhengcan_order_list_page" width="150" height="44" padding="20,4,0,0" />
+				<Button name="zhengcan_order_list_refresh" width="64" height="36" padding="13,8,0,0" text="刷新" textcolor="#FFFFFFFF" normalimage="file='waimai_btn_green.png' corner='6,6,6,6'" hotimage="file='waimai_btn_green_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_green.png' corner='6,6,6,6'" />
+				<Button name="zhengcan_order_list_last" width="77" height="36" padding="13,8,0,0" text="上一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+				<Button name="zhengcan_order_list_next" width="77" height="36" padding="13,8,0,0" text="下一页" textcolor="#FF5F6368" normalimage="file='waimai_btn_white.png' corner='6,6,6,6'" hotimage="file='waimai_btn_white_h.png' corner='6,6,6,6'" pushedimage="file='waimai_btn_white.png' corner='6,6,6,6'" />
+				<Label name="zhengcan_order_list_page" width="110" height="36" padding="13,8,0,0" textcolor="#FF5F6368" />
 			</HorizontalLayout>
 		</VerticalLayout>
 	</ZhengcanOrderListPage>
-</Window>
+</Window>

zhipuzi_pos_windows/control/CDianneiOrderItemUI.cpp

@@ -25,41 +25,41 @@ void CDianneiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	m_yingshou_price = orderinfo["yingshou_price"].GetString();
 	m_fromtype = orderinfo["from_type"].GetString();
 
-	std::wstring qucanhao_show = L"取餐码：" + CLewaimaiString::UTF8ToUnicode(m_take_food_code);
-	this->FindSubControl(L"diannei_order_list_qucanhao")->SetText(qucanhao_show.c_str());
+	//左侧状态竖条：已退款订单显示红色，其余显示绿色
+	CControlUI* pLeftBar = this->FindSubControl(L"diannei_order_item_leftbar");
+	if (pLeftBar != NULL)
+	{
+		pLeftBar->SetBkImage(m_is_refund == "1" ? L"waimai_bar_red.png" : L"waimai_bar_green.png");
+	}
+
+	this->FindSubControl(L"diannei_order_list_qucanhao_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_take_food_code).c_str());
 
-	std::wstring dingdanhao_show = L"订单号：" + CLewaimaiString::UTF8ToUnicode(m_show_trade_no);
-	this->FindSubControl(L"diannei_order_list_order_num")->SetText(dingdanhao_show.c_str());
+	this->FindSubControl(L"diannei_order_list_order_num_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_show_trade_no).c_str());
 
-	std::wstring init_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(m_init_time);
-	this->FindSubControl(L"diannei_order_list_init_date")->SetText(init_date_show.c_str());
+	this->FindSubControl(L"diannei_order_list_init_date_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_init_time).c_str());
 
-	std::wstring table_name_show = L"桌位：" + CLewaimaiString::UTF8ToUnicode(m_table_name);
-	this->FindSubControl(L"diannei_order_list_zhuowei")->SetText(table_name_show.c_str());
+	this->FindSubControl(L"diannei_order_list_zhuowei_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_table_name).c_str());
 
-	std::wstring person_num_show = L"人数：" + CLewaimaiString::UTF8ToUnicode(m_person_num);
-	this->FindSubControl(L"diannei_order_list_renshu")->SetText(person_num_show.c_str());
+	this->FindSubControl(L"diannei_order_list_renshu_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_person_num).c_str());
 
-	std::wstring price_show = L"价格：" + CLewaimaiString::UTF8ToUnicode(m_total_price);
-	this->FindSubControl(L"diannei_order_list_price")->SetText(price_show.c_str());	
+	this->FindSubControl(L"diannei_order_list_price_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_total_price).c_str());
 
-	std::wstring zhifufangshi_show = L"支付方式：" + CLewaimaiString::UTF8ToUnicode(m_zhifu_type);
-	this->FindSubControl(L"diannei_order_list_zhifu_type")->SetText(zhifufangshi_show.c_str());
+	this->FindSubControl(L"diannei_order_list_zhifu_type_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_zhifu_type).c_str());
 
 	
 	std::wstring ws_from_type;
 	if (m_fromtype == "1")
 	{
-		ws_from_type = L"订单来源：收银系统";
+		ws_from_type = L"收银系统";
 	}
 	else if (m_fromtype == "4")
 	{
-		ws_from_type = L"订单来源：商家app";
+		ws_from_type = L"商家app";
 	}
 	else if (m_fromtype == "2" || m_fromtype == "3" || m_fromtype == "5")
 	{
-		ws_from_type = L"订单来源：扫码下单";
+		ws_from_type = L"扫码下单";
 	}
 
-	this->FindSubControl(L"diannei_order_list_from")->SetText(ws_from_type.c_str());
+	this->FindSubControl(L"diannei_order_list_from_val")->SetText(ws_from_type.c_str());
 }

zhipuzi_pos_windows/control/CShoukuanOrderItemUI.cpp

@@ -21,17 +21,20 @@ void CShoukuanOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	m_shouyin_type = orderinfo["shouyin_type"].GetString();
 	m_yingshou_price = orderinfo["yingshou_value"].GetString();
 
-	std::wstring dingdanhao_show = L"订单号：" + CLewaimaiString::UTF8ToUnicode(m_show_trade_no);
-	this->FindSubControl(L"shoukuan_order_list_order_num")->SetText(dingdanhao_show.c_str());
+	//左侧状态竖条：已退款订单显示红色，其余显示绿色
+	CControlUI* pLeftBar = this->FindSubControl(L"shoukuan_order_item_leftbar");
+	if (pLeftBar != NULL)
+	{
+		pLeftBar->SetBkImage(m_is_refund == "1" ? L"waimai_bar_red.png" : L"waimai_bar_green.png");
+	}
+
+	this->FindSubControl(L"shoukuan_order_list_order_num_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_show_trade_no).c_str());
 
-	std::wstring init_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(m_init_time);
-	this->FindSubControl(L"shoukuan_order_list_init_date")->SetText(init_date_show.c_str());
+	this->FindSubControl(L"shoukuan_order_list_init_date_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_init_time).c_str());
 
-	std::wstring price_show = L"金额：" + CLewaimaiString::UTF8ToUnicode(m_yingshou_price);
-	this->FindSubControl(L"shoukuan_order_list_price")->SetText(price_show.c_str());
+	this->FindSubControl(L"shoukuan_order_list_price_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_yingshou_price).c_str());
 
-	std::wstring zhifufangshi_show = L"支付方式：" + CLewaimaiString::UTF8ToUnicode(m_zhifu_type);
-	this->FindSubControl(L"shoukuan_order_list_zhifu_type")->SetText(zhifufangshi_show.c_str());
+	this->FindSubControl(L"shoukuan_order_list_zhifu_type_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_zhifu_type).c_str());
 
 	std::wstring from_name;
 	if (m_shouyin_type == "1")
@@ -51,6 +54,5 @@ void CShoukuanOrderItemUI::SetData(rapidjson::Value& orderinfo)
 		from_name = L"收银台";
 	}
 
-	std::wstring from_show = L"订单来源：" + from_name;
-	this->FindSubControl(L"shoukuan_order_list_from")->SetText(from_show.c_str());
+	this->FindSubControl(L"shoukuan_order_list_from_val")->SetText(from_name.c_str());
 }

zhipuzi_pos_windows/control/CWaimaiOrderItemUI.cpp

@@ -37,26 +37,14 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	std::string third_delivery_fee = CLewaimaiJson::ToString(orderinfo["third_delivery_fee"]);
 	std::string courier_type = CLewaimaiJson::ToString(orderinfo["courier_type"]);
 
-	std::wstring name_show = L"姓名：" + CLewaimaiString::UTF8ToUnicode(m_name);
-	this->FindSubControl(L"waimai_order_list_name")->SetText(name_show.c_str());
-
-	std::wstring address_show = L"地址：" + CLewaimaiString::UTF8ToUnicode(m_address);
-	this->FindSubControl(L"waimai_order_list_address")->SetText(address_show.c_str());
-
-	std::wstring phone_show = L"电话：" + CLewaimaiString::UTF8ToUnicode(m_phone);
-	this->FindSubControl(L"waimai_order_list_phone")->SetText(phone_show.c_str());
-
-	std::wstring price_show = L"价格：" + CLewaimaiString::UTF8ToUnicode(m_price);
-	this->FindSubControl(L"waimai_order_list_price")->SetText(price_show.c_str());
-
-	std::wstring liushuihao_show = L"流水号：#" + CLewaimaiString::UTF8ToUnicode(m_restaurant_number);
-	this->FindSubControl(L"waimai_order_list_liushuihao")->SetText(liushuihao_show.c_str());
-
-	std::wstring order_no_show = L"订单号：" + CLewaimaiString::UTF8ToUnicode(m_order_no);
-	this->FindSubControl(L"waimai_order_list_order_num")->SetText(order_no_show.c_str());
-
-	std::wstring init_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(m_init_date);
-	this->FindSubControl(L"waimai_order_list_init_date")->SetText(init_date_show.c_str());
+	// 值写入 _val 控件，标签文本保留在 XML 静态（两列式，无冒号）
+	this->FindSubControl(L"waimai_order_list_name_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_name).c_str());
+	this->FindSubControl(L"waimai_order_list_address_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_address).c_str());
+	this->FindSubControl(L"waimai_order_list_phone_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_phone).c_str());
+	this->FindSubControl(L"waimai_order_list_price_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_price).c_str());
+	this->FindSubControl(L"waimai_order_list_liushuihao_val")->SetText((L"#" + CLewaimaiString::UTF8ToUnicode(m_restaurant_number)).c_str());
+	this->FindSubControl(L"waimai_order_list_order_num_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_order_no).c_str());
+	this->FindSubControl(L"waimai_order_list_init_date_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_init_date).c_str());
 
 	std::wstring order_type;
 	std::wstring delivery_date;
@@ -66,8 +54,8 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 
 	if (m_is_selftake == "1")
 	{
-		order_type = L"订单类型：到店自取";
-		delivery_date = L"自取时间：" + CLewaimaiString::UTF8ToUnicode(m_deliverytime);
+		order_type = L"到店自取";
+		delivery_date = CLewaimaiString::UTF8ToUnicode(m_deliverytime);
 
 		this->FindSubControl(L"waimai_order_list_ziqu")->SetVisible(true);
 
@@ -79,8 +67,8 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	}
 	else
 	{
-		order_type = L"订单类型：外卖配送";
-		delivery_date = L"配送时间：" + CLewaimaiString::UTF8ToUnicode(m_deliverytime);
+		order_type = L"外卖配送";
+		delivery_date = CLewaimaiString::UTF8ToUnicode(m_deliverytime);
 
 		this->FindSubControl(L"waimai_order_list_ziqu")->SetVisible(false);
 
@@ -111,7 +99,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 			else
 			{
 				peisongLabel->SetText(L"自配送订单");
-				peisongLabel->SetTextColor(0xFF228B22);
+				peisongLabel->SetTextColor(0xFF509962);
 
 				if (atof(third_delivery_fee.c_str()) > 0.0001)
 				{
@@ -167,7 +155,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 			else
 			{
 				peisongLabel->SetText(L"自配送订单，骑手已接单");
-				peisongLabel->SetTextColor(0xFF228B22);
+				peisongLabel->SetTextColor(0xFF509962);
 
 				//针对配送中订单进行处理
 				fadanBtn->SetVisible(false);
@@ -227,7 +215,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 			else
 			{
 				peisongLabel->SetText(L"自配送订单");
-				peisongLabel->SetTextColor(0xFF228B22);
+				peisongLabel->SetTextColor(0xFF509962);
 			}
 
 			fadanBtn->SetVisible(false);
@@ -246,8 +234,8 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 		this->FindSubControl(L"waimai_order_list_yuyue")->SetVisible(true);
 	}
 
-	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());
+	this->FindSubControl(L"waimai_order_list_type_val")->SetText(order_type.c_str());
+	this->FindSubControl(L"waimai_order_list_delivery_date_val")->SetText(delivery_date.c_str());
 
 	CControlUI* meituan_icon = this->FindSubControl(L"waimai_order_list_meituan_icon");
 	CControlUI* eleme_icon = this->FindSubControl(L"waimai_order_list_eleme_icon");
@@ -269,6 +257,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	if (m_status == 1)
 	{
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_refund_status_val")->SetVisible(false);
 
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(true);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
@@ -280,6 +269,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	else if (m_status == 2 || m_status == 3)
 	{
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_refund_status_val")->SetVisible(false);
 
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(true);
@@ -291,6 +281,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	else if (m_status == 4 || m_status == 5)
 	{
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_refund_status_val")->SetVisible(false);
 
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
@@ -302,6 +293,7 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	else if (m_status == 6)
 	{
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetVisible(false);
+		this->FindSubControl(L"waimai_order_list_refund_status_val")->SetVisible(false);
 
 		this->FindSubControl(L"waimai_order_list_confirme")->SetVisible(false);
 		this->FindSubControl(L"waimai_order_list_success")->SetVisible(false);
@@ -334,28 +326,41 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 		}
 
 		this->FindSubControl(L"waimai_order_list_refund_status")->SetVisible(true);
-		std::wstring refund_status_text = L"退款状态：";
+		this->FindSubControl(L"waimai_order_list_refund_status_val")->SetVisible(true);
+		std::wstring refund_status_text;
 		if (refund_status == "1")
 		{
-			refund_status_text += L"顾客申请退款，等待商家处理";
+			refund_status_text = L"顾客申请退款，等待商家处理";
 		}
 		else if (refund_status == "2")
 		{
-			refund_status_text += L"退款成功，订单失败";
+			refund_status_text = L"退款成功，订单失败";
 		}
 		else if (refund_status == "3")
 		{
-			refund_status_text += L"商家已拒绝退款，等待顾客受理";
+			refund_status_text = L"商家已拒绝退款，等待顾客受理";
 		}
 		else if (refund_status == "4")
 		{
-			refund_status_text += L"退款失败，订单变为已确认";
+			refund_status_text = L"退款失败，订单变为已确认";
 		}
 		else if (refund_status == "5")
 		{
-			refund_status_text += L"顾客再次发起退款，等待客服介入处理中";
+			refund_status_text = L"顾客再次发起退款，等待客服介入处理中";
 		}
 
-		this->FindSubControl(L"waimai_order_list_refund_status")->SetText(refund_status_text.c_str());
+		this->FindSubControl(L"waimai_order_list_refund_status_val")->SetText(refund_status_text.c_str());
+	}
+
+	// 左侧状态色条：默认绿色，失败/取消时变色（随卡片圆角，走专用 PNG）
+	CControlUI* leftBar = static_cast<CControlUI*>(this->FindSubControl(L"waimai_order_item_leftbar"));
+	if (leftBar != NULL)
+	{
+		if (m_status == 5)
+			leftBar->SetBkImage(L"file='waimai_bar_red.png'"); // 失败 - 红色
+		else if (m_status == 6)
+			leftBar->SetBkImage(L"file='waimai_bar_gray.png'"); // 已取消 - 灰色
+		else
+			leftBar->SetBkImage(L"file='waimai_bar_green.png'"); // 其余 - 绿色
 	}
 }

zhipuzi_pos_windows/control/CZhengcanOrderItemUI.cpp

@@ -24,20 +24,22 @@ void CZhengcanOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	m_yingshou_price = orderinfo["yingshou_price"].GetString();
 	m_refund_result = orderinfo["refund_result"].GetString();
 
-	std::wstring dingdanhao_show = L"订单号：" + CLewaimaiString::UTF8ToUnicode(m_show_trade_no);
-	this->FindSubControl(L"zhengcan_order_list_order_num")->SetText(dingdanhao_show.c_str());
+	//左侧状态竖条：已退款订单显示红色，其余显示绿色
+	CControlUI* pLeftBar = this->FindSubControl(L"zhengcan_order_item_leftbar");
+	if (pLeftBar != NULL)
+	{
+		pLeftBar->SetBkImage(m_is_refund == "1" ? L"waimai_bar_red.png" : L"waimai_bar_green.png");
+	}
+
+	this->FindSubControl(L"zhengcan_order_list_order_num_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_show_trade_no).c_str());
 
-	std::wstring init_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(m_init_time);
-	this->FindSubControl(L"zhengcan_order_list_init_date")->SetText(init_date_show.c_str());
+	this->FindSubControl(L"zhengcan_order_list_init_date_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_init_time).c_str());
 
-	std::wstring table_name_show = L"桌位：" + CLewaimaiString::UTF8ToUnicode(m_table_name);
-	this->FindSubControl(L"zhengcan_order_list_zhuowei")->SetText(table_name_show.c_str());
+	this->FindSubControl(L"zhengcan_order_list_zhuowei_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_table_name).c_str());
 
-	std::wstring person_num_show = L"人数：" + CLewaimaiString::UTF8ToUnicode(m_person_num);
-	this->FindSubControl(L"zhengcan_order_list_renshu")->SetText(person_num_show.c_str());
+	this->FindSubControl(L"zhengcan_order_list_renshu_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_person_num).c_str());
 
-	std::wstring price_show = L"价格：" + CLewaimaiString::UTF8ToUnicode(m_yingshou_price);
-	this->FindSubControl(L"zhengcan_order_list_price")->SetText(price_show.c_str());
+	this->FindSubControl(L"zhengcan_order_list_price_val")->SetText(CLewaimaiString::UTF8ToUnicode(m_yingshou_price).c_str());
 
 	std::wstring zhifu_name;
 
@@ -82,6 +84,5 @@ void CZhengcanOrderItemUI::SetData(rapidjson::Value& orderinfo)
 		zhifu_name = L"福利卡支付";
 	}
 
-	std::wstring zhifufangshi_show = L"支付方式：" + zhifu_name;
-	this->FindSubControl(L"zhengcan_order_list_zhifu_type")->SetText(zhifufangshi_show.c_str());
+	this->FindSubControl(L"zhengcan_order_list_zhifu_type_val")->SetText(zhifu_name.c_str());
 }

zhipuzi_pos_windows/page/CDianneiOrderInfoPageUI.cpp

@@ -7,6 +7,33 @@
 
 #include "../print/CPosPrinter.h"
 
+// =====================================================================
+// R77 · 费用行辅助：与外卖订单详情 MakeFeeRow 同构
+//   左标签（灰 #8A9099，160px）+ 右金额（深 #1F2329），两端对齐
+// =====================================================================
+static CHorizontalLayoutUI* MakeFeeRow(const std::wstring& wsLabel, const std::wstring& wsValue)
+{
+	CHorizontalLayoutUI* pRow = new CHorizontalLayoutUI;
+	pRow->SetFixedHeight(30);
+
+	CLabelUI* pLab = new CLabelUI;
+	pLab->SetAttribute(_T("font"), _T("13"));
+	pLab->SetAttribute(_T("textcolor"), _T("#FF8A9099"));
+	pLab->SetAttribute(_T("align"), _T("left"));
+	pLab->SetFixedWidth(160);
+	pLab->SetText(wsLabel.c_str());
+
+	CLabelUI* pVal = new CLabelUI;
+	pVal->SetAttribute(_T("font"), _T("13"));
+	pVal->SetAttribute(_T("textcolor"), _T("#FF1F2329"));
+	pVal->SetAttribute(_T("align"), _T("right"));
+	pVal->SetText(wsValue.c_str());
+
+	pRow->Add(pLab);
+	pRow->Add(pVal);
+	return pRow;
+}
+
 CDianneiOrderInfoPageUI::CDianneiOrderInfoPageUI()
 {
 
@@ -101,8 +128,10 @@ void CDianneiOrderInfoPageUI::SetDate(CDiandanOrder& order)
 
 void CDianneiOrderInfoPageUI::Refresh(CDiandanOrder& order)
 {
-	std::wstring order_no_show = L"订单号：" + CLewaimaiString::UTF8ToUnicode(order.show_trade_no);
-	this->FindSubControl(_T("diannei_order_info_page_order_num"))->SetText(order_no_show.c_str());
+	{
+		std::wstring order_no_show = CLewaimaiString::UTF8ToUnicode(order.show_trade_no);
+		this->FindSubControl(_T("diannei_order_info_page_order_num"))->SetText(order_no_show.empty() ? _T("-") : order_no_show.c_str());
+	}
 
 	//商品详情的渲染
 	CListUI* pFoodList = static_cast<CListUI*>(this->FindSubControl(_T("diannei_order_info_page_foodlist")));
@@ -140,12 +169,15 @@ void CDianneiOrderInfoPageUI::Refresh(CDiandanOrder& order)
 	}
 
 	//重设商品列表的高度
-	int order_item_height = (show_num + 1) * 30;
+	//R77：表头 35 + 每行 34（与外卖订单详情一致）
+	int order_item_height = 35 + show_num * 34;
 	pFoodList->SetFixedHeight(order_item_height);
 
-	CLabelUI *pMemo = static_cast<CLabelUI *>(this->FindSubControl(_T("dianneiorder_info_page_memo")));
-	std::wstring memo = _T("备注：") + CLewaimaiString::UTF8ToUnicode(order.m_memo);
-	pMemo->SetText(memo.c_str());
+	//R77：备注只填值（灰标签「备注」写在 XML 里）
+	{
+		std::wstring memo = CLewaimaiString::UTF8ToUnicode(order.m_memo);
+		this->FindSubControl(_T("dianneiorder_info_page_memo"))->SetText(memo.empty() ? _T("-") : memo.c_str());
+	}
 
 	//开始展示各种费用
 	CVerticalLayoutUI* pFeesLayout = static_cast<CVerticalLayoutUI *>(this->FindSubControl(_T("diannei_order_info_page_fees")));
@@ -155,156 +187,84 @@ void CDianneiOrderInfoPageUI::Refresh(CDiandanOrder& order)
 
 	if (atof(order.m_shangpinquan_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"商品券优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_shangpinquan_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"商品券优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_shangpinquan_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_cika_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"次卡优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_cika_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"次卡优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_cika_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_total_member_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"商品会员价优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_total_member_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"商品会员价优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_total_member_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_zhekou_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"整单折扣优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_zhekou_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"整单折扣优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_zhekou_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_member_zhekou_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"会员折扣优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_member_zhekou_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"会员折扣优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_member_zhekou_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_quanyika_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"权益卡优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_quanyika_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"权益卡优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_quanyika_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_manjian_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"满减优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_manjian_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"满减优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_manjian_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_youhuiquan_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"优惠券优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_youhuiquan_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"优惠券优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_youhuiquan_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_rengong_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"人工优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_rengong_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"人工优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_rengong_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_dabao_money.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"打包费金额：" + CLewaimaiString::UTF8ToUnicode(order.m_dabao_money);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"打包费金额", CLewaimaiString::UTF8ToUnicode(order.m_dabao_money)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_jiajia.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"加价金额：" + CLewaimaiString::UTF8ToUnicode(order.m_jiajia);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"加价金额", CLewaimaiString::UTF8ToUnicode(order.m_jiajia)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_moling_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"抹零优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_moling_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"抹零优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_moling_youhui)));
 
 		fees_num++;
 	}
@@ -321,30 +281,41 @@ void CDianneiOrderInfoPageUI::Refresh(CDiandanOrder& order)
 	{
 		pFeesLayout->SetVisible(true);
 		this->FindSubControl(_T("diannei_order_info_page_fees_line"))->SetVisible(true);
-		pFeesLayout->SetFixedHeight(fees_num * 38);
+		pFeesLayout->SetFixedHeight(fees_num * 30);
 
-		fees_height = fees_num * 38;
+		fees_height = fees_num * 30;
 	}
 
-	CLabelUI *pTotalPrice = static_cast<CLabelUI *>(this->FindSubControl(_T("diannei_order_info_page_totalprice")));
-	std::wstring price = L"总计：￥" + CLewaimaiString::UTF8ToUnicode(order.m_total_price);
-	pTotalPrice->SetText(price.c_str());
+	//R77：总计 = 「总计：」+ 绿色金额（两个纯文本 Label）
+	{
+		std::wstring price = CLewaimaiString::UTF8ToUnicode(order.m_total_price);
+		this->FindSubControl(_T("diannei_order_info_page_totalprice_val"))->SetText(price.empty() ? _T("0.00") : price.c_str());
+	}
 
-	int nTotalHeight = order_item_height + fees_height + 173;
+	//R77：卡1 = 标题41 + 线1 + 空12 + List + 空12 + 备注30 + 费用 + 线1 + 总计36 + 底8
+	int nTotalHeight = order_item_height + fees_height + 141;
 	this->FindSubControl(_T("diannei_order_info_page_layout_1"))->SetFixedHeight(nTotalHeight);
 
 	//开始显示顾客信息
-	std::wstring qucanma_show = L"取餐码：" + CLewaimaiString::UTF8ToUnicode(order.take_food_code);
-	this->FindSubControl(_T("diannei_order_info_page_qucanma"))->SetText(qucanma_show.c_str());
+	{
+		std::wstring qucanma_show = CLewaimaiString::UTF8ToUnicode(order.take_food_code);
+		this->FindSubControl(_T("diannei_order_info_page_qucanma"))->SetText(qucanma_show.empty() ? _T("-") : qucanma_show.c_str());
+	}
 
-	std::wstring canpai_show = L"桌号：" + CLewaimaiString::UTF8ToUnicode(order.m_canpai);
-	this->FindSubControl(_T("diannei_order_info_page_zhuohao"))->SetText(canpai_show.c_str());
+	{
+		std::wstring canpai_show = CLewaimaiString::UTF8ToUnicode(order.m_canpai);
+		this->FindSubControl(_T("diannei_order_info_page_zhuohao"))->SetText(canpai_show.empty() ? _T("-") : canpai_show.c_str());
+	}
 
-	std::wstring renshu_show = L"人数：" + CLewaimaiString::UTF8ToUnicode(order.m_renshu);
-	this->FindSubControl(_T("diannei_order_info_page_renshu"))->SetText(renshu_show.c_str());
+	{
+		std::wstring renshu_show = CLewaimaiString::UTF8ToUnicode(order.m_renshu);
+		this->FindSubControl(_T("diannei_order_info_page_renshu"))->SetText(renshu_show.empty() ? _T("-") : renshu_show.c_str());
+	}
 
-	std::wstring order_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(order.init_time);
-	this->FindSubControl(_T("diannei_order_info_page_init_date"))->SetText(order_date_show.c_str());
+	{
+		std::wstring order_date_show = CLewaimaiString::UTF8ToUnicode(order.init_time);
+		this->FindSubControl(_T("diannei_order_info_page_init_date"))->SetText(order_date_show.empty() ? _T("-") : order_date_show.c_str());
+	}
 
 	//开始处理订单信息
 	std::wstring laiyuan;
@@ -361,27 +332,24 @@ void CDianneiOrderInfoPageUI::Refresh(CDiandanOrder& order)
 		laiyuan = L"扫码下单";
 	}
 
-	CLabelUI *pType = static_cast<CLabelUI *>(this->FindSubControl(_T("diannei_order_info_page_type")));
-	std::wstring wsType = _T("订单来源：") + laiyuan;
-	pType->SetText(wsType.c_str());
+	this->FindSubControl(_T("diannei_order_info_page_type"))->SetText(laiyuan.empty() ? _T("-") : laiyuan.c_str());
 
-	CLabelUI *pPayType = static_cast<CLabelUI *>(this->FindSubControl(_T("diannei_order_info_page_pay_type")));
-	std::wstring wsPayType = _T("付款方式：") + CLewaimaiString::UTF8ToUnicode(order.shoukuan_type);
-	pPayType->SetText(wsPayType.c_str());
+	{
+		std::wstring wsPayType = CLewaimaiString::UTF8ToUnicode(order.shoukuan_type);
+		this->FindSubControl(_T("diannei_order_info_page_pay_type"))->SetText(wsPayType.empty() ? _T("-") : wsPayType.c_str());
+	}
 
-	CLabelUI *pRefund = static_cast<CLabelUI *>(this->FindSubControl(_T("diannei_order_info_page_refund_status")));
 	if (order.is_refund == "1")
 	{
-		std::wstring wsPayType = _T("退款状态：已退款");
-		pRefund->SetText(wsPayType.c_str());
+		this->FindSubControl(_T("diannei_order_info_page_refund_status"))->SetText(_T("已退款"));
 	}
 	else
 	{
-		std::wstring wsPayType = _T("退款状态：未退款");
-		pRefund->SetText(wsPayType.c_str());
+		this->FindSubControl(_T("diannei_order_info_page_refund_status"))->SetText(_T("未退款"));
 	}
 
-	this->FindSubControl(_T("diannei_order_info_page_layout_3"))->SetFixedHeight(211);
+	//R77：卡3 = 标题41 + 线1 + 空12 + 底16 + 31×字段数
+	this->FindSubControl(_T("diannei_order_info_page_layout_3"))->SetFixedHeight(225);
 
 	//退款按钮
 	CButtonUI* refund_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("diannei_order_info_page_refund")));

zhipuzi_pos_windows/page/CDianneiOrderListPageUI.cpp

@@ -34,13 +34,40 @@ void CDianneiOrderListPageUI::InitShow()
 }
 
 //处理按钮点击类事件
+//从被点击的按钮向上找到所属的订单item（item是orderlist容器的直接子节点，不依赖内部嵌套层级）
+static CDianneiOrderItemUI* FindOrderItemBySender(CControlUI* pSender)
+{
+	CControlUI* pNode = pSender;
+	int nGuard = 0;
+	while (pNode != NULL && nGuard++ < 64)
+	{
+		CControlUI* pParent = pNode->GetParent();
+		if (pParent == NULL)
+		{
+			return NULL;
+		}
+		if (pParent->GetName() == _T("orderlist"))
+		{
+			CContainerUI* pContainer = static_cast<CContainerUI*>(pNode);
+			if (pContainer->FindSubControl(_T("diannei_order_list_order_num_val")) != NULL)
+			{
+				return static_cast<CDianneiOrderItemUI*>(pContainer);
+			}
+			return NULL;
+		}
+		pNode = pParent;
+	}
+	return NULL;
+}
+
 void CDianneiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 	
 	if (name == _T("diannei_order_list_print"))
 	{
-		CDianneiOrderItemUI* item = static_cast<CDianneiOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		CDianneiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string diannei_order_id = item->getOrderID();
 
 		CPosPrinter printer;
@@ -48,7 +75,8 @@ void CDianneiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("diannei_order_list_info"))
 	{
-		CDianneiOrderItemUI* item = static_cast<CDianneiOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		CDianneiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string diannei_order_id = item->getOrderID();
 
 		CDianneiOrderInfoPageUI* page = static_cast<CDianneiOrderInfoPageUI*>(m_pMainWnd->GetPage(CMainWnd::DIANNEIINFO));
@@ -233,7 +261,7 @@ void CDianneiOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("diannei_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + std::to_wstring(m_page) + _T("页/共 ") + std::to_wstring(m_total_page) + _T("页");
+	std::wstring pageinfo = _T("第") + std::to_wstring(m_page) + _T("页/共") + std::to_wstring(m_total_page) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];

zhipuzi_pos_windows/page/CShoukuanOrderInfoPageUI.cpp

@@ -96,14 +96,20 @@ void CShoukuanOrderInfoPageUI::SetDate(CShoukuanOrder& order)
 
 void CShoukuanOrderInfoPageUI::Refresh(CShoukuanOrder& order)
 {
-	std::wstring order_no_show = L"订单号：" + CLewaimaiString::UTF8ToUnicode(order.show_trade_no);
-	this->FindSubControl(_T("shoukuan_order_info_page_order_num"))->SetText(order_no_show.c_str());
+	{
+		std::wstring order_no_show = CLewaimaiString::UTF8ToUnicode(order.show_trade_no);
+		this->FindSubControl(_T("shoukuan_order_info_page_order_num"))->SetText(order_no_show.empty() ? _T("-") : order_no_show.c_str());
+	}
 
-	std::wstring price_show = L"金额：" + CLewaimaiString::UTF8ToUnicode(order.m_money);
-	this->FindSubControl(_T("shoukuan_order_info_page_order_price"))->SetText(price_show.c_str());
+	{
+		std::wstring price_show = CLewaimaiString::UTF8ToUnicode(order.m_money);
+		this->FindSubControl(_T("shoukuan_order_info_page_order_price"))->SetText(price_show.empty() ? _T("-") : price_show.c_str());
+	}
 
-	std::wstring order_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(order.init_time);
-	this->FindSubControl(_T("shoukuan_order_info_page_init_date"))->SetText(order_date_show.c_str());
+	{
+		std::wstring order_date_show = CLewaimaiString::UTF8ToUnicode(order.init_time);
+		this->FindSubControl(_T("shoukuan_order_info_page_init_date"))->SetText(order_date_show.empty() ? _T("-") : order_date_show.c_str());
+	}
 
 	//开始处理订单信息
 	std::wstring laiyuan;
@@ -124,27 +130,24 @@ void CShoukuanOrderInfoPageUI::Refresh(CShoukuanOrder& order)
 		laiyuan = L"收银台";
 	}
 
-	CLabelUI *pType = static_cast<CLabelUI *>(this->FindSubControl(_T("shoukuan_order_info_page_type")));
-	std::wstring wsType = _T("订单来源：") + laiyuan;
-	pType->SetText(wsType.c_str());
+	this->FindSubControl(_T("shoukuan_order_info_page_type"))->SetText(laiyuan.empty() ? _T("-") : laiyuan.c_str());
 
-	CLabelUI *pPayType = static_cast<CLabelUI *>(this->FindSubControl(_T("shoukuan_order_info_page_pay_type")));
-	std::wstring wsPayType = _T("付款方式：") + CLewaimaiString::UTF8ToUnicode(order.shoukuan_type);
-	pPayType->SetText(wsPayType.c_str());
+	{
+		std::wstring wsPayType = CLewaimaiString::UTF8ToUnicode(order.shoukuan_type);
+		this->FindSubControl(_T("shoukuan_order_info_page_pay_type"))->SetText(wsPayType.empty() ? _T("-") : wsPayType.c_str());
+	}
 
-	CLabelUI *pRefund = static_cast<CLabelUI *>(this->FindSubControl(_T("shoukuan_order_info_page_refund_status")));
 	if (order.is_refund == "1")
 	{
-		std::wstring wsPayType = _T("退款状态：已退款");
-		pRefund->SetText(wsPayType.c_str());
+		this->FindSubControl(_T("shoukuan_order_info_page_refund_status"))->SetText(_T("已退款"));
 	}
 	else
 	{
-		std::wstring wsPayType = _T("退款状态：未退款");
-		pRefund->SetText(wsPayType.c_str());
+		this->FindSubControl(_T("shoukuan_order_info_page_refund_status"))->SetText(_T("未退款"));
 	}
 
-	this->FindSubControl(_T("shoukuan_order_info_page_layout_3"))->SetFixedHeight(221);
+	//R77：卡3 = 标题41 + 线1 + 空12 + 底16 + 31×字段数
+	this->FindSubControl(_T("shoukuan_order_info_page_layout_3"))->SetFixedHeight(256);
 
 	//退款按钮
 	CButtonUI* refund_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("shoukuan_order_info_page_refund")));

zhipuzi_pos_windows/page/CShoukuanOrderListPageUI.cpp

@@ -34,13 +34,40 @@ void CShoukuanOrderListPageUI::InitShow()
 }
 
 //处理按钮点击类事件
+//从被点击的按钮向上找到所属的订单item（item是orderlist容器的直接子节点，不依赖内部嵌套层级）
+static CShoukuanOrderItemUI* FindOrderItemBySender(CControlUI* pSender)
+{
+	CControlUI* pNode = pSender;
+	int nGuard = 0;
+	while (pNode != NULL && nGuard++ < 64)
+	{
+		CControlUI* pParent = pNode->GetParent();
+		if (pParent == NULL)
+		{
+			return NULL;
+		}
+		if (pParent->GetName() == _T("orderlist"))
+		{
+			CContainerUI* pContainer = static_cast<CContainerUI*>(pNode);
+			if (pContainer->FindSubControl(_T("shoukuan_order_list_order_num_val")) != NULL)
+			{
+				return static_cast<CShoukuanOrderItemUI*>(pContainer);
+			}
+			return NULL;
+		}
+		pNode = pParent;
+	}
+	return NULL;
+}
+
 void CShoukuanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 
 	if (name == _T("shoukuan_order_list_print"))
 	{
-		CShoukuanOrderItemUI* item = static_cast<CShoukuanOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		CShoukuanOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string shoukuan_order_id = item->getOrderID();
 
 		CPosPrinter printer;
@@ -48,7 +75,8 @@ void CShoukuanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("shoukuan_order_list_info"))
 	{
-		CShoukuanOrderItemUI* item = static_cast<CShoukuanOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		CShoukuanOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string shoukuan_order_id = item->getOrderID();
 
 		CShoukuanOrderInfoPageUI* page = static_cast<CShoukuanOrderInfoPageUI*>(m_pMainWnd->GetPage(CMainWnd::SHOUKUANINFO));
@@ -237,7 +265,7 @@ void CShoukuanOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("shoukuan_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + std::to_wstring(m_page) + _T("页/共 ") + std::to_wstring(m_total_page) + _T("页");
+	std::wstring pageinfo = _T("第") + std::to_wstring(m_page) + _T("页/共") + std::to_wstring(m_total_page) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];

zhipuzi_pos_windows/page/CWaimaiOrderInfoPageUI.cpp

@@ -7,6 +7,59 @@
 
 #include "../print/CPosPrinter.h"
 
+// =====================================================================
+// R76d · 字段行辅助
+//   字段行 = 80px 灰标签(#8A9099) + 深色值(#1F2329)，用两个纯文本 Label 实现。
+//   原因：DuiLib 富文本 <c #xxxxxx> / <x i> 在本项目中渲染为空（全代码库仅本页使用），
+//   因此改用与 MakeFeeRow 同构的“双 Label”方案，完全不走 DrawHtmlText。
+// =====================================================================
+static CHorizontalLayoutUI* MakeFieldRow(const std::wstring& wsLabel, const std::wstring& wsValue, LPCTSTR pszValueColor = _T("#FF1F2329"))
+{
+	CHorizontalLayoutUI* pRow = new CHorizontalLayoutUI;
+	pRow->SetFixedHeight(31);
+
+	CLabelUI* pLab = new CLabelUI;
+	pLab->SetAttribute(_T("font"), _T("13"));
+	pLab->SetAttribute(_T("textcolor"), _T("#FF8A9099"));
+	pLab->SetFixedHeight(31);
+	pLab->SetFixedWidth(80);
+	pLab->SetText(wsLabel.c_str());
+
+	CLabelUI* pVal = new CLabelUI;
+	pVal->SetAttribute(_T("font"), _T("13"));
+	pVal->SetAttribute(_T("textcolor"), pszValueColor);
+	pVal->SetFixedHeight(31);
+	pVal->SetText(wsValue.empty() ? L"-" : wsValue.c_str());
+
+	pRow->Add(pLab);
+	pRow->Add(pVal);
+	return pRow;
+}
+
+// 费用行：标签靠左(灰) + 金额靠右(深)，两端对齐
+static CHorizontalLayoutUI* MakeFeeRow(const std::wstring& wsLabel, const std::wstring& wsValue)
+{
+	CHorizontalLayoutUI* pRow = new CHorizontalLayoutUI;
+	pRow->SetFixedHeight(30);
+
+	CLabelUI* pLab = new CLabelUI;
+	pLab->SetAttribute(_T("font"), _T("13"));
+	pLab->SetAttribute(_T("textcolor"), _T("#FF8A9099"));
+	pLab->SetAttribute(_T("align"), _T("left"));
+	pLab->SetFixedWidth(160);
+	pLab->SetText(wsLabel.c_str());
+
+	CLabelUI* pVal = new CLabelUI;
+	pVal->SetAttribute(_T("font"), _T("13"));
+	pVal->SetAttribute(_T("textcolor"), _T("#FF1F2329"));
+	pVal->SetAttribute(_T("align"), _T("right"));
+	pVal->SetText(wsValue.c_str());
+
+	pRow->Add(pLab);
+	pRow->Add(pVal);
+	return pRow;
+}
+
 CWaimaiOrderInfoPageUI::CWaimaiOrderInfoPageUI()
 {
 
@@ -245,12 +298,15 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	}
 
 	//重设商品列表的高度
-	int order_item_height = (show_num + 1) * 30;
+	//R76：表头 35 + 每行 34（33 文本 + 1px 底部分隔线）
+
+	int order_item_height = 35 + show_num * 34;
 	pFoodList->SetFixedHeight(order_item_height);
 
-	CLabelUI *pMemo = static_cast<CLabelUI *>(this->FindSubControl(_T("waimaorder_info_page_memo")));
-	std::wstring memo = _T("备注：") + CLewaimaiString::UTF8ToUnicode(order.m_memo);
-	pMemo->SetText(memo.c_str());
+	{
+		std::wstring memo = CLewaimaiString::UTF8ToUnicode(order.m_memo);
+		this->FindSubControl(_T("waimaorder_info_page_memo_val"))->SetText(memo.empty() ? _T("-") : memo.c_str());
+	}
 
 	//开始展示各种费用
 	CVerticalLayoutUI* pFeesLayout = static_cast<CVerticalLayoutUI *>(this->FindSubControl(_T("waimai_order_info_page_fees")));
@@ -260,26 +316,14 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 
 	if (order.m_delivery > 0)
 	{
-		CLabelUI *pDlieveryFee = new CLabelUI;
-		pDlieveryFee->SetFixedHeight(30);
-
-		std::wstring delivery_fee = L"配送费：" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_delivery, 2));
-		pDlieveryFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pDlieveryFee);
+		pFeesLayout->Add(MakeFeeRow(L"配送费", CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_delivery, 2))));
 
 		fees_num++;
 	}
 
 	if (order.m_is_dabao == "1")
 	{
-		CLabelUI *pDabaoFee = new CLabelUI;
-		pDabaoFee->SetFixedHeight(30);
-
-		std::wstring dabao_fee = L"打包费：" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_delivery, 2));
-		pDabaoFee->SetText(dabao_fee.c_str());
-
-		pFeesLayout->Add(pDabaoFee);
+		pFeesLayout->Add(MakeFeeRow(L"打包费", CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_delivery, 2))));
 
 		fees_num++;
 	}
@@ -289,14 +333,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	{
 		for (std::vector<CWaimaiOrderField>::iterator it = order.m_addservie.begin(); it != order.m_addservie.end(); it++)
 		{
-			std::wstring addservice = CLewaimaiString::UTF8ToUnicode((*it).name) + L"：" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)atof((*it).value.c_str()), 2));
-
-			CLabelUI* newField = new CLabelUI();
-
-			newField->SetText(addservice.c_str());
-			newField->SetFixedHeight(30);
-
-			pFeesLayout->Add(newField);
+			pFeesLayout->Add(MakeFeeRow(CLewaimaiString::UTF8ToUnicode((*it).name), CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)atof((*it).value.c_str()), 2))));
 
 			fees_num++;
 		}
@@ -305,13 +342,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	//店铺折扣
 	if (order.m_discount < 10)
 	{
-		CLabelUI *pDiscountFee = new CLabelUI;
-		pDiscountFee->SetFixedHeight(30);
-
-		std::wstring discount = L"店铺折扣：" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_discount, 2)) + L"折";
-		pDiscountFee->SetText(discount.c_str());
-
-		pFeesLayout->Add(pDiscountFee);
+		pFeesLayout->Add(MakeFeeRow(L"店铺折扣", CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_discount, 2)) + L"折"));
 
 		fees_num++;
 	}
@@ -319,13 +350,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	//会员优惠
 	if (order.m_is_member_discount == "1")
 	{
-		CLabelUI *pMemberFee = new CLabelUI;
-		pMemberFee->SetFixedHeight(30);
-
-		std::wstring memberfee = L"会员优惠：-" + CLewaimaiString::UTF8ToUnicode(order.m_member_discount);
-		pMemberFee->SetText(memberfee.c_str());
-
-		pFeesLayout->Add(pMemberFee);
+		pFeesLayout->Add(MakeFeeRow(L"会员优惠", L"-" + CLewaimaiString::UTF8ToUnicode(order.m_member_discount)));
 
 		fees_num++;
 	}
@@ -333,13 +358,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	//首单优惠
 	if (order.m_is_firstcut == "1")
 	{
-		CLabelUI *pFirstCut = new CLabelUI;
-		pFirstCut->SetFixedHeight(30);
-
-		std::wstring firstcut = L"首单优惠：-" + CLewaimaiString::UTF8ToUnicode(order.m_firstcut_value);
-		pFirstCut->SetText(firstcut.c_str());
-
-		pFeesLayout->Add(pFirstCut);
+		pFeesLayout->Add(MakeFeeRow(L"首单优惠", L"-" + CLewaimaiString::UTF8ToUnicode(order.m_firstcut_value)));
 
 		fees_num++;
 	}
@@ -348,16 +367,10 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	std::string::size_type position = order.m_promotion.find(":");
 	if (position != order.m_promotion.npos)
 	{
-		CLabelUI *pManjian = new CLabelUI;
-		pManjian->SetFixedHeight(30);
-
 		std::string promotion_value;
 		promotion_value.assign(order.m_promotion, position + 1);
 
-		std::wstring promotion = L"满减优惠：-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)(atof(promotion_value.c_str())), 2));
-		pManjian->SetText(promotion.c_str());
-
-		pFeesLayout->Add(pManjian);
+		pFeesLayout->Add(MakeFeeRow(L"满减优惠", L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)(atof(promotion_value.c_str())), 2))));
 
 		fees_num++;
 	}
@@ -365,13 +378,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	//优惠券
 	if (order.m_coupon > 0)
 	{
-		CLabelUI *pCoupon = new CLabelUI;
-		pCoupon->SetMaxHeight(30);
-
-		std::wstring coupon = L"优惠券：-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_coupon, 2));
-		pCoupon->SetText(coupon.c_str());
-
-		pFeesLayout->Add(pCoupon);
+		pFeesLayout->Add(MakeFeeRow(L"优惠券", L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_coupon, 2))));
 
 		fees_num++;
 	}
@@ -379,13 +386,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	//商品券
 	if (atof(order.m_goods_coupon_value.c_str()) > 0.0001)
 	{
-		CLabelUI *pGoodsCoupon = new CLabelUI;
-		pGoodsCoupon->SetFixedHeight(30);
-
-		std::wstring goods_coupon = L"商品券：-" + CLewaimaiString::UTF8ToUnicode(order.m_goods_coupon_value);
-		pGoodsCoupon->SetText(goods_coupon.c_str());
-
-		pFeesLayout->Add(pGoodsCoupon);
+		pFeesLayout->Add(MakeFeeRow(L"商品券", L"-" + CLewaimaiString::UTF8ToUnicode(order.m_goods_coupon_value)));
 
 		fees_num++;
 	}
@@ -407,114 +408,128 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 		fees_height = fees_num * 30;
 	}
 
-	CLabelUI *pTotalPrice = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_totalprice")));
-	std::wstring price = L"总计：￥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(order.m_price, 2));
-	pTotalPrice->SetText(price.c_str());
+	//R76d：总计 = 「总计：」+ 绿色加粗金额（两个纯文本 Label）
+	{
+		std::wstring price = CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(order.m_price, 2));
+		this->FindSubControl(_T("waimai_order_info_page_totalprice_val"))->SetText(price.c_str());
+	}
+
+	//R76：卡1 = 标题41 + 线1 + 空12 + List + 空12 + 备注30 + 费用 + 线1 + 总计36 + 底8
 
-	int nTotalHeight = order_item_height + fees_height + 133;
+	int nTotalHeight = order_item_height + fees_height + 141;
 	this->FindSubControl(_T("waimai_order_info_page_layout_1"))->SetFixedHeight(nTotalHeight);
 
 	//开始显示顾客信息
-	std::wstring name_show = L"姓名：" + CLewaimaiString::UTF8ToUnicode(order.m_customer_name);
-	this->FindSubControl(_T("waimai_order_info_page_name"))->SetText(name_show.c_str());
-
-	std::wstring phone_show = L"电话：" + CLewaimaiString::UTF8ToUnicode(order.m_phone);
-	this->FindSubControl(_T("waimai_order_info_page_phone"))->SetText(phone_show.c_str());
-
-	std::wstring address_show = L"地址：" + CLewaimaiString::UTF8ToUnicode(order.m_address);
-	this->FindSubControl(_T("waimai_order_info_page_address"))->SetText(address_show.c_str());
-
-	std::wstring order_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(order.m_order_date);
-	this->FindSubControl(_T("waimai_order_info_page_init_date"))->SetText(order_date_show.c_str());
-
-	//开始处理骑手信息
-	if (atoi(order.m_courier_id.c_str()) > 0)
 	{
-		//有人接单了
-		this->FindSubControl(_T("waimai_order_info_page_qishouinfo"))->SetVisible(true);
-
-		std::wstring qishou_name = L"骑手姓名：" + CLewaimaiString::UTF8ToUnicode(order.m_courier_name);
-		this->FindSubControl(_T("waimai_order_info_page_qishou_name"))->SetText(qishou_name.c_str());
+		std::wstring v = CLewaimaiString::UTF8ToUnicode(order.m_customer_name);
+		this->FindSubControl(_T("waimai_order_info_page_name_val"))->SetText(v.empty() ? _T("-") : v.c_str());
+	}
+	{
+		std::wstring v = CLewaimaiString::UTF8ToUnicode(order.m_phone);
+		this->FindSubControl(_T("waimai_order_info_page_phone_val"))->SetText(v.empty() ? _T("-") : v.c_str());
+	}
+	{
+		std::wstring v = CLewaimaiString::UTF8ToUnicode(order.m_address);
+		this->FindSubControl(_T("waimai_order_info_page_address_val"))->SetText(v.empty() ? _T("-") : v.c_str());
+	}
+	{
+		std::wstring v = CLewaimaiString::UTF8ToUnicode(order.m_order_date);
+		this->FindSubControl(_T("waimai_order_info_page_init_date_val"))->SetText(v.empty() ? _T("-") : v.c_str());
+	}
 
-		std::wstring qishou_phone = L"骑手电话：" + CLewaimaiString::UTF8ToUnicode(order.m_courier_phone);
-		this->FindSubControl(_T("waimai_order_info_page_qishou_phone"))->SetText(qishou_phone.c_str());
+	//开始处理骑手信息　R76：卡片常显，无骑手时值为 "-"（与设计稿一致）
+	this->FindSubControl(_T("waimai_order_info_page_qishouinfo"))->SetVisible(true);
+	{
+		std::wstring wsCourierName;
+		std::wstring wsCourierPhone;
+		std::wstring wsCourierType;
 
-		std::wstring qishou_type;
-		if (order.m_courier_type == "3")
-		{
-			qishou_type = L"骑手类型：快服务骑手";
-		}
-		else if (order.m_courier_type == "5")
+		if (atoi(order.m_courier_id.c_str()) > 0)
 		{
-			qishou_type = L"骑手类型：达达骑手";
-		}
-		else
-		{
-			qishou_type = L"骑手类型：商家自配送骑手";
+			//有人接单了
+			wsCourierName = CLewaimaiString::UTF8ToUnicode(order.m_courier_name);
+			wsCourierPhone = CLewaimaiString::UTF8ToUnicode(order.m_courier_phone);
+
+			if (order.m_courier_type == "3")
+			{
+				wsCourierType = L"快服务骑手";
+			}
+			else if (order.m_courier_type == "5")
+			{
+				wsCourierType = L"达达骑手";
+			}
+			else
+			{
+				wsCourierType = L"商家自配送骑手";
+			}
 		}
 
-		this->FindSubControl(_T("waimai_order_info_page_qishou_type"))->SetText(qishou_type.c_str());
-	}
-	else
-	{
-		this->FindSubControl(_T("waimai_order_info_page_qishouinfo"))->SetVisible(false);
+		this->FindSubControl(_T("waimai_order_info_page_qishou_name_val"))->SetText(wsCourierName.empty() ? _T("-") : wsCourierName.c_str());
+		this->FindSubControl(_T("waimai_order_info_page_qishou_phone_val"))->SetText(wsCourierPhone.empty() ? _T("-") : wsCourierPhone.c_str());
+		this->FindSubControl(_T("waimai_order_info_page_qishou_type_val"))->SetText(wsCourierType.empty() ? _T("-") : wsCourierType.c_str());
 	}
 
 	//开始处理订单信息
 	if (order.m_is_selftake == "1")
 	{
-		CLabelUI *pDeliveryType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_delivery_type")));
-		std::wstring wsDeliveryType = _T("配送方式：到店自取（取餐号：") + CLewaimaiString::UTF8ToUnicode(order.m_take_food_code) + _T("）");
+		CLabelUI *pDeliveryType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_delivery_type_val")));
+		std::wstring wsDeliveryType = std::wstring(L"到店自取（取餐号：") + CLewaimaiString::UTF8ToUnicode(order.m_take_food_code) + L"）";
 		pDeliveryType->SetText(wsDeliveryType.c_str());
 	}
 	else
 	{
-		CLabelUI *pDeliveryType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_delivery_type")));
-		std::wstring wsDeliveryType = _T("配送方式：外卖配送");
-		pDeliveryType->SetText(wsDeliveryType.c_str());
+		CLabelUI *pDeliveryType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_delivery_type_val")));
+		pDeliveryType->SetText(_T("外卖配送"));
 	}
 
-	CLabelUI *pShopname = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_shopname")));
-	std::wstring wsShopname = _T("店铺名字：") + CLewaimaiString::UTF8ToUnicode(order.m_shop_name);
-	pShopname->SetText(wsShopname.c_str());
+	CLabelUI *pShopname = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_shopname_val")));
+	{
+		std::wstring wsShopname = CLewaimaiString::UTF8ToUnicode(order.m_shop_name);
+		pShopname->SetText(wsShopname.empty() ? _T("-") : wsShopname.c_str());
+	}
 
+	//R76：取餐号常显，非自取订单值为 "-"（与设计稿一致）
 	int nTakeFoodCodeHeight = 0;
-	CLabelUI *pTakeFoodCode = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_take_food_code")));
-	if (order.m_is_selftake == "1")
+	CControlUI *pTakeFoodCode = this->FindSubControl(_T("waimai_order_info_page_take_food_code"));
 	{
-		//自取订单，显示取餐号
+		std::wstring wsTakeLabel;
+		std::wstring wsTakeVal;
 		if (CShopinfo::GetInstance()->m_version_type == "1")
 		{
-			std::wstring wsTakeFoodCode = _T("取餐号：") + CLewaimaiString::UTF8ToUnicode(order.m_take_food_code);
-			pTakeFoodCode->SetText(wsTakeFoodCode.c_str());
+			wsTakeLabel = L"取餐号";
 		}
 		else
 		{
-			std::wstring wsTakeFoodCode = _T("取单号：") + CLewaimaiString::UTF8ToUnicode(order.m_take_food_code);
-			pTakeFoodCode->SetText(wsTakeFoodCode.c_str());
+			wsTakeLabel = L"取单号";
+		}
+
+		if (order.m_is_selftake == "1")
+		{
+			//自取订单，显示取餐号
+			wsTakeVal = CLewaimaiString::UTF8ToUnicode(order.m_take_food_code);
 		}
 
+		this->FindSubControl(_T("waimai_order_info_page_take_food_code_lab"))->SetText(wsTakeLabel.c_str());
+		this->FindSubControl(_T("waimai_order_info_page_take_food_code_val"))->SetText(wsTakeVal.empty() ? _T("-") : wsTakeVal.c_str());
 		pTakeFoodCode->SetVisible(true);
-		nTakeFoodCodeHeight = 30;
-	}
-	else
-	{
-		pTakeFoodCode->SetVisible(false);
-		nTakeFoodCodeHeight = 0;
+		nTakeFoodCodeHeight = 31;
 	}
 
-	CLabelUI *pStatus = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_status")));
-	std::wstring wsStatus = _T("订单状态：") + CLewaimaiString::UTF8ToUnicode(order.m_order_status);
+	CLabelUI *pStatus = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_status_val")));
+	std::wstring wsStatusVal = CLewaimaiString::UTF8ToUnicode(order.m_order_status);
 
 	if (CLewaimaiString::UTF8ToUnicode(order.m_order_status) == _T("交易失败"))
 	{
-		wsStatus += _T("，失败原因：") + CLewaimaiString::UTF8ToUnicode(order.m_failed_reason);
+		wsStatusVal += L"，失败原因：" + CLewaimaiString::UTF8ToUnicode(order.m_failed_reason);
 	}
-	pStatus->SetText(wsStatus.c_str());
+	//R76d：订单状态 = 灰标签 + 绿色值（纯文本，无富文本、无背景胶囊）
+	pStatus->SetText(wsStatusVal.empty() ? _T("-") : wsStatusVal.c_str());
 
-	CLabelUI *pType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_type")));
-	std::wstring wsType = _T("订单来源：") + CLewaimaiString::UTF8ToUnicode(order.m_from_type);
-	pType->SetText(wsType.c_str());
+	CLabelUI *pType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_type_val")));
+	{
+		std::wstring wsType = CLewaimaiString::UTF8ToUnicode(order.m_from_type);
+		pType->SetText(wsType.empty() ? _T("-") : wsType.c_str());
+	}
 
 	//预设选项
 	CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI *>(this->FindSubControl(_T("waimai_order_info_page_field")));
@@ -525,20 +540,13 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	{
 		for (std::vector<CWaimaiOrderField>::iterator it = order.m_order_field.begin(); it != order.m_order_field.end() - 1; it++)
 		{
-			std::wstring order_field = CLewaimaiString::UTF8ToUnicode((*it).name) + L"：" + CLewaimaiString::UTF8ToUnicode((*it).value);
-
-			CLabelUI* newField = new CLabelUI();
-
-			newField->SetText(order_field.c_str());
-			newField->SetFixedHeight(30);
-
-			pLayout->Add(newField);
+			pLayout->Add(MakeFieldRow(CLewaimaiString::UTF8ToUnicode((*it).name), CLewaimaiString::UTF8ToUnicode((*it).value)));
 		}
 
 		//这里预设选项默认有一个配送时间，所以要减1
-		pLayout->SetFixedHeight((order.m_order_field.size() - 1) * 30);
+		pLayout->SetFixedHeight((order.m_order_field.size() - 1) * 31);
 
-		order_filed_height = (order.m_order_field.size() - 1) * 30;
+		order_filed_height = (order.m_order_field.size() - 1) * 31;
 
 		pLayout->SetVisible(true);
 	}
@@ -550,23 +558,18 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 	}
 
 	//配送时间
-	std::wstring delivery_date;
-	if (order.m_is_selftake == "1")
+	this->FindSubControl(_T("waimai_order_info_page_delivery_time_lab"))->SetText(order.m_is_selftake == "1" ? _T("自取时间") : _T("配送时间"));
 	{
-		delivery_date = L"自取时间：" + CLewaimaiString::UTF8ToUnicode(order.m_delivery_date);
+		std::wstring delivery_date = CLewaimaiString::UTF8ToUnicode(order.m_delivery_date);
+		this->FindSubControl(_T("waimai_order_info_page_delivery_time_val"))->SetText(delivery_date.empty() ? _T("-") : delivery_date.c_str());
 	}
-	else
+
+	CLabelUI *pPayType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_pay_type_val")));
 	{
-		delivery_date = L"配送时间：" + CLewaimaiString::UTF8ToUnicode(order.m_delivery_date);
+		std::wstring wsPayType = CLewaimaiString::UTF8ToUnicode(order.m_pay_type);
+		pPayType->SetText(wsPayType.empty() ? _T("-") : wsPayType.c_str());
 	}
 
-	CLabelUI *pTime = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_delivery_time")));
-	pTime->SetText(delivery_date.c_str());
-
-	CLabelUI *pPayType = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_pay_type")));
-	std::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);
@@ -586,7 +589,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 
 	CButtonUI* refund_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("waimai_order_info_page_refund")));
 
-	CLabelUI *pRefundStatus = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_refund_status")));
+	CControlUI *pRefundStatus = this->FindSubControl(_T("waimai_order_info_page_refund_status"));
 
 	int refundHeight = 0;
 	if (_tcscmp(CLewaimaiString::UTF8ToUnicode(order.m_order_status).c_str(), _T("未处理")) == 0)
@@ -642,9 +645,9 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 		if (CLewaimaiString::UTF8ToUnicode(order.m_pay_type) != L"货到付款")
 		{
 			pRefundStatus->SetVisible(true);
-			refundHeight = 30;
+			refundHeight = 31;
 
-			std::wstring refund_status_text = L"退款状态：";
+			std::wstring refund_status_text = L"";
 			if (refund_status == "0")
 			{
 				refund_button->SetVisible(true);
@@ -666,7 +669,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 				refund_status_text += L"退款失败，原因：" + CLewaimaiString::UTF8ToUnicode(order.m_refund_failed_reason);
 			}
 
-			pRefundStatus->SetText(refund_status_text.c_str());
+			this->FindSubControl(_T("waimai_order_info_page_refund_status_val"))->SetText(refund_status_text.empty() ? _T("-") : refund_status_text.c_str());
 		}
 		else
 		{
@@ -714,9 +717,9 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 		refund_button->SetVisible(false);
 
 		pRefundStatus->SetVisible(true);
-		refundHeight = 30;
+		refundHeight = 31;
 
-		std::wstring refund_status_text = L"退款状态：";
+		std::wstring refund_status_text = L"";
 		if (refund_status == "1")
 		{
 			refund_status_text += L"顾客申请退款，等待商家处理";
@@ -738,18 +741,18 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 			refund_status_text += L"顾客再次发起退款，等待客服介入处理中";
 		}
 
-		pRefundStatus->SetText(refund_status_text.c_str());
+		this->FindSubControl(_T("waimai_order_info_page_refund_status_val"))->SetText(refund_status_text.empty() ? _T("-") : refund_status_text.c_str());
 	}
 
 	int configMemoHeight = 0;
-	CLabelUI *pConfigmemo = static_cast<CLabelUI *>(this->FindSubControl(_T("waimai_order_info_page_configmemo")));
+	CControlUI *pConfigmemo = this->FindSubControl(_T("waimai_order_info_page_configmemo"));
 
 	if (m_order.m_configmemo != "")
 	{
-		configMemoHeight = 30;
+		configMemoHeight = 31;
 
-		std::wstring configMemo = L"商家备注：" + CLewaimaiString::UTF8ToUnicode(order.m_configmemo);
-		pConfigmemo->SetText(configMemo.c_str());
+		std::wstring configMemo = CLewaimaiString::UTF8ToUnicode(order.m_configmemo);
+		this->FindSubControl(_T("waimai_order_info_page_configmemo_val"))->SetText(configMemo.c_str());
 		pConfigmemo->SetVisible(true);
 	}
 	else
@@ -759,5 +762,7 @@ void CWaimaiOrderInfoPageUI::Refresh(CWaimaiOrder& order)
 		pConfigmemo->SetVisible(false);
 	}
 
-	this->FindSubControl(_T("waimai_order_info_page_layout_3"))->SetFixedHeight(nTakeFoodCodeHeight + order_filed_height + refundHeight + configMemoHeight + 211);
+	//R76：卡4 = 标题41 + 线1 + 空12 + 底16 + 31×字段数（固定 6 项 = 186）
+
+	this->FindSubControl(_T("waimai_order_info_page_layout_3"))->SetFixedHeight(nTakeFoodCodeHeight + order_filed_height + refundHeight + configMemoHeight + 256);
 }

zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.cpp

@@ -42,6 +42,32 @@ void CWaimaiOrderListPageUI::InitShow()
 	Refresh();
 }
 
+//从被点击的按钮向上找到所属的订单item（item是orderlist容器的直接子节点，不依赖内部嵌套层级）
+static CWaimaiOrderItemUI* FindOrderItemBySender(CControlUI* pSender)
+{
+	CControlUI* pNode = pSender;
+	int nGuard = 0;
+	while (pNode != NULL && nGuard++ < 64)
+	{
+		CControlUI* pParent = pNode->GetParent();
+		if (pParent == NULL)
+		{
+			return NULL;
+		}
+		if (pParent->GetName() == _T("orderlist"))
+		{
+			CContainerUI* pContainer = static_cast<CContainerUI*>(pNode);
+			if (pContainer->FindSubControl(_T("waimai_order_list_name_val")) != NULL)
+			{
+				return static_cast<CWaimaiOrderItemUI*>(pContainer);
+			}
+			return NULL;
+		}
+		pNode = pParent;
+	}
+	return NULL;
+}
+
 //处理按钮点击类事件
 void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
@@ -49,7 +75,8 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 
 	if (name == _T("waimai_order_list_print"))
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string waimai_order_id = item->getOrderID();
 		std::string waimai_order_no = item->getOrderNo();
 
@@ -58,7 +85,8 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("waimai_order_list_confirme"))
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string waimai_order_id = item->getOrderID();
 		CWaimaiOrder order;
 		bool ret = order.ConfirmeOrder(waimai_order_id);
@@ -73,7 +101,8 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("waimai_order_list_success"))
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string waimai_order_id = item->getOrderID();
 		CWaimaiOrder order;
 		bool ret = order.SuccessOrder(waimai_order_id);
@@ -89,7 +118,8 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	else if (name == _T("waimai_order_list_fail"))
 	{
 		//外卖订单的打印
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string waimai_order_id = item->getOrderID();
 
 		CWaimaiOrderFailReasonWnd* pWaimaiFailFrame = new CWaimaiOrderFailReasonWnd();
@@ -117,7 +147,8 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("waimai_order_list_agree"))
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string waimai_order_id = item->getOrderID();
 		CWaimaiOrder order;
 		bool ret = order.AgreeRefund(waimai_order_id);
@@ -132,7 +163,8 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("waimai_order_list_disagree"))
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string waimai_order_id = item->getOrderID();
 		CWaimaiOrder order;
 		bool ret = order.DisagreeRefund(waimai_order_id);
@@ -147,7 +179,8 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("waimai_order_list_info"))
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string waimai_order_id = item->getOrderID();
 		std::string waimai_order_no = item->getOrderNo();
 
@@ -159,21 +192,24 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == L"waimai_order_list_ziqu_hujiaoqucan")
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 
 		std::thread t(&CWaimaiOrderListPageUI::Hujiaoqucan, this, item);
 		t.detach();
 	}
 	else if (name == L"waimai_order_list_peisong_quxiaofadan")
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 
 		std::thread t(&CWaimaiOrderListPageUI::Quxiaofadan, this, item);
 		t.detach();
 	}
 	else if (name == L"waimai_order_list_peisong_fadan")
 	{
-		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
+		CWaimaiOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 
 		this->Fadan(item);
 	}
@@ -417,7 +453,7 @@ void CWaimaiOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("waimai_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + std::to_wstring(m_page) + _T("页/共 ") + std::to_wstring(m_total_page) + _T("页");
+	std::wstring pageinfo = _T("第") + std::to_wstring(m_page) + _T("页/共") + std::to_wstring(m_total_page) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];

zhipuzi_pos_windows/page/CZhengcanOrderInfoPageUI.cpp

@@ -7,6 +7,33 @@
 
 #include "../print/CPosPrinter.h"
 
+// =====================================================================
+// R77 · 费用行辅助：与外卖订单详情 MakeFeeRow 同构
+//   左标签（灰 #8A9099，160px）+ 右金额（深 #1F2329），两端对齐
+// =====================================================================
+static CHorizontalLayoutUI* MakeFeeRow(const std::wstring& wsLabel, const std::wstring& wsValue)
+{
+	CHorizontalLayoutUI* pRow = new CHorizontalLayoutUI;
+	pRow->SetFixedHeight(30);
+
+	CLabelUI* pLab = new CLabelUI;
+	pLab->SetAttribute(_T("font"), _T("13"));
+	pLab->SetAttribute(_T("textcolor"), _T("#FF8A9099"));
+	pLab->SetAttribute(_T("align"), _T("left"));
+	pLab->SetFixedWidth(160);
+	pLab->SetText(wsLabel.c_str());
+
+	CLabelUI* pVal = new CLabelUI;
+	pVal->SetAttribute(_T("font"), _T("13"));
+	pVal->SetAttribute(_T("textcolor"), _T("#FF1F2329"));
+	pVal->SetAttribute(_T("align"), _T("right"));
+	pVal->SetText(wsValue.c_str());
+
+	pRow->Add(pLab);
+	pRow->Add(pVal);
+	return pRow;
+}
+
 CZhengcanOrderInfoPageUI::CZhengcanOrderInfoPageUI()
 {
 
@@ -98,8 +125,10 @@ void CZhengcanOrderInfoPageUI::SetDate(CZhengcanOrder& order)
 
 void CZhengcanOrderInfoPageUI::Refresh(CZhengcanOrder& order)
 {
-	std::wstring order_no_show = L"订单号：" + CLewaimaiString::UTF8ToUnicode(order.show_trade_no);
-	this->FindSubControl(_T("zhengcan_order_info_page_order_num"))->SetText(order_no_show.c_str());
+	{
+		std::wstring order_no_show = CLewaimaiString::UTF8ToUnicode(order.show_trade_no);
+		this->FindSubControl(_T("zhengcan_order_info_page_order_num"))->SetText(order_no_show.empty() ? _T("-") : order_no_show.c_str());
+	}
 
 	//商品详情的渲染
 	CListUI* pFoodList = static_cast<CListUI*>(this->FindSubControl(_T("zhengcan_order_info_page_foodlist")));
@@ -137,12 +166,15 @@ void CZhengcanOrderInfoPageUI::Refresh(CZhengcanOrder& order)
 	}
 
 	//重设商品列表的高度
-	int order_item_height = (show_num + 1) * 30;
+	//R77：表头 35 + 每行 34（与外卖订单详情一致）
+	int order_item_height = 35 + show_num * 34;
 	pFoodList->SetFixedHeight(order_item_height);
 
-	CLabelUI *pMemo = static_cast<CLabelUI *>(this->FindSubControl(_T("dianneiorder_info_page_memo")));
-	std::wstring memo = _T("备注：") + CLewaimaiString::UTF8ToUnicode(order.m_memo);
-	pMemo->SetText(memo.c_str());
+	//R77：备注只填值（灰标签「备注」写在 XML 里）
+	{
+		std::wstring memo = CLewaimaiString::UTF8ToUnicode(order.m_memo);
+		this->FindSubControl(_T("dianneiorder_info_page_memo"))->SetText(memo.empty() ? _T("-") : memo.c_str());
+	}
 
 	//开始展示各种费用
 	CVerticalLayoutUI* pFeesLayout = static_cast<CVerticalLayoutUI *>(this->FindSubControl(_T("zhengcan_order_info_page_fees")));
@@ -152,182 +184,98 @@ void CZhengcanOrderInfoPageUI::Refresh(CZhengcanOrder& order)
 
 	if (atof(order.m_shangpinquan_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"商品券优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_shangpinquan_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"商品券优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_shangpinquan_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_cika_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"次卡优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_cika_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"次卡优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_cika_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_total_member_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"商品会员价优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_total_member_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"商品会员价优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_total_member_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_zhekou_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"整单折扣优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_zhekou_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"整单折扣优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_zhekou_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_member_zhekou_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"会员折扣优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_member_zhekou_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"会员折扣优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_member_zhekou_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_quanyika_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"权益卡优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_quanyika_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"权益卡优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_quanyika_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_manjian_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"满减优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_manjian_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"满减优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_manjian_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_youhuiquan_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"优惠券优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_youhuiquan_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"优惠券优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_youhuiquan_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_rengong_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"人工优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_rengong_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"人工优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_rengong_youhui)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_dabao_money.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"打包费金额：" + CLewaimaiString::UTF8ToUnicode(order.m_dabao_money);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"打包费金额", CLewaimaiString::UTF8ToUnicode(order.m_dabao_money)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_chawei_money.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"茶位费金额：" + CLewaimaiString::UTF8ToUnicode(order.m_chawei_money);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"茶位费金额", CLewaimaiString::UTF8ToUnicode(order.m_chawei_money)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_kaitai_money.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"开台费金额：" + CLewaimaiString::UTF8ToUnicode(order.m_kaitai_money);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"开台费金额", CLewaimaiString::UTF8ToUnicode(order.m_kaitai_money)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_jiajia.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"加价金额：" + CLewaimaiString::UTF8ToUnicode(order.m_jiajia);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"加价金额", CLewaimaiString::UTF8ToUnicode(order.m_jiajia)));
 
 		fees_num++;
 	}
 
 	if (atof(order.m_moling_youhui.c_str()) > 0)
 	{
-		CLabelUI *pFee = new CLabelUI;
-		pFee->SetFixedHeight(38);
-
-		std::wstring delivery_fee = L"抹零优惠金额：" + CLewaimaiString::UTF8ToUnicode(order.m_moling_youhui);
-		pFee->SetText(delivery_fee.c_str());
-
-		pFeesLayout->Add(pFee);
+		pFeesLayout->Add(MakeFeeRow(L"抹零优惠金额", CLewaimaiString::UTF8ToUnicode(order.m_moling_youhui)));
 
 		fees_num++;
 	}
@@ -344,27 +292,36 @@ void CZhengcanOrderInfoPageUI::Refresh(CZhengcanOrder& order)
 	{
 		pFeesLayout->SetVisible(true);
 		this->FindSubControl(_T("zhengcan_order_info_page_fees_line"))->SetVisible(true);
-		pFeesLayout->SetFixedHeight(fees_num * 38);
+		pFeesLayout->SetFixedHeight(fees_num * 30);
 
-		fees_height = fees_num * 38;
+		fees_height = fees_num * 30;
 	}
 
-	CLabelUI *pTotalPrice = static_cast<CLabelUI *>(this->FindSubControl(_T("zhengcan_order_info_page_totalprice")));
-	std::wstring price = L"总计：￥" + CLewaimaiString::UTF8ToUnicode(order.m_total_price);
-	pTotalPrice->SetText(price.c_str());
+	//R77：总计 = 「总计：」+ 绿色金额（两个纯文本 Label）
+	{
+		std::wstring price = CLewaimaiString::UTF8ToUnicode(order.m_total_price);
+		this->FindSubControl(_T("zhengcan_order_info_page_totalprice_val"))->SetText(price.empty() ? _T("0.00") : price.c_str());
+	}
 
-	int nTotalHeight = order_item_height + fees_height + 173;
+	//R77：卡1 = 标题41 + 线1 + 空12 + List + 空12 + 备注30 + 费用 + 线1 + 总计36 + 底8
+	int nTotalHeight = order_item_height + fees_height + 141;
 	this->FindSubControl(_T("zhengcan_order_info_page_layout_1"))->SetFixedHeight(nTotalHeight);
 
 	//开始显示顾客信息
-	std::wstring table_name = L"桌号：" + CLewaimaiString::UTF8ToUnicode(order.table_name);
-	this->FindSubControl(_T("zhengcan_order_info_page_zhuohao"))->SetText(table_name.c_str());
+	{
+		std::wstring table_name = CLewaimaiString::UTF8ToUnicode(order.table_name);
+		this->FindSubControl(_T("zhengcan_order_info_page_zhuohao"))->SetText(table_name.empty() ? _T("-") : table_name.c_str());
+	}
 
-	std::wstring renshu_show = L"人数：" + CLewaimaiString::UTF8ToUnicode(order.m_renshu);
-	this->FindSubControl(_T("zhengcan_order_info_page_renshu"))->SetText(renshu_show.c_str());
+	{
+		std::wstring renshu_show = CLewaimaiString::UTF8ToUnicode(order.m_renshu);
+		this->FindSubControl(_T("zhengcan_order_info_page_renshu"))->SetText(renshu_show.empty() ? _T("-") : renshu_show.c_str());
+	}
 
-	std::wstring order_date_show = L"下单时间：" + CLewaimaiString::UTF8ToUnicode(order.init_time);
-	this->FindSubControl(_T("zhengcan_order_info_page_init_date"))->SetText(order_date_show.c_str());
+	{
+		std::wstring order_date_show = CLewaimaiString::UTF8ToUnicode(order.init_time);
+		this->FindSubControl(_T("zhengcan_order_info_page_init_date"))->SetText(order_date_show.empty() ? _T("-") : order_date_show.c_str());
+	}
 
 	//开始处理订单信息
 	std::wstring laiyuan;
@@ -381,27 +338,24 @@ void CZhengcanOrderInfoPageUI::Refresh(CZhengcanOrder& order)
 		laiyuan = L"扫码下单";
 	}
 
-	CLabelUI *pType = static_cast<CLabelUI *>(this->FindSubControl(_T("zhengcan_order_info_page_type")));
-	std::wstring wsType = _T("订单来源：") + laiyuan;
-	pType->SetText(wsType.c_str());
+	this->FindSubControl(_T("zhengcan_order_info_page_type"))->SetText(laiyuan.empty() ? _T("-") : laiyuan.c_str());
 
-	CLabelUI *pPayType = static_cast<CLabelUI *>(this->FindSubControl(_T("zhengcan_order_info_page_pay_type")));
-	std::wstring wsPayType = _T("付款方式：") + CLewaimaiString::UTF8ToUnicode(order.shoukuan_type);
-	pPayType->SetText(wsPayType.c_str());
+	{
+		std::wstring wsPayType = CLewaimaiString::UTF8ToUnicode(order.shoukuan_type);
+		this->FindSubControl(_T("zhengcan_order_info_page_pay_type"))->SetText(wsPayType.empty() ? _T("-") : wsPayType.c_str());
+	}
 
-	CLabelUI *pRefund = static_cast<CLabelUI *>(this->FindSubControl(_T("zhengcan_order_info_page_refund_status")));
 	if (order.is_refund == "1")
 	{
-		std::wstring wsPayType = _T("退款状态：已退款");
-		pRefund->SetText(wsPayType.c_str());
+		this->FindSubControl(_T("zhengcan_order_info_page_refund_status"))->SetText(_T("已退款"));
 	}
 	else
 	{
-		std::wstring wsPayType = _T("退款状态：未退款");
-		pRefund->SetText(wsPayType.c_str());
+		this->FindSubControl(_T("zhengcan_order_info_page_refund_status"))->SetText(_T("未退款"));
 	}
 
-	this->FindSubControl(_T("zhengcan_order_info_page_layout_3"))->SetFixedHeight(181);
+	//R77：卡3 = 标题41 + 线1 + 空12 + 底16 + 31×字段数
+	this->FindSubControl(_T("zhengcan_order_info_page_layout_3"))->SetFixedHeight(194);
 
 	//退款按钮
 	CButtonUI* refund_button = static_cast<CButtonUI *>(m_pManager->FindControl(_T("zhengcan_order_info_page_refund")));

zhipuzi_pos_windows/page/CZhengcanOrderListPageUI.cpp

@@ -34,13 +34,40 @@ void CZhengcanOrderListPageUI::InitShow()
 }
 
 //处理按钮点击类事件
+//从被点击的按钮向上找到所属的订单item（item是orderlist容器的直接子节点，不依赖内部嵌套层级）
+static CZhengcanOrderItemUI* FindOrderItemBySender(CControlUI* pSender)
+{
+	CControlUI* pNode = pSender;
+	int nGuard = 0;
+	while (pNode != NULL && nGuard++ < 64)
+	{
+		CControlUI* pParent = pNode->GetParent();
+		if (pParent == NULL)
+		{
+			return NULL;
+		}
+		if (pParent->GetName() == _T("orderlist"))
+		{
+			CContainerUI* pContainer = static_cast<CContainerUI*>(pNode);
+			if (pContainer->FindSubControl(_T("zhengcan_order_list_order_num_val")) != NULL)
+			{
+				return static_cast<CZhengcanOrderItemUI*>(pContainer);
+			}
+			return NULL;
+		}
+		pNode = pParent;
+	}
+	return NULL;
+}
+
 void CZhengcanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 
 	if (name == _T("zhengcan_order_list_print"))
 	{
-		CZhengcanOrderItemUI* item = static_cast<CZhengcanOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		CZhengcanOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string zhengcan_order_id = item->getOrderID();
 
 		CPosPrinter printer;
@@ -48,7 +75,8 @@ void CZhengcanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("zhengcan_order_list_info"))
 	{
-		CZhengcanOrderItemUI* item = static_cast<CZhengcanOrderItemUI*>(msg.pSender->GetParent()->GetParent());
+		CZhengcanOrderItemUI* item = FindOrderItemBySender(msg.pSender);
+		if (item == NULL) { return; }
 		std::string zhengcan_order_id = item->getOrderID();
 
 		CZhengcanOrderInfoPageUI* page = static_cast<CZhengcanOrderInfoPageUI*>(m_pMainWnd->GetPage(CMainWnd::ZHENGCANINFO));
@@ -231,7 +259,7 @@ void CZhengcanOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("zhengcan_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + std::to_wstring(m_page) + _T("页/共 ") + std::to_wstring(m_total_page) + _T("页");
+	std::wstring pageinfo = _T("第") + std::to_wstring(m_page) + _T("页/共") + std::to_wstring(m_total_page) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];

zhipuzi_pos_windows/wnd/CHuiyuanXiugaimimaWnd.cpp

@@ -269,7 +269,7 @@ void CHuiyuanXiugaimimaWnd::Notify(TNotifyUI& msg)
 
 void CHuiyuanXiugaimimaWnd::Init()
 {
-	m_pm.FindControl(_T("member_phone"))->SetText((L"手机号：" + CLewaimaiString::UTF8ToUnicode(m_phone)).c_str());
+	m_pm.FindControl(_T("member_phone"))->SetText(CLewaimaiString::UTF8ToUnicode(m_phone).c_str());
 
 	CCheckBoxUI* pOpen = static_cast<CCheckBoxUI*>(m_pm.FindControl(L"password_pay_open"));
 	if (m_is_open_pay_password == "1")

zhipuzi_pos_windows/wnd/CHuiyuanXiugaiziliaoWnd.cpp

@@ -3,6 +3,8 @@
 
 #include "../helper/MD5.h"
 
+#include <stdio.h>
+
 LRESULT CHuiyuanXiugaiziliaoWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
 	POINT pt;
@@ -208,7 +210,7 @@ void CHuiyuanXiugaiziliaoWnd::Notify(TNotifyUI& msg)
 
 void CHuiyuanXiugaiziliaoWnd::Init()
 {
-	m_pm.FindControl(_T("member_phone"))->SetText((L"手机号：" + CLewaimaiString::UTF8ToUnicode(m_phone)).c_str());
+	m_pm.FindControl(_T("member_phone"))->SetText(CLewaimaiString::UTF8ToUnicode(m_phone).c_str());
 
 	m_pm.FindControl(L"kahao_edit")->SetText(CLewaimaiString::UTF8ToUnicode(m_member_card_no).c_str());
 
@@ -231,7 +233,21 @@ void CHuiyuanXiugaiziliaoWnd::Init()
 
 	if (m_birthday != "")
 	{
-		pBirthday->SetText(CLewaimaiString::UTF8ToUnicode(m_birthday).c_str());
+		// 会员生日只有日期（yyyy-MM-dd），不设置时、分、秒
+		int nYear = 0, nMonth = 0, nDay = 0;
+		if (::sscanf(m_birthday.c_str(), "%d-%d-%d", &nYear, &nMonth, &nDay) == 3 &&
+			nYear > 1601 && nMonth >= 1 && nMonth <= 12 && nDay >= 1 && nDay <= 31)
+		{
+			SYSTEMTIME stBirthday = { 0 };
+			stBirthday.wYear = (WORD)nYear;
+			stBirthday.wMonth = (WORD)nMonth;
+			stBirthday.wDay = (WORD)nDay;
+			pBirthday->SetTime(&stBirthday);
+		}
+		else
+		{
+			pBirthday->SetText(CLewaimaiString::UTF8ToUnicode(m_birthday).c_str());
+		}
 	}
 }
 

zhipuzi_pos_windows/zhipuzi_pos_windows.cpp

@@ -30,8 +30,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	//初始化所有配置，启动所有异步worker
 	CAppEnv::GetInstance()->Start();
 
-	//AITest();
-
     //开始展示窗口
     CPaintManagerUI::SetInstance(hInstance);