准备优化小屏适配

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="800,720" caption="0,0,0,44" roundcorner="4,4" >
+<Window size="800,660" caption="0,0,0,44" roundcorner="4,4" >
 	<Font id="0" name="微软雅黑" size="24" />
 	<Font id="1" name="微软雅黑" size="40" />
 	<Font id="2" name="微软雅黑" size="18" />
@@ -10,13 +10,13 @@
 			<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>
 		
-		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" padding="0,15,0,0">			
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" padding="0,0,0,0">			
 			<HorizontalLayout name="shoukuan_money_show_layout" height="50" padding="0,15,0,15">
 				<Label text="¥" font="0" textcolor="0xFF3CB371" float="true" pos="320,24,335,50"/>
 				<Label name="shoukuan_money_show_money" font="1" textcolor="0xFF3CB371" float="true" pos="345,12,620,48"/>
 			</HorizontalLayout>
 			
-			<HorizontalLayout height="40" padding="0,20,0,0">
+			<HorizontalLayout height="40" padding="0,0,0,0">
 				<VerticalLayout>
 					<Button name="shoukuan_btn_saomazhifu" text="扫码支付" textcolor="#FF43A947" font="2" heiht="38" width="200" padding="50,0,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
 					<Control name="shoukuan_btn_saomazhifu_line" width="180" height="3" bkcolor="#FF43A947" padding="60,0,10,0"></Control>
@@ -43,7 +43,7 @@
 				<Label text="请扫描顾客会员付款二维码" align="center" padding="0,30,0,0" height="40" font="0"></Label>
 			</VerticalLayout>
 			
-			<HorizontalLayout visible="false" name="fukuan_input_shoujihao_layout" padding="0,30,0,0">
+			<HorizontalLayout visible="false" name="fukuan_input_shoujihao_layout" padding="0,20,0,0">
 				<VerticalLayout height="230" padding="0,30,0,0">
 					<HorizontalLayout height="60">
 						<Label text="手机号：" font="2" float="true" pos="50,15,200,40"/>

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

@@ -4,9 +4,9 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-			<VerticalLayout width="380" bkcolor="#FFFFFFFF">				
+			<VerticalLayout width="320" bkcolor="#FFFFFFFF">				
 				<HorizontalLayout height="60" width="380" padding="0,80,0,0">
-					<Button name="shangpin_page_add_btn" width="350" height="60" padding="15,0,15,0" text="新建商品" 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="shangpin_page_add_btn" width="290" height="60" padding="15,0,15,0" text="新建商品" 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'" />
 				</HorizontalLayout>
 				
 				<Control></Control>

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

@@ -3,40 +3,38 @@
 	<WaimaiOrderItem height="280" bkcolor="#FFFFFFFF" padding="0,20,20,0" borderround="10,10">
 		<HorizontalLayout height="200">
 			<HorizontalLayout>
-				<Label float="true" name="waimai_order_list_order_num" text="订单号：" pos="10,6,380,36" />
-				<Label float="true" name="waimai_order_list_from" text="订单来源：" pos="400,6,682,36" />
-				
-				<Label float="true" name="waimai_order_list_name" text="姓名：" pos="10,36,182,66" />
-				<Label float="true" name="waimai_order_list_phone" text="电话：" pos="400,36,700,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_price" text="价格：" pos="400,96,600,126" />
+				<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_delivery_date" text="配送时间：" pos="10,156,320,186" />
-				
-				<Label float="true" name="waimai_order_list_refund_status" text="退款状态：" pos="400,156,800,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="250,120,362,190" />
-				<Control name="waimai_order_list_ziqu" bkimage="ziti.png" float="true" pos="400,120,512,190" />
+				<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="490,5,520,35" />
-				<Control name="waimai_order_list_eleme_icon" bkimage="eleme_icon.png" visible="false" float="true" pos="490,5,520,35" />
-				<Control name="waimai_order_list_zhipuzi_icon" bkimage="zhipuzi_waimai_icon.png" visible="false" float="true" pos="490,5,520,35" />
+				<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" />
 			</HorizontalLayout>
 			
-			<HorizontalLayout width="200">
-				<Button name="waimai_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="waimai_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 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="100,107,180,150" text="确认" textcolor="#FFFFFFFF"/>
-				<Button name="waimai_order_list_success" float="true" pos="100,107,180,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="100,155,180,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_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="100,107,180,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="100,155,180,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'"/>
 			</HorizontalLayout>
 		</HorizontalLayout>
 		

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

@@ -15,7 +15,7 @@
 			</HorizontalLayout>
 
 			<HorizontalLayout>
-				<HorizontalLayout width="250" padding="20,20,20,0">
+				<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" />

zhipuzi_pos_windows/control/CWaimaiOrderItemUI.cpp

@@ -49,7 +49,10 @@ void CWaimaiOrderItemUI::SetData(rapidjson::Value& orderinfo)
 	std::wstring price_show = L"价格：" + CLewaimaiString::UTF8ToUnicode(m_price);
 	this->FindSubControl(L"waimai_order_list_price")->SetText(price_show.c_str());
 
-	std::wstring order_no_show = L"#" + CLewaimaiString::UTF8ToUnicode(m_restaurant_number) + L"  订单号：" + CLewaimaiString::UTF8ToUnicode(m_order_no);
+	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);