把乐外卖那边的一些修改，同步过来

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Window size="600,300" caption="0,0,0,36" roundcorner="4,4" >
+	<VerticalLayout bkimage="file='Dialog_BG1.png' corner='4,50,4,4'">
+		<HorizontalLayout height="40" inset="10,2,10,0">
+			<Label name="messagebox_dlg_title" text="账号下线通知" width="150" />
+			<Control />
+			<Button name="messagebox_dlg_closebtn" padding="0,4,0,0" width="22" height="22" tooltip="关闭" normalimage="file='Login_TopBar_Close_Btn.png'" hotimage="file='Login_TopBar_Close_Btn_Hover.png'" pushedimage="file='Login_TopBar_Close_Btn_Click.png'"/>
+		</HorizontalLayout>
+		<VerticalLayout inset="15,0,15,15" vscrollbar="true" >
+			<Control height="60" />
+
+			<HorizontalLayout height="56">
+				<Label text="您的账号在别的地方登录，您被迫下线！" align="center"/>
+			</HorizontalLayout>
+		</VerticalLayout>
+	</VerticalLayout>
+</Window>

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

@@ -3,16 +3,23 @@
 	<WaimaiOrderItem height="200" bkcolor="#FFFFFFFF" padding="0,20,20,0">
 		<HorizontalLayout>
 			<Label float="true" name="waimai_order_list_order_no" text="订单号：" pos="10,6,320,36" />
+			<Label float="true" name="waimai_order_list_from" text="订单来源：" pos="350,6,582,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="350,36,600,66" />
-			<Label float="true" name="waimai_order_list_address" text="地址：" pos="10,66,182,96" />
+			<Label float="true" name="waimai_order_list_address" text="地址：" pos="10,66,550,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,182,156" />
+			<Label float="true" name="waimai_order_list_price" text="价格：" pos="350,96,500,126" />
+			
+			<Label float="true" name="waimai_order_list_type" text="配送方式：" pos="10,126,400,156" />
+			
 			<Label float="true" name="waimai_order_list_delivery_date" text="配送时间：" pos="10,156,182,186" />
 			
 			<Label float="true" name="waimai_order_list_refund_status" text="退款状态：" pos="350,156,800,186" />
 			
-			<Label float="true" name="waimai_order_list_price" text="价格：" pos="350,6,482,36" />
+			<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" />
 		</HorizontalLayout>
 		
 		<HorizontalLayout width="200">

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

@@ -66,6 +66,9 @@
 					<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" />
 				</VerticalLayout>
 			</VerticalLayout>
 
@@ -78,6 +81,8 @@
 				
 				<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_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_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_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" />
 			</HorizontalLayout>
 		</HorizontalLayout>
 	</WaimaiOrderInfo>

bin/Win32/Release/zhipuzi_pos_windows/log/pos.log

@@ -0,0 +1,6 @@
+2019-05-23 14:35:34[INFO] - Opened database successfully [e:\work\code\zhipuzi_pos_windows\zhipuzi_pos_windows\tool\csqlite3.cpp:29]
+2019-05-23 14:35:34[INFO] - create table success [e:\work\code\zhipuzi_pos_windows\zhipuzi_pos_windows\tool\csqlite3.cpp:75]
+2019-05-23 14:35:34[INFO] - create table success [e:\work\code\zhipuzi_pos_windows\zhipuzi_pos_windows\tool\csqlite3.cpp:172]
+2019-05-23 14:35:34[INFO] - create table success [e:\work\code\zhipuzi_pos_windows\zhipuzi_pos_windows\tool\csqlite3.cpp:256]
+2019-05-23 14:35:34[INFO] - Opened database successfully [e:\work\code\zhipuzi_pos_windows\zhipuzi_pos_windows\tool\csqlite3.cpp:29]
+2019-05-23 14:35:34[INFO] - save params success [e:\work\code\zhipuzi_pos_windows\zhipuzi_pos_windows\tool\csqlite3.cpp:325]