同步乐外卖那边的bin文件

bin/Win32/Debug/conf/lewaimai_pos_windows_server.conf

@@ -0,0 +1,15 @@
+#这个是调度中心的配置文件，“#"用来注释当前行
+
+#模式，debug或者release
+mode = release
+
+#debug环境的队列参数
+debug_pos_task_queue = prod-windows-pos-push
+
+#release环境的队列参数
+release_pos_task_queue = prod-windows-pos-push
+
+#连接阿里云的mns需要用到的参数
+mns.accountendpoint = https://1111769578085953.mns.cn-hangzhou.aliyuncs.com/
+mns.accesskeyid = 2HUnzc9XJV92PjvW
+mns.accesskeysecret = 20mMc8wuzlfC0r323b6oJqxlBPEyjW

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

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="520,410" caption="0,0,0,36" roundcorner="4,4" >
-	<Font shared="true" id="0" name="微软雅黑" size="20" />
-	<VerticalLayout bkimage="file='Dialog_BG2.png' corner='4,48,4,4'" >
-		<HorizontalLayout height="44">
-			<Label name="login_version" text="" height="44" valign="center" padding="10,0,0,0" textcolor="#FFFFFFFF"/>
-			<Control />
-			<Button name="closebtn" width="42" height="18" padding="0,6,0,0" tooltip="关闭收银软件" normalimage="file='frame_btn_close_normal.bmp' mask='#FFFF00FF'" hotimage="file='frame_btn_close_hot.bmp' mask='#FFFF00FF'" pushedimage="file='frame_btn_close_down.bmp' mask='#FFFF00FF'"/>
+	<Font id="0" name="微软雅黑" size="16" />
+	<Font id="1" name="微软雅黑" size="40" />
+	<Font id="2" name="微软雅黑" size="18" />
+	<Font id="3" name="微软雅黑" size="32" />
+	<VerticalLayout bkimage="file='Dialog_BG2.png' corner='4,48,4,4'" >		
+		<HorizontalLayout height="44" bkcolor="0xFF3CB371">
+			<Label name="login_version" text="" height="44" align="left" valign="center" padding="15,0,0,0" textcolor="#FFFFFFFF" font="0"/>
+			<Button name="closebtn" 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 height="80">
+		<HorizontalLayout height="90">
 			<Control></Control>
-			<HorizontalLayout bkimage="file='logo_guanwang.png'" width="202" height="43" padding="0,18,0,0"></HorizontalLayout>
+			<HorizontalLayout bkimage="file='logo_guanwang.png'" width="179" height="55" padding="0,22,0,0"></HorizontalLayout>
 			<Control></Control>
 		</HorizontalLayout>
 		
@@ -38,9 +40,9 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<HorizontalLayout height="50">
+			<HorizontalLayout height="59">
 				<Control></Control>
-				<Button name="loginBtn" text="登录" height="38" width="270" padding="0,15,0,0" tooltip="点击这里登录" 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="loginBtn" text="登录" height="44" width="270" padding="0,15,0,0" tooltip="点击这里登录" 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'" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>
@@ -57,7 +59,7 @@
 		
 		<HorizontalLayout padding="0,0,0,15">
 			<Control></Control>
-			<Button name="guanwang" text="{u}www.zhipuzi.com{/u}" showhtml="true" width="200" align="center"/>
+			<Button name="guanwang" text="{u}www.lewaimai.com{/u}" showhtml="true" width="200" align="center"/>
 			<Control></Control>
 		</HorizontalLayout>
     </VerticalLayout>

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

@@ -12,8 +12,8 @@
     		<Control height="1" bkcolor="#FF1B4876" />
     		<Control height="2" bkcolor="#FFD1EDFF" />
     		<HorizontalLayout height="90" bkcolor="#FF8DD3FF" bkcolor2="#FF60B1FE">
-    			<VerticalLayout width="200">
-    				<Label name="main_name_version" text="智铺子收银软件" padding="5,5,0,0"/>
+    			<VerticalLayout width="600">
+    				<Label name="main_name_version" text="乐外卖接单软件" padding="5,5,0,0"/>
     			</VerticalLayout>
     			<HorizontalLayout childpadding="20" inset="10,16,10,10" >    				
     				<Control />

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

@@ -3,9 +3,10 @@
 	<Setting name="setting_page" bkcolor="#FFEFF6EE">
 		<HorizontalLayout>
 			<HorizontalLayout width="250" padding="20,20,20,0">
-				<VerticalLayout height="400" bkcolor="#FFFFFFFF" childpadding="15" inset="20,20,20,0">
+				<VerticalLayout height="440" bkcolor="#FFFFFFFF" childpadding="15" inset="20,20,20,0">
 					<Option name="setting_waimai_order_switch" selected="true" text="外卖接单设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 					<Option name="setting_printer_switch" text="小票打印设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
+					<Option name="setting_biaoqian_printer_switch" text="标签打印设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 					<Option name="setting_chufang_printer_switch" text="厨房打印设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 					<Option name="setting_system_switch" text="系统设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 					<Option name="setting_system_about" text="关于" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
@@ -62,8 +63,8 @@
 						</Combo>
 					</HorizontalLayout>
 					<HorizontalLayout height="44" name="setting_printer_usb_layout">
-						<Label text="usb打印设备选择" width="260"/>
-						<Combo name="setting_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的打印机接口类型" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+						<Label text="usb打印机端口选择" width="260"/>
+						<Combo name="setting_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的打印机端口" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
 						</Combo>
 					</HorizontalLayout>
 					<HorizontalLayout height="56" name="setting_printer_wangkou_layout">
@@ -76,7 +77,7 @@
 						<Label text="小票格式设置" width="260" />
 					</HorizontalLayout>
 					<Control height="1" bkcolor="#FF708090" />
-					<HorizontalLayout height="44">
+					<HorizontalLayout height="44" visible="false">
 						<Label text="取货方式大号字体" width="260" />
 						<CheckBox name="setting_printer_quhuo_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
@@ -88,7 +89,7 @@
 						<Label text="下单时间大号字体" width="260" />
 						<CheckBox name="setting_printer_xiadanshijian_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
-					<HorizontalLayout height="44">
+					<HorizontalLayout height="44" visible="false">
 						<Label text="配送（自取）时间大号字体" width="260" />
 						<CheckBox name="setting_printer_peisongshijian_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
@@ -121,6 +122,37 @@
 						<CheckBox name="setting_printer_pay_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
 				</VerticalLayout>
+				
+				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15" vscrollbar="true">
+					<HorizontalLayout height="44">
+						<Label text="新订单自动打印标签纸" width="260" />
+						<CheckBox name="setting_is_new_waimai_biaoqian_printer" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+					</HorizontalLayout>
+
+					<HorizontalLayout height="44" name="setting_biaoqian_printer_usb_layout">
+						<Label text="标签打印机usb端口选择" width="260"/>
+						<Combo name="setting_biaoqian_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的标签打印机usb端口" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+						</Combo>
+					</HorizontalLayout>
+					
+					<HorizontalLayout height="44">
+						<Label text="标签纸尺寸规格" width="260"/>
+						<Combo name="setting_biaoqian_printer_guige" padding="0,9,0,0" width="140" height="26" tooltip="请点击这里选择您的标签纸尺寸规格" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+							<ListLabelElement text="40*30mm" selected="true" />
+							<ListLabelElement text="35*25mm" />
+							<ListLabelElement text="30*25mm" />
+							<ListLabelElement text="30*20mm" />
+						</Combo>
+					</HorizontalLayout>
+					
+					<HorizontalLayout height="44">
+						<Label text="出纸方向" width="260"/>
+						<Combo name="setting_biaoqian_printer_fangxiang" padding="0,9,0,0" width="140" height="26" tooltip="请点击这里选择您的标签纸出纸方向" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+							<ListLabelElement text="正方向" selected="true" />
+							<ListLabelElement text="反方向" />
+						</Combo>
+					</HorizontalLayout>
+				</VerticalLayout>
 
 				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
 					<HorizontalLayout height="44">
@@ -130,15 +162,15 @@
 					<HorizontalLayout height="44" padding="0,30,0,20">
 						<Button name="setting_new_chufang_printer_btn" align="center" width="200" height="38" padding="0,3,0,3" 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'" />
 					</HorizontalLayout>
-					<List name="setting_chufang_printer_list" bordersize="1" bordercolor="#FF000000" itemlinecolor="#FF000000" vscroll="true">
+					<List name="setting_chufang_printer_list" bordersize="1" bordercolor="#FF000000" itemlinecolor="#FF000000" vscrollbar="true" hscrollbar="true">
 						<ListHeader />
-						<ListHeaderItem text="打印机名称" width="200" align="center" />
-						<ListHeaderItem text="IP地址" width="200" align="center" />
-						<ListHeaderItem text="打印机规格" width="100" align="center" />
-						<ListHeaderItem text="商品分单打印" width="100" align="center" />
-						<ListHeaderItem text="按商品分类打印" width="200" align="center" />
-						<ListHeaderItem text="关联商品分类" width="200" align="center" />
-						<ListHeaderItem text="操作" align="center" />
+						<ListHeaderItem text="打印机名称" width="180" align="center" />
+						<ListHeaderItem text="IP地址" width="150" align="center" />
+						<ListHeaderItem text="打印机规格" width="150" align="center" />
+						<ListHeaderItem text="商品分单打印" width="150" align="center" />
+						<ListHeaderItem text="按商品分类打印" width="150" align="center" />
+						<ListHeaderItem text="关联商品分类" width="300" align="center" />
+						<ListHeaderItem text="操作" width="200" align="center"/>
 					</List> 
 				</VerticalLayout>
 
@@ -159,7 +191,7 @@
 
 				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
 					<Control height="300" />
-					<Label text="智铺子收银软件" align="center">
+					<Label text="乐外卖接单软件" align="center">
 					</Label>
 					<Label name="setting_version" text="版本号：1.0.0.1" align="center">
 					</Label>

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

@@ -3,15 +3,15 @@
 <Window> 
 	<ListContainerElement name="setting_chufang_printer_item" height="80"> 
 		<HorizontalLayout> 
-			<Label name="setting_chufang_printer_item_name" width="200" align="center"/> 
-			<Label name="setting_chufang_printer_item_ip" width="200" align="center"/> 
-			<Label name="setting_chufang_printer_guige" width="100" align="center"/>
-			<Label name="setting_chufang_printer_fendan" width="100" align="center"/> 
-			<Label name="setting_chufang_printer_item_fenlei" width="200" align="center"/> 
+			<Label name="setting_chufang_printer_item_name" width="180" height="80" align="center"/> 
+			<Label name="setting_chufang_printer_item_ip" width="150" align="center"/> 
+			<Label name="setting_chufang_printer_guige" width="150" align="center"/>
+			<Label name="setting_chufang_printer_fendan" width="150" align="center"/> 
+			<Label name="setting_chufang_printer_item_fenlei" width="150" align="center"/> 
 			<HorizontalLayout width="300" height="80" valign="center">
-				<Label name="setting_chufang_printer_item_fenlei_ids" width="300" multiline="true" align="center" valign="center"/> 
+				<Label name="setting_chufang_printer_item_fenlei_ids" width="200" multiline="true" align="center" valign="center"/> 
 			</HorizontalLayout>
-			<HorizontalLayout name="setting_chufang_printer_caozuo" align="center">
+			<HorizontalLayout name="setting_chufang_printer_caozuo" width="200" align="center">
 				<Control></Control>
 				<Button name="setting_chufang_printer_item_update_btn" align="center" width="26" height="27" padding="20,25,0,0" normalimage="file='Setting_Btn.png'" hotimage="file='Setting_Btn_Hover.png'" pushedimage="file='Setting_Btn_Active.png'" />
 				<Button name="setting_chufang_printer_item_delete_btn" align="center" width="18" height="18" padding="20,29,0,0" normalimage="file='Delete_Members_Icon.png'" hotimage="file='Delete_Members_Icon_Hover.png'" pushedimage="file='Delete_Members_Icon_Click.png'" />

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

@@ -10,7 +10,7 @@
 		
 		<HorizontalLayout height="80">
 			<Control></Control>
-			<HorizontalLayout bkimage="file='logo_guanwang.png'" width="202" height="43" padding="0,18,0,0"></HorizontalLayout>
+			<HorizontalLayout bkimage="file='logo_guanwang.png'" width="179" height="55" padding="0,18,0,0"></HorizontalLayout>
 			<Control></Control>
 		</HorizontalLayout>
 		
@@ -26,7 +26,7 @@
 		
 		<HorizontalLayout padding="0,0,0,15">
 			<Control></Control>
-			<Button name="guanwang" text="{u}www.zhipuzi.com{/u}" showhtml="true" width="200" align="center"/>
+			<Button name="guanwang" text="{u}www.lewaimai.com{/u}" showhtml="true" width="200" align="center"/>
 			<Control></Control>
 		</HorizontalLayout>
     </VerticalLayout>

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

@@ -2,19 +2,19 @@
 <Window>
 	<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_order_num" 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,550,96" />
+			<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="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_delivery_date" text="配送时间：" pos="10,156,282,186" />
 			
 			<Label float="true" name="waimai_order_list_refund_status" text="退款状态：" pos="350,156,800,186" />
 			

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

@@ -10,7 +10,7 @@
 				<VerticalLayout name="waimai_order_info_page_layout_1" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="10,0,10,0">
 					<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_no" text="订单号：" pos="80, 10, 500, 40" />
+						<Label float="true" name="waimai_order_info_page_order_num" text="订单号：" pos="80, 10, 500, 40" />
 					</HorizontalLayout>
 
 					<Control height="1" bkcolor="#FF708090" />
@@ -57,6 +57,7 @@
 				<VerticalLayout name="waimai_order_info_page_layout_3" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="10,0,10,0">
 					<Label text="订单信息" height="30" />
 					<Control height="1" bkcolor="#FF708090" />
+					<Label name="waimai_order_info_page_shopname" 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="付款方式：" />