1

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<WaimaiOrderInfoPage bkcolor="#FFEFF6EE">
+	<WaimaiOrderInfoPage>
 		<VerticalLayout>
 			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" padding="0,0,0,0">
 				<Button name="waimai_order_info_page_return" float="true" pos="20,3,120,41" text="返回" textcolor="#FFFFFFFF"/>

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

@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<WaimaiOrderListPage>
-		<VerticalLayout bkcolor="#FFEFF6EE">
-			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" >
-				<Control />
-				<Button name="waimai_order_list_refresh" width="70" height="36" padding="20,4,0,0" text="刷新" textcolor="#FFFFFFFF" />
-				<Button name="waimai_order_list_last" width="70" height="36" padding="20,4,0,0" text="上一页" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-				<Button name="waimai_order_list_next" width="70" height="36" padding="20,4,0,0" text="下一页" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-				<Label name="waimai_order_list_page" width="150" height="36" padding="20,4,0,0" />
+		<VerticalLayout>
+			<HorizontalLayout height="53" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+				<VerticalLayout width="300" height="53">
+					<Button name="shoukuan_btn_saomazhifu" text="店内订单" textcolor="#FF43A947" font="2" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="shoukuan_btn_saomazhifu_line" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+				</VerticalLayout>
+				
+				<VerticalLayout width="300" height="53">
+					<Button name="shoukuan_btn_shoujihao" text="外卖订单" font="2" height="50" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+					<Control name="shoukuan_btn_shoujihao_line" visible="false" height="3" bkcolor="#FF43A947" padding="70,0,70,0"></Control>
+				</VerticalLayout>
 			</HorizontalLayout>
-			
+
 			<HorizontalLayout>
 				<HorizontalLayout width="250" padding="20,20,20,0">
-					<VerticalLayout height="400" bkcolor="#FFFFFFFF" childpadding="15" inset="20,20,20,0">
-						<Option name="waimai_open_switch" text="未处理" group="waimai_status_switch" align="center" height="36" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_confirmed_switch" text="已确认" group="waimai_status_switch" align="center" height="36" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_delivery_switch" text="配送中" group="waimai_status_switch" align="center" height="36" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_success_switch" text="成功" group="waimai_status_switch" align="center" height="36" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_fail_switch" text="失败"  group="waimai_status_switch" align="center" height="36" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_cancel_switch" text="已取消"  group="waimai_status_switch" align="center" height="36" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-						<Option name="waimai_refund_switch" text="退款中" group="waimai_status_switch" align="center" height="36" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
+					<VerticalLayout height="500" inset="20,20,20,0" bkcolor="#FFFFFFFF">
+						<Option name="waimai_open_switch" text="未处理" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='shuzi_btn_normal.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="已确认" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='shuzi_btn_normal.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="配送中" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='shuzi_btn_normal.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="成功" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='shuzi_btn_normal.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="失败"  group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='shuzi_btn_normal.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="已取消"  group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='shuzi_btn_normal.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="退款中" group="waimai_status_switch" padding="0,10,0,0" align="center" height="44" normalimage="file='shuzi_btn_normal.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>
 				</HorizontalLayout>
 										
@@ -39,6 +43,14 @@
 					<Control></Control>
 				</HorizontalLayout>
 			</HorizontalLayout>
+			
+			<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_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_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_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
+				<Label name="waimai_order_list_page" width="150" height="44" padding="20,4,0,0" />
+			</HorizontalLayout>
 		</VerticalLayout>
 	</WaimaiOrderListPage>
 </Window>