Преглед на файлове

样式基本上没问题了

张洋 преди 4 дни
родител
ревизия
dbd9708c11
променени са 43 файла, в които са добавени 349 реда и са изтрити 325 реда
  1. 6 0
      DuiLib/Control/UIList.cpp
  2. 3 3
      bin/Win32/Debug/zhipuzi_pos_windows/skin/aixuexi_page.xml
  3. 7 7
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_cart_item.xml
  4. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem.xml
  5. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_wutu.xml
  6. 9 8
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml
  7. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dianneiorder_info_page.xml
  8. 4 4
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fulika_shoukuan_wnd.xml
  9. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fuping_cart_item.xml
  10. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fuping_wnd.xml
  11. 4 4
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_add_wnd.xml
  12. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_bangka_wnd.xml
  13. 5 5
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_chongzhi_wnd.xml
  14. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_page.xml
  15. 5 5
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_shoukuan_wnd.xml
  16. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaimima_wnd.xml
  17. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaiziliao_wnd.xml
  18. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/login.xml
  19. 3 3
      bin/Win32/Debug/zhipuzi_pos_windows/skin/member_login_dlg.xml
  20. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_cika_dlg.xml
  21. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_quanyika_dlg.xml
  22. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_shangpinquan_dlg.xml
  23. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_youhuiquan_dlg.xml
  24. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_chufang_printer_item.xml
  25. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_diannei_tixing.xml
  26. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_tiaomacheng.xml
  27. 6 6
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_create_page.xml
  28. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_fooditem.xml
  29. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_fooditem_wutu.xml
  30. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_newtype_wnd.xml
  31. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_saomaluru_wnd.xml
  32. 5 5
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_update_page.xml
  33. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shoukuan_page.xml
  34. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/waimaiorder_info_page.xml
  35. 4 4
      bin/Win32/Debug/zhipuzi_pos_windows/skin/weixinzhifu_shoukuan_wnd.xml
  36. 4 4
      bin/Win32/Debug/zhipuzi_pos_windows/skin/xianjin_shoukuan_wnd.xml
  37. 239 236
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml
  38. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_tableitem.xml
  39. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcanorder_info_page.xml
  40. 4 4
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zidingyi_shoukuan_wnd.xml
  41. BIN
      dll/debug/DuiLib_d.dll
  42. BIN
      dll/release/DuiLib.dll
  43. 16 2
      zhipuzi_pos_windows/page/CZhengcanPageUI.cpp

+ 6 - 0
DuiLib/Control/UIList.cpp

@@ -134,6 +134,12 @@ namespace DuiLib {
 			pListItem->SetIndex(GetCount());
 			return m_pList->Add(pControl);
 		}
+
+		if (_tcsstr(pControl->GetClass(), _T("LabelUI")) != NULL)
+		{
+			return m_pList->Add(pControl);
+		}
+
 		return CVerticalLayoutUI::Add(pControl);
 	}
 

+ 3 - 3
bin/Win32/Debug/zhipuzi_pos_windows/skin/aixuexi_page.xml

@@ -10,12 +10,12 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-            <VerticalLayout name="aixuexi_page_paishe_layout" width="500" padding="0,0,0,0" bordercorner="10,10" bkcolor="#FFFFFFFF">
+            <VerticalLayout name="aixuexi_page_paishe_layout" width="500" padding="0,0,0,0" bordercorner="10,10" bkcolor="#FFFFFFFF" autocalcwidth="true">
                 <Label name="aixuexi_page_xuanzhong_food_name" text="未选中商品" heiht="40" padding="10,10,10,10" font="aixuexi_1"></Label>
 
-                <Label name="aixuexi_page_xuanzhong_food_name" multiline="true" text="智铺子AI识别默认就能识别几百种常见的水果蔬菜,这些常见的水果蔬菜无需学习,只有智铺子AI无法正常识别的冷门商品或非水果蔬菜类商品才需要学习。" heiht="60" padding="10,0,10,10" font="3"></Label>
+                <Label name="aixuexi_page_xuanzhong_food_name" wordbreak="true" text="智铺子AI识别默认就能识别几百种常见的水果蔬菜,这些常见的水果蔬菜无需学习,只有智铺子AI无法正常识别的冷门商品或非水果蔬菜类商品才需要学习。" heiht="60" padding="10,0,10,10" font="3"></Label>
 
-                <Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+                <Control autocalcwidth="true" height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
 
                 <Control name="image" height="350" bkimage="file='food_image_default.png'" padding="10,0,10,0"></Control>
 

+ 7 - 7
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_cart_item.xml

@@ -2,13 +2,13 @@
 
 <Window> 
 	<ListContainerElement name="diandan_cart_item" width="380" height="42">
-		<VerticalLayout>
-			<HorizontalLayout height="42"> 
-				<Label name="diandan_cart_item_name" width="220" height="42" align="left" valign="vcenter" padding="10,0,0,0"  endellipsis="true"/>
-				<Label name="diandan_cart_item_num" width="80" align="center"/> 
-				<Label name="diandan_cart_item_price" width="80" align="center"/>
-			</HorizontalLayout>
-			<Label name="diandan_cart_item_nature" width="220" height="42" align="left" padding="10,0,10,0" textcolor="#FF808080" visible="false" multiline="true" endellipsis="true" />
+		<VerticalLayout width="220" height="84">
+			<Label name="diandan_cart_item_name" width="220" height="42" align="left" valign="vcenter" padding="0,0,0,0"  endellipsis="true"/>
+
+			<Label name="diandan_cart_item_nature" width="220" height="42" align="left" padding="0,0,10,0" textcolor="#FF808080" visiable="false" wordbreak="true" endellipsis="true" />
 		</VerticalLayout>
+		
+		<Label name="diandan_cart_item_num" width="80" height="42" align="center"/> 
+		<Label name="diandan_cart_item_price" width="80" height="42" align="center"/>
 	</ListContainerElement> 
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem.xml

@@ -6,7 +6,7 @@
 	<!-- 宽度130,高度90,图片高度也是130-->
 	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="220">
 		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
+		<Label name="foodname" width="130" height="64" wordbreak="true" endellipsis="true"></Label>
 		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
 		
 		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="80,194,130,220" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_wutu.xml

@@ -5,7 +5,7 @@
 	
 	<!-- 宽度130,高度90-->
 	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="90">
-		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
+		<Label name="foodname" width="130" height="64" wordbreak="true" endellipsis="true"></Label>
 		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
 		
 		<Label name="nature" visible="false" width="50" height="26" font="1" text="多属性" float="true" pos="80,64,130,90" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		

+ 9 - 8
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -33,11 +33,12 @@
 							<Label name="diandan_page_label_zhengdanbeizhu" text="整单备注:" height="30" padding="10,10,10,10" textcolor="#FF8D8D8D"></Label>
 						</HorizontalLayout>
 												
-						<List name="list_diandan_cart" padding="0,10,0,0" itemlinecolor="#FF000000" vscrollbar="true">
-							<ListHeader inset="10,0,0,0"/>
-							<ListHeaderItem text="商品" width="220" align="left" />
-							<ListHeaderItem text="数量" width="80" align="center" />
-							<ListHeaderItem text="金额" width="80" align="center" />
+						<List name="list_diandan_cart" padding="0,0,0,0" itemlinecolor="#FF000000" itemvalign="vcenter" vscrollbar="true">
+							<ListHeader inset="10,0,0,0" height="42">
+								<ListHeaderItem text="商品" width="220" align="left" />
+								<ListHeaderItem text="数量" width="80" align="center" />
+								<ListHeaderItem text="金额" width="80" align="center" />
+							</ListHeader>
 						</List>
 						
 						<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
@@ -78,7 +79,7 @@
 					<HorizontalLayout height="90" name="diandan_pay_layout">
 						<Button name="btn_diandan_weixinzhifu_pay" text="" height="75" width="110" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
 						<Control bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="56,10,80,32" mouse="false"></Control>
-						<Label text="微信支付/支付宝/云闪付" multiline="true" width="110" height="40" font="14" float="true" pos="11,35,121,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+						<Label text="微信支付/支付宝/云闪付" wordbreak="true" width="110" height="40" font="14" float="true" pos="11,35,121,75" textcolor="#FFFFFFFF" mouse="false"></Label>
 						
 						<Button name="btn_diandan_huiyuanzhifu_pay" text="" height="75" width="110" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
 						<Control bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="176,12,202,32" mouse="false"></Control>
@@ -207,7 +208,7 @@
 						<Label text="账单明细" height="58" padding="20,0,0,0" font="20"></Label>
 						<Control></Control>
 						<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" height="36" width="90" padding="0,11,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-					</HorizontalLayout>		
+					</HorizontalLayout>	
 					
 					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
 					
@@ -230,7 +231,7 @@
 						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
 							<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
 							<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
-							<Label name="zhifu_name" text="微信支付/支付宝/云闪付" multiline="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+							<Label name="zhifu_name" text="微信支付/支付宝/云闪付" wordbreak="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
 						</HorizontalLayout>
 						
 						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/dianneiorder_info_page.xml

@@ -24,7 +24,7 @@
 
 						<Control height="10" />
 
-						<Label name="dianneiorder_info_page_memo" minheight="30" multiline="true" text="备注:" />
+						<Label name="dianneiorder_info_page_memo" minheight="30" wordbreak="true" text="备注:" />
 
 						<Control height="1" bkcolor="#FFEAEAEA" />
 

+ 4 - 4
bin/Win32/Debug/zhipuzi_pos_windows/skin/fulika_shoukuan_wnd.xml

@@ -78,7 +78,7 @@
 
 			<HorizontalLayout height="50" padding="0,20,0,0">
 				<Control></Control>
-				<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>
@@ -100,14 +100,14 @@
 			
 			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
 			
 			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -119,7 +119,7 @@
 			
 			<Label height="40" padding="0,120,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/fuping_cart_item.xml

@@ -9,7 +9,7 @@
 				<Label name="diandan_cart_item_num" width="80" align="center"/> 
 				<Label name="diandan_cart_item_price" width="80" align="center"/>
 			</HorizontalLayout>
-			<Label name="diandan_cart_item_nature" width="220" height="42" align="left" padding="10,0,10,0" textcolor="#FF808080" visible="false" multiline="true" endellipsis="true" />
+			<Label name="diandan_cart_item_nature" width="220" height="42" align="left" padding="10,0,10,0" textcolor="#FF808080" visible="false" wordbreak="true" endellipsis="true" />
 		</VerticalLayout>
 	</ListContainerElement> 
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/fuping_wnd.xml

@@ -33,7 +33,7 @@
 				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 				
 				<HorizontalLayout height="100">
-					<Label name="diandan_page_otherprice" text="" font="20" width="260" align="left" padding="15,40,0,0" multiline="true" endellipsis="true"></Label>
+					<Label name="diandan_page_otherprice" text="" font="20" width="260" align="left" padding="15,40,0,0" wordbreak="true" endellipsis="true"></Label>
 					<Control></Control>
 					<Label name="diandan_page_totalprice" text="总价:¥0.00" font="24" textcolor="#FFFF0000" width="170" align="right" padding="0,8,15,0"></Label>
 				</HorizontalLayout>

+ 4 - 4
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_add_wnd.xml

@@ -54,7 +54,7 @@
 		
 		<HorizontalLayout height="50" padding="0,20,0,0">
 			<Control></Control>
-			<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+			<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 			<Control></Control>
 		</HorizontalLayout>
 		
@@ -75,13 +75,13 @@
 			
 			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
 			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -93,7 +93,7 @@
 			
 			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_bangka_wnd.xml

@@ -24,7 +24,7 @@
 			
 			<HorizontalLayout height="50" padding="0,20,0,0">
 				<Control></Control>
-				<Label name="shoukuanresult" font="2" width="380" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="shoukuanresult" font="2" width="380" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>
 		</VerticalLayout>

+ 5 - 5
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_chongzhi_wnd.xml

@@ -41,7 +41,7 @@
 
 					<HorizontalLayout height="50" padding="0,20,0,0">
 						<Control></Control>
-						<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+						<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 						<Control></Control>
 					</HorizontalLayout>
 				</VerticalLayout>
@@ -73,7 +73,7 @@
 				<HorizontalLayout name="huiyuan_chongzhi_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
 					<Button name="huiyuan_chongzhi_jiesuan_zhifufangshi_weixinzhifu_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
 					<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
-					<Label name="zhifu_name" text="微信支付/支付宝/云闪付" multiline="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+					<Label name="zhifu_name" text="微信支付/支付宝/云闪付" wordbreak="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
 				</HorizontalLayout>
 				
 				<HorizontalLayout name="huiyuan_chongzhi_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
@@ -111,13 +111,13 @@
 			
 			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
 			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -129,7 +129,7 @@
 			
 			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_page.xml

@@ -58,7 +58,7 @@
 						<Control bkimage="huiyuan_no.png" width="206" height="141"></Control>
 						<Control></Control>
 					</HorizontalLayout>
-					<Label text="请在左侧输入手机号搜索会员,再进行充值、挂失等操作" multiline="true" textcolor="#FF666666" heiht="30" padding="0,20,0,0" align="center"></Label>
+					<Label text="请在左侧输入手机号搜索会员,再进行充值、挂失等操作" wordbreak="true" textcolor="#FF666666" heiht="30" padding="0,20,0,0" align="center"></Label>
 					<Control></Control>
 				</VerticalLayout>
 				<Control></Control>

+ 5 - 5
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_shoukuan_wnd.xml

@@ -21,7 +21,7 @@
 			<Label name="huiyuan_name" text="会员姓名:" heiht="30" padding="250,10,10,10"></Label>
 			<Label name="huiyuan_levelname" text="会员级别:" heiht="30" padding="250,10,10,10"></Label>
 			
-			<Label height="60" padding="20,50,20,0" name="shouyin_paying_attention" text="确认使用当前登录会员进行支付吗?" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,50,20,0" name="shouyin_paying_attention" text="确认使用当前登录会员进行支付吗?" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 			
 			<HorizontalLayout height="80" padding="0,30,0,0">
 				<Control></Control>
@@ -31,7 +31,7 @@
 
 			<HorizontalLayout height="50" padding="0,20,0,0">
 				<Control></Control>
-				<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>
@@ -53,14 +53,14 @@
 			
 			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
 			
 			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -72,7 +72,7 @@
 			
 			<Label height="40" padding="0,120,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaimima_wnd.xml

@@ -35,7 +35,7 @@
 			
 			<HorizontalLayout height="50" padding="0,20,0,0">
 				<Control></Control>
-				<Label name="shoukuanresult" font="2" width="380" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="shoukuanresult" font="2" width="380" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>
 			

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaiziliao_wnd.xml

@@ -54,7 +54,7 @@
 				
 				<HorizontalLayout height="50" padding="0,200,0,0">
 					<Control></Control>
-					<Label name="shoukuanresult" font="2" width="380" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+					<Label name="shoukuanresult" font="2" width="380" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 					<Control></Control>
 				</HorizontalLayout>
 			</HorizontalLayout>	

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/login.xml

@@ -69,7 +69,7 @@
 		
 		<HorizontalLayout height="50">
 			<Control></Control>
-			<Label name="loginresult" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+			<Label name="loginresult" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 			<Control></Control>
 		</HorizontalLayout>
 		

+ 3 - 3
bin/Win32/Debug/zhipuzi_pos_windows/skin/member_login_dlg.xml

@@ -88,7 +88,7 @@
 
 			<HorizontalLayout height="50" padding="0,20,0,0">
 				<Control></Control>
-				<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>
@@ -113,7 +113,7 @@
 			
 			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="登录成功:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -125,7 +125,7 @@
 			
 			<Label height="40" padding="0,120,0,20" name="shoukuan_pay_fail_money" text="登录失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_cika_dlg.xml

@@ -21,7 +21,7 @@
 
 			<HorizontalLayout height="50" padding="0,30,0,0">
 				<Control></Control>
-				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="errinfo" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_quanyika_dlg.xml

@@ -21,7 +21,7 @@
 
 			<HorizontalLayout height="50" padding="0,30,0,0">
 				<Control></Control>
-				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="errinfo" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_shangpinquan_dlg.xml

@@ -21,7 +21,7 @@
 
 			<HorizontalLayout height="50" padding="0,30,0,0">
 				<Control></Control>
-				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="errinfo" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_youhuiquan_dlg.xml

@@ -21,7 +21,7 @@
 
 			<HorizontalLayout height="50" padding="0,30,0,0">
 				<Control></Control>
-				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="errinfo" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_chufang_printer_item.xml

@@ -9,7 +9,7 @@
 			<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="200" multiline="true" align="center" valign="center"/> 
+				<Label name="setting_chufang_printer_item_fenlei_ids" width="200" wordbreak="true" align="center" valign="center"/> 
 			</HorizontalLayout>
 			<HorizontalLayout name="setting_chufang_printer_caozuo" width="200" align="center">
 				<Control></Control>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_diannei_tixing.xml

@@ -25,7 +25,7 @@
 	<Control height="1" bkcolor="#FFEAEAEA" padding="0,20,0,0"></Control>
 	
 	<HorizontalLayout height="64">
-		<Label text="打印扫码点餐和手机app订单(如果一个店多台收银机请只开一台,否则多台机器会重复打印)" multiline="true" endellipsis="true" width="260" />
+		<Label text="打印扫码点餐和手机app订单(如果一个店多台收银机请只开一台,否则多台机器会重复打印)" wordbreak="true" endellipsis="true" width="260" />
 		<CheckBox name="setting_is_new_diannei_saomadiancan_printer" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 	</HorizontalLayout>
 	

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_tiaomacheng.xml

@@ -52,7 +52,7 @@
 	
 	<HorizontalLayout height="50" padding="0,20,0,0">
 		<Control></Control>
-		<Label name="setting_tiaomacheng_errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+		<Label name="setting_tiaomacheng_errinfo" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 		<Control></Control>
 	</HorizontalLayout>	
 </Window>

+ 6 - 6
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_create_page.xml

@@ -52,17 +52,17 @@
 					</HorizontalLayout>		
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否称重类型商品" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>	
+						<Label text="是否称重类型商品" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>	
 						<CheckBox name="shangpin_create_page_chengzhong" 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" padding="0,30,0,0">
-						<Label text="条码秤PLU编码:" multiline="true" width="80" height="44" padding="20,0,0,0" ></Label>					
+						<Label text="条码秤PLU编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0" ></Label>					
 						<Edit name="shangpin_create_page_plu" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
 					</HorizontalLayout>
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="条码秤商品编码:" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>					
+						<Label text="条码秤商品编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>					
 						<Edit name="shangpin_create_page_shangpinbianma" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
 					</HorizontalLayout>
 					
@@ -122,7 +122,7 @@
 					</HorizontalLayout>
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="在哪些地方显示:" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>
+						<Label text="在哪些地方显示:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
 						
 						<CheckBox name="shangpin_create_page_showplace_shouyinji" selected="true" padding="15,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
 						<Label text="收银机" width="100" padding="10,0,0,0"/>
@@ -135,7 +135,7 @@
 					</HorizontalLayout>
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否开启打包费" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>
+						<Label text="是否开启打包费" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
 						<CheckBox name="shangpin_create_page_is_dabao" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
 					
@@ -192,7 +192,7 @@
 							<Button name="shangpin_create_page_saoma_btn" width="280" height="60" 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'" />
 							<Control></Control>
 						</HorizontalLayout>
-						<Label height="60" multiline="true" text="若您要新建的商品为国家标准商品库的商品,可以直接扫描商品条码快速获取商品的名字、价格、单位等信息" textcolor="#FF666666" heiht="30" padding="20,20,20,0" align="center"></Label>
+						<Label height="60" wordbreak="true" text="若您要新建的商品为国家标准商品库的商品,可以直接扫描商品条码快速获取商品的名字、价格、单位等信息" textcolor="#FF666666" heiht="30" padding="20,20,20,0" align="center"></Label>
 						<Control></Control>
 					</VerticalLayout>
 					<Control></Control>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_fooditem.xml

@@ -5,7 +5,7 @@
 	
 	<ShangpinFoodItem name="shangpin_fooditem" bkcolor="#FFFFFFFF" padding="0,0,5,5">
 		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
+		<Label name="foodname" width="130" height="64" wordbreak="true" endellipsis="true"></Label>
 		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
 	
 		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,185,130,220" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_fooditem_wutu.xml

@@ -4,7 +4,7 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<ShangpinFoodItem name="shangpin_fooditem" bkcolor="#FFFFFFFF" padding="0,0,5,5">
-		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
+		<Label name="foodname" width="130" height="64" wordbreak="true" endellipsis="true"></Label>
 		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
 			
 		<Label name="kucun" visible="false" width="50" height="35" font="1" text="已售空" float="true" pos="0,55,130,90" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_newtype_wnd.xml

@@ -30,7 +30,7 @@
 
 			<HorizontalLayout height="50" padding="0,30,0,0">
 				<Control></Control>
-				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="errinfo" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_saomaluru_wnd.xml

@@ -21,7 +21,7 @@
 
 			<HorizontalLayout height="50" padding="0,30,0,0">
 				<Control></Control>
-				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="errinfo" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>

+ 5 - 5
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_update_page.xml

@@ -51,17 +51,17 @@
 					</HorizontalLayout>		
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否称重类型商品" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>	
+						<Label text="是否称重类型商品" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>	
 						<CheckBox name="shangpin_create_page_chengzhong" 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" padding="0,30,0,0">
-						<Label text="条码秤PLU编码:" multiline="true" width="80" height="44" padding="20,0,0,0" ></Label>					
+						<Label text="条码秤PLU编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0" ></Label>					
 						<Edit name="shangpin_create_page_plu" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
 					</HorizontalLayout>
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="条码秤商品编码:" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>					
+						<Label text="条码秤商品编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>					
 						<Edit name="shangpin_create_page_shangpinbianma" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
 					</HorizontalLayout>
 					
@@ -121,7 +121,7 @@
 					</HorizontalLayout>
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="在哪些地方显示:" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>
+						<Label text="在哪些地方显示:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
 						
 						<CheckBox name="shangpin_create_page_showplace_shouyinji" selected="true" padding="15,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
 						<Label text="收银机" width="100" padding="10,0,0,0"/>
@@ -134,7 +134,7 @@
 					</HorizontalLayout>
 					
 					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否开启打包费" multiline="true" width="80" height="44" padding="20,0,0,0"></Label>
+						<Label text="是否开启打包费" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
 						<CheckBox name="shangpin_create_page_is_dabao" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
 					

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shoukuan_page.xml

@@ -61,7 +61,7 @@
 						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
 							<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
 							<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
-							<Label name="zhifu_name" text="微信支付/支付宝/云闪付" multiline="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+							<Label name="zhifu_name" text="微信支付/支付宝/云闪付" wordbreak="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
 						</HorizontalLayout>
 						
 						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/waimaiorder_info_page.xml

@@ -25,7 +25,7 @@
 
 						<Control height="10" />
 
-						<Label name="waimaorder_info_page_memo" minheight="30" multiline="true" text="备注:" />
+						<Label name="waimaorder_info_page_memo" minheight="30" wordbreak="true" text="备注:" />
 
 						<Control height="1" bkcolor="#FFEAEAEA" />
 

+ 4 - 4
bin/Win32/Debug/zhipuzi_pos_windows/skin/weixinzhifu_shoukuan_wnd.xml

@@ -26,7 +26,7 @@
 
 			<HorizontalLayout height="50" padding="0,30,0,0">
 				<Control></Control>
-				<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>
@@ -48,7 +48,7 @@
 			
 			<Label height="32" padding="0,20,0,10" name="shoukuan_paying_status" text="请求支付中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
@@ -72,7 +72,7 @@
 			
 			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -84,7 +84,7 @@
 			
 			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

+ 4 - 4
bin/Win32/Debug/zhipuzi_pos_windows/skin/xianjin_shoukuan_wnd.xml

@@ -46,7 +46,7 @@
 
 				<HorizontalLayout height="50" padding="0,10,0,0">
 					<Control></Control>
-					<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+					<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 					<Control></Control>
 				</HorizontalLayout>			
 			</VerticalLayout>
@@ -87,13 +87,13 @@
 			
 			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
 			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -105,7 +105,7 @@
 			
 			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

+ 239 - 236
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml

@@ -1,273 +1,276 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 	<ZhengcanDiandanPage>
-		<VerticalLayout name="page_layout">
-			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
-				<Button name="diandan_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
-				<Label name="diandan_page_table_name" text="" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
-			</HorizontalLayout>
-			
-			<Control height="1" bkcolor="#FFEBE8E8"></Control>
-			
-			<HorizontalLayout>
-				<Control width="1" bkcolor="#FFD1D1D1"></Control>
+		<HorizontalLayout>
+			<Control width="1" bkcolor="#FFD1D1D1"></Control>
+
+			<VerticalLayout name="page_layout">
+				<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+					<Button name="diandan_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+					<Label name="diandan_page_table_name" text="" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
+				</HorizontalLayout>
+				
+				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 				
-				<VerticalLayout width="490" bkcolor="#FFFFFFFF">
-					<HorizontalLayout>					
-						<VerticalLayout width="380" padding="0,0,0,0">					
-							<HorizontalLayout height="60">
-								<Control bkimage="member_login.png" width="32" height="32" padding="10,14,0,0"></Control>
+				<HorizontalLayout>				
+					<VerticalLayout width="490" bkcolor="#FFFFFFFF">
+						<HorizontalLayout>					
+							<VerticalLayout width="380" padding="0,0,0,0">					
+								<HorizontalLayout height="60">
+									<Control bkimage="member_login.png" width="32" height="32" padding="10,14,0,0"></Control>
+									
+									<Button name="btn_diandan_member_login" align="left" text="会员登录" height="38" width="135" padding="10,12,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
 								
-								<Button name="btn_diandan_member_login" align="left" text="会员登录" height="38" width="135" padding="10,12,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							
-								<VerticalLayout name="diandan_page_member_info" width="135" padding="10,5,10,5" visible="false">
-									<Label name="diandan_page_member_name" height="20" padding="0,0,0,0"></Label>
-									<HorizontalLayout padding="0,5,0,0">
-										<Button name="diandan_page_member_info_btn" text="信息" font="14" height="20" width="40" padding="0,0,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-										
-										<Button name="diandan_page_member_out_btn" text="退出" textcolor="#FFFF4500" font="14" height="20" width="40" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF4500" bkcolor="#FFFFFFFF"></Button>
-									</HorizontalLayout>
-								</VerticalLayout>
+									<VerticalLayout name="diandan_page_member_info" width="135" padding="10,5,10,5" visible="false">
+										<Label name="diandan_page_member_name" height="20" padding="0,0,0,0"></Label>
+										<HorizontalLayout padding="0,5,0,0">
+											<Button name="diandan_page_member_info_btn" text="信息" font="14" height="20" width="40" padding="0,0,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+											
+											<Button name="diandan_page_member_out_btn" text="退出" textcolor="#FFFF4500" font="14" height="20" width="40" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF4500" bkcolor="#FFFFFFFF"></Button>
+										</HorizontalLayout>
+									</VerticalLayout>
+									
+									<Control></Control>
+									<Button name="btn_diandan_canpaihao" text="人数" height="38" width="100" padding="0,10,0,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+									<Control width="1" bkcolor="#FFEBE8E8" padding="5,15,15,15"></Control>
+									<Control bkimage="order_delete.png" width="20" height="20" padding="0,20,0,0"></Control>
+									<Button name="btn_diandan_qingkong" text="清空" height="38" width="40" padding="0,10,10,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+								</HorizontalLayout>
 								
-								<Control></Control>
-								<Button name="btn_diandan_canpaihao" text="人数" height="38" width="100" padding="0,10,0,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-								<Control width="1" bkcolor="#FFEBE8E8" padding="5,15,15,15"></Control>
-								<Control bkimage="order_delete.png" width="20" height="20" padding="0,20,0,0"></Control>
-								<Button name="btn_diandan_qingkong" text="清空" height="38" width="40" padding="0,10,10,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							</HorizontalLayout>
-							
-							<HorizontalLayout height="50" bkcolor="#FFF5F5F5">
-								<Control bkimage="beizhu_tishi.png" width="24" height="24" padding="10,13,0,0"></Control>
-								<Label name="diandan_page_label_zhengdanbeizhu" text="整单备注:" height="30" padding="10,10,10,10" textcolor="#FF8D8D8D"></Label>
-							</HorizontalLayout>
-													
-							<List name="list_diandan_cart" padding="0,10,0,0" itemlinecolor="#FF000000" vscrollbar="true">
-								<ListHeader inset="10,0,0,0"/>
-								<ListHeaderItem text="商品" width="220" align="left" />
-								<ListHeaderItem text="数量" width="80" align="center" />
-								<ListHeaderItem text="金额" width="80" align="center" />
-							</List>
-							
-							<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
-								<Label name="diandan_page_youhui_tishi" text="已优惠10元" textcolor="#FFFF3838" padding="15,0,0,0" width="270" hegiht="40"></Label>
-								<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF3CB371" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							</HorizontalLayout>
-						</VerticalLayout>
-						
-						<Control width="1" bkcolor="#FFEBE8E8"></Control>
-						
-						<VerticalLayout width="110" padding="0,0,0,0" vscrollbar="true">
-							<Button name="btn_diandan_tuicai" width="90" height="40" padding="10,30,10,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="btn_diandan_jia" width="90" height="40" padding="10,30,10,0" text="+" font="24" 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="btn_diandan_jian" width="90" height="40" padding="10,10,10,0" text="-" font="24" 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="btn_diandan_shanchu" width="90" height="40" padding="10,10,10,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="btn_diandan_guige" width="90" height="40" padding="10,10,10,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'" />
+								<HorizontalLayout height="50" bkcolor="#FFF5F5F5">
+									<Control bkimage="beizhu_tishi.png" width="24" height="24" padding="10,13,0,0"></Control>
+									<Label name="diandan_page_label_zhengdanbeizhu" text="整单备注:" height="30" padding="10,10,10,10" textcolor="#FF8D8D8D"></Label>
+								</HorizontalLayout>
+														
+								<List name="list_diandan_cart" padding="0,0,0,0" itemlinecolor="#FF000000" itemvalign="vcenter" vscrollbar="true">
+									<ListHeader inset="10,0,0,0" height="42">
+										<ListHeaderItem text="商品" width="220" align="left" />
+										<ListHeaderItem text="数量" width="80" align="center" />
+										<ListHeaderItem text="金额" width="80" align="center" />
+									</ListHeader>
+								</List>
+								
+								<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
+									<Label name="diandan_page_youhui_tishi" text="已优惠10元" textcolor="#FFFF3838" padding="15,0,0,0" width="270" hegiht="40"></Label>
+									<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF3CB371" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+								</HorizontalLayout>
+							</VerticalLayout>
 							
-							<Button name="btn_diandan_dabao" width="90" height="40" padding="10,10,10,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'" />
+							<Control width="1" bkcolor="#FFEBE8E8"></Control>
 							
-							<Button name="btn_diandan_zhengdanbeizhu" width="90" height="40" padding="10,10,10,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'" />
+							<VerticalLayout width="110" padding="0,0,0,0" vscrollbar="true">
+								<Button name="btn_diandan_tuicai" width="90" height="40" padding="10,30,10,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="btn_diandan_chetai" width="90" height="40" padding="10,10,10,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="btn_diandan_huantai" width="90" height="40" padding="10,10,10,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="btn_diandan_qianxiang" width="90" height="40" padding="10,15,10,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'" />
-							-->
-						</VerticalLayout>
-					</HorizontalLayout>
-					
-					<Control height="1" bkcolor="#FFEBE8E8"></Control>
-					
-					<VerticalLayout height="125" bkcolor="#FFFFFFFF">
-						<HorizontalLayout height="50">
-							<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,14,0,0" multiline="true" endellipsis="true"></Label>
-							<Label name="diandan_page_totalprice" text="总价:¥0.00" font="22" textcolor="#FFFF0000" width="200" align="right" padding="0,0,15,0"></Label>
+								<Button name="btn_diandan_jia" width="90" height="40" padding="10,30,10,0" text="+" font="24" 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="btn_diandan_jian" width="90" height="40" padding="10,10,10,0" text="-" font="24" 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="btn_diandan_shanchu" width="90" height="40" padding="10,10,10,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="btn_diandan_guige" width="90" height="40" padding="10,10,10,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="btn_diandan_dabao" width="90" height="40" padding="10,10,10,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="btn_diandan_zhengdanbeizhu" width="90" height="40" padding="10,10,10,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="btn_diandan_chetai" width="90" height="40" padding="10,10,10,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="btn_diandan_huantai" width="90" height="40" padding="10,10,10,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="btn_diandan_qianxiang" width="90" height="40" padding="10,15,10,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'" />
+								-->
+							</VerticalLayout>
 						</HorizontalLayout>
 						
-						<HorizontalLayout height="75" name="diandan_pay_layout">
-							<Button name="btn_diandan_pay" text="结账" height="75" width="230" padding="10,0,0,15" 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>
-							
-							<Button name="btn_diandan_xiadan" text="下单" height="75" width="230" padding="10,0,0,15" 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>
-						</HorizontalLayout>
+						<Control height="1" bkcolor="#FFEBE8E8"></Control>
 						
-						<HorizontalLayout height="75" name="jiesuan_pay_layout" visible="false">							
-							<Button name="btn_diandan_jixujiacai" text="加菜" height="75" width="230" padding="10,0,0,15" 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>
+						<VerticalLayout height="125" bkcolor="#FFFFFFFF">
+							<HorizontalLayout height="50">
+								<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,14,0,0" wordbreak="true" endellipsis="true"></Label>
+								<Label name="diandan_page_totalprice" text="总价:¥0.00" font="22" textcolor="#FFFF0000" width="200" align="right" padding="0,0,15,0"></Label>
+							</HorizontalLayout>
 							
-							<Button name="btn_diandan_yulandan" text="打印预览单" height="75" width="230" padding="10,0,0,15" 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>
-						</HorizontalLayout>
-					</VerticalLayout>
-				</VerticalLayout>
-				
-				<Control width="1" bkcolor="#FFEBE8E8"></Control>
-				
-				<VerticalLayout name="diandan_food_layout">
-					<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
-						<HorizontalLayout name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-
-						</HorizontalLayout>
-					</VerticalLayout>
-					
-					<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
-					
-					</TileLayout>
-					
-					<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-						<Edit name="diandan_food_search_edit" tooltip="请输入商品名字搜索" width="380" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
-						
-						<Label name="diandan_food_search_tishi" text="请输入商品名字搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
-						
-						<Control bkimage="search_icon.png" width="25" height="26" pos="45,23,70,49" float="true"></Control>
-						
-						<Button name="diandan_food_search_clear" visible="false" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png" width="23" height="23" pos="365,23,68,46" float="true"></Button>
-					</HorizontalLayout>
-				</VerticalLayout>
-				
-				<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false">
-					<VerticalLayout name="diandan_jiesuan_youhui_layout" width="330">
-						<HorizontalLayout height="58">
-							<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="20"></Label>
-							<Control></Control>
-							<Button name="diandan_jiesuan_yincangyouhui_btn" text="隐藏优惠" height="36" width="90" padding="0,11,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-						</HorizontalLayout>	
-						
-						<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
-						
-						<HorizontalLayout padding="0,15,0,0" height="48">
-							<Label text="整单折扣:" width="90" height="48" padding="20,0,0,0"></Label>
-							<Button name="diandan_jiesuan_zhekou_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-							<Label text="%" width="60" height="48" padding="20,0,0,0"></Label>
-						</HorizontalLayout>
-						
-						<HorizontalLayout padding="0,15,0,0" height="48">
-							<Label text="加价:" width="90" height="48" padding="20,0,0,0"></Label>
-							<Button name="diandan_jiesuan_jiajia_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-							<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
-						</HorizontalLayout>
-						
-						<HorizontalLayout padding="0,15,0,0" height="48">
-							<Label text="优惠:" width="90" height="48" padding="20,0,0,0"></Label>
-							<Button name="diandan_jiesuan_youhui_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-							<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
-						</HorizontalLayout>
-						
-						<HorizontalLayout padding="0,15,0,0" height="48">
-							<Label text="优惠券:" width="90" height="48" padding="20,0,0,0"></Label>
-							<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-							<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-							<Button name="diandan_jiesuan_youhuiquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-						</HorizontalLayout>
-						
-						<HorizontalLayout padding="0,15,0,0" height="48">
-							<Label text="商品券:" width="90" height="48" padding="20,0,0,0"></Label>
-							<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-							<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-							<Button name="diandan_jiesuan_shangpinquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-						</HorizontalLayout>
-						
-						<HorizontalLayout padding="0,15,0,0" height="48">
-							<Label text="次卡:" width="90" height="48" padding="20,0,0,0"></Label>
-							<Label name="diandan_jiesuan_cika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-							<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-							<Button name="diandan_jiesuan_cika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-						</HorizontalLayout>
-						
-						<HorizontalLayout padding="0,15,0,0" height="48">
-							<Label text="权益卡:" width="90" height="48" padding="20,0,0,0"></Label>
-							<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-							<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-							<Button name="diandan_jiesuan_quanyika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-						</HorizontalLayout>
-						
-						<HorizontalLayout padding="0,15,0,0" height="130">
-							<Label text="抹零:" width="90" height="48" padding="20,0,0,0"></Label>
-							<VerticalLayout padding="0,10,0,0">
-								<HorizontalLayout padding="0,0,30,0" width="200" height="30">
-									<CheckBox name="diandan_jiesuan_moling_bumoling" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-									<Label name="" text="不抹零" width="150" height="30" padding="15,0,0,0"/>
-								</HorizontalLayout>
+							<HorizontalLayout height="75" name="diandan_pay_layout">
+								<Button name="btn_diandan_pay" text="结账" height="75" width="230" padding="10,0,0,15" 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>
 								
-								<HorizontalLayout padding="0,0,30,0" width="200" height="30">
-									<CheckBox name="diandan_jiesuan_moling_molingdaojiao" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-									<Label name="" text="抹零到角" width="150" height="30" padding="15,0,0,0"/>
-								</HorizontalLayout>
+								<Button name="btn_diandan_xiadan" text="下单" height="75" width="230" padding="10,0,0,15" 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>
+							</HorizontalLayout>
+							
+							<HorizontalLayout height="75" name="jiesuan_pay_layout" visible="false">							
+								<Button name="btn_diandan_jixujiacai" text="加菜" height="75" width="230" padding="10,0,0,15" 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>
 								
-								<HorizontalLayout padding="0,0,30,0" width="200" height="30">
-									<CheckBox name="diandan_jiesuan_moling_molingdaoyuan" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-									<Label name="" text="抹零到元" width="150" height="30" padding="15,0,0,0"/>
-								</HorizontalLayout>
-							</VerticalLayout>
-						</HorizontalLayout>
+								<Button name="btn_diandan_yulandan" text="打印预览单" height="75" width="230" padding="10,0,0,15" 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>
+							</HorizontalLayout>
+						</VerticalLayout>
 					</VerticalLayout>
 					
-					<Control name="diandan_jiesuan_youhui_line" width="1" bkcolor="#FFEBE8E8"></Control>
+					<Control width="1" bkcolor="#FFEBE8E8"></Control>
 					
-					<VerticalLayout name="diandan_page_jiesuan_zhangdan_layout" vscrollbar="true">
-						<HorizontalLayout height="58">
-							<Label text="账单明细" height="58" padding="20,0,0,0" font="20"></Label>
-							<Control></Control>
-							<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" height="36" width="90" padding="0,11,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-						</HorizontalLayout>	
-						
-						<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
-						
-						<VerticalLayout name="diandan_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
-						
+					<VerticalLayout name="diandan_food_layout">
+						<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
+							<HorizontalLayout name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+
+							</HorizontalLayout>
 						</VerticalLayout>
 						
-						<Control height="1" bkcolor="#FFEBE8E8" padding="10,10,10,0"></Control>
-						
-						<HorizontalLayout height="50">
-							<Control></Control>
-							<Label name="diandan_jiesuan_total_yingshou" text="" width="150" height="50" align="right" padding="0,0,15,0"/>
-						</HorizontalLayout>
-						
-						<Label text="支付方式" width="100" height="58" padding="20,30,0,0" font="20"></Label>
+						<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
 						
-						<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+						</TileLayout>
 						
-						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout">
-							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
-								<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
-								<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
-								<Label name="zhifu_name" text="微信支付/支付宝/云闪付" multiline="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+						<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+							<Edit name="diandan_food_search_edit" tooltip="请输入商品名字搜索" width="380" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
+							
+							<Label name="diandan_food_search_tishi" text="请输入商品名字搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
+							
+							<Control bkimage="search_icon.png" width="25" height="26" pos="45,23,70,49" float="true"></Control>
+							
+							<Button name="diandan_food_search_clear" visible="false" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png" width="23" height="23" pos="365,23,68,46" float="true"></Button>
+						</HorizontalLayout>
+					</VerticalLayout>
+					
+					<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false">
+						<VerticalLayout name="diandan_jiesuan_youhui_layout" width="330">
+							<HorizontalLayout height="58">
+								<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="20"></Label>
+								<Control></Control>
+								<Button name="diandan_jiesuan_yincangyouhui_btn" text="隐藏优惠" height="36" width="90" padding="0,11,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+							</HorizontalLayout>	
+							
+							<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+							
+							<HorizontalLayout padding="0,15,0,0" height="48">
+								<Label text="整单折扣:" width="90" height="48" padding="20,0,0,0"></Label>
+								<Button name="diandan_jiesuan_zhekou_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+								<Label text="%" width="60" height="48" padding="20,0,0,0"></Label>
 							</HorizontalLayout>
 							
-							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">
-								<Button name="diandan_jiesuan_zhifufangshi_huiyuan_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
-								<Control name="zhifu_icon" bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="50,10,76,30" mouse="false"></Control>
-								<Label name="zhifu_name" text="会员支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+							<HorizontalLayout padding="0,15,0,0" height="48">
+								<Label text="加价:" width="90" height="48" padding="20,0,0,0"></Label>
+								<Button name="diandan_jiesuan_jiajia_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+								<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
 							</HorizontalLayout>
 							
-							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
-								<Button name="diandan_jiesuan_zhifufangshi_xianjin_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
-								<Control name="zhifu_icon" bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="50,10,71,34" mouse="false"></Control>
-								<Label name="zhifu_name" text="现金支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+							<HorizontalLayout padding="0,15,0,0" height="48">
+								<Label text="优惠:" width="90" height="48" padding="20,0,0,0"></Label>
+								<Button name="diandan_jiesuan_youhui_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
+								<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
 							</HorizontalLayout>
 							
-							<!--
-							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_gouwuka" width="122" hegiht="80" float="true">
-								<Button name="diandan_jiesuan_zhifufangshi_gouwuka_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-								<Control name="zhifu_icon" bkimage="gouwuka_icon.png" width="34" height="28" float="true" pos="45,10,79,38" mouse="false"></Control>
-								<Label name="zhifu_name" text="购物卡" width="180" height="35" font="14" float="true" pos="38,35,218,70" mouse="false"></Label>
+							<HorizontalLayout padding="0,15,0,0" height="48">
+								<Label text="优惠券:" width="90" height="48" padding="20,0,0,0"></Label>
+								<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+								<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+								<Button name="diandan_jiesuan_youhuiquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
 							</HorizontalLayout>
 							
-							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_meishicheng" width="122" hegiht="80" float="true">
-								<Button name="diandan_jiesuan_zhifufangshi_meishicheng_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-								<Control name="zhifu_icon" bkimage="meishicheng_icon.png" width="37" height="27" float="true" pos="48,10,85,37" mouse="false"></Control>
-								<Label name="zhifu_name" text="美食城临时卡" width="180" height="35" font="14" float="true" pos="25,35,205,70" mouse="false"></Label>
+							<HorizontalLayout padding="0,15,0,0" height="48">
+								<Label text="商品券:" width="90" height="48" padding="20,0,0,0"></Label>
+								<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+								<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+								<Button name="diandan_jiesuan_shangpinquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
 							</HorizontalLayout>
-							-->
 							
-							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_fulika" width="122" hegiht="80" float="true">
-								<Button name="diandan_jiesuan_zhifufangshi_fulika_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-								<Control name="zhifu_icon" bkimage="fulika_icon.png" width="30" height="30" float="true" pos="48,10,78,40" mouse="false"></Control>
-								<Label name="zhifu_name" text="福利卡" width="180" height="35" font="14" float="true" pos="40,35,220,70" mouse="false"></Label>
+							<HorizontalLayout padding="0,15,0,0" height="48">
+								<Label text="次卡:" width="90" height="48" padding="20,0,0,0"></Label>
+								<Label name="diandan_jiesuan_cika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+								<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+								<Button name="diandan_jiesuan_cika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
 							</HorizontalLayout>
-						</HorizontalLayout>
-					</VerticalLayout>
+							
+							<HorizontalLayout padding="0,15,0,0" height="48">
+								<Label text="权益卡:" width="90" height="48" padding="20,0,0,0"></Label>
+								<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
+								<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+								<Button name="diandan_jiesuan_quanyika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
+							</HorizontalLayout>
+							
+							<HorizontalLayout padding="0,15,0,0" height="130">
+								<Label text="抹零:" width="90" height="48" padding="20,0,0,0"></Label>
+								<VerticalLayout padding="0,10,0,0">
+									<HorizontalLayout padding="0,0,30,0" width="200" height="30">
+										<CheckBox name="diandan_jiesuan_moling_bumoling" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+										<Label name="" text="不抹零" width="150" height="30" padding="15,0,0,0"/>
+									</HorizontalLayout>
+									
+									<HorizontalLayout padding="0,0,30,0" width="200" height="30">
+										<CheckBox name="diandan_jiesuan_moling_molingdaojiao" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+										<Label name="" text="抹零到角" width="150" height="30" padding="15,0,0,0"/>
+									</HorizontalLayout>
+									
+									<HorizontalLayout padding="0,0,30,0" width="200" height="30">
+										<CheckBox name="diandan_jiesuan_moling_molingdaoyuan" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+										<Label name="" text="抹零到元" width="150" height="30" padding="15,0,0,0"/>
+									</HorizontalLayout>
+								</VerticalLayout>
+							</HorizontalLayout>
+						</VerticalLayout>
+						
+						<Control name="diandan_jiesuan_youhui_line" width="1" bkcolor="#FFEBE8E8"></Control>
+						
+						<VerticalLayout name="diandan_page_jiesuan_zhangdan_layout" vscrollbar="true">
+							<HorizontalLayout height="58">
+								<Label text="账单明细" height="58" padding="20,0,0,0" font="20"></Label>
+								<Control></Control>
+								<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" height="36" width="90" padding="0,11,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
+							</HorizontalLayout>	
+							
+							<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+							
+							<VerticalLayout name="diandan_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
+							
+							</VerticalLayout>
+							
+							<Control height="1" bkcolor="#FFEBE8E8" padding="10,10,10,0"></Control>
+							
+							<HorizontalLayout height="50">
+								<Control></Control>
+								<Label name="diandan_jiesuan_total_yingshou" text="" width="150" height="50" align="right" padding="0,0,15,0"/>
+							</HorizontalLayout>
+							
+							<Label text="支付方式" width="100" height="58" padding="20,30,0,0" font="20"></Label>
+							
+							<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+							
+							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout">
+								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
+									<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
+									<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
+									<Label name="zhifu_name" text="微信支付/支付宝/云闪付" wordbreak="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
+								</HorizontalLayout>
+								
+								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">
+									<Button name="diandan_jiesuan_zhifufangshi_huiyuan_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
+									<Control name="zhifu_icon" bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="50,10,76,30" mouse="false"></Control>
+									<Label name="zhifu_name" text="会员支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+								</HorizontalLayout>
+								
+								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
+									<Button name="diandan_jiesuan_zhifufangshi_xianjin_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
+									<Control name="zhifu_icon" bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="50,10,71,34" mouse="false"></Control>
+									<Label name="zhifu_name" text="现金支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+								</HorizontalLayout>
+								
+								<!--
+								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_gouwuka" width="122" hegiht="80" float="true">
+									<Button name="diandan_jiesuan_zhifufangshi_gouwuka_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+									<Control name="zhifu_icon" bkimage="gouwuka_icon.png" width="34" height="28" float="true" pos="45,10,79,38" mouse="false"></Control>
+									<Label name="zhifu_name" text="购物卡" width="180" height="35" font="14" float="true" pos="38,35,218,70" mouse="false"></Label>
+								</HorizontalLayout>
+								
+								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_meishicheng" width="122" hegiht="80" float="true">
+									<Button name="diandan_jiesuan_zhifufangshi_meishicheng_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+									<Control name="zhifu_icon" bkimage="meishicheng_icon.png" width="37" height="27" float="true" pos="48,10,85,37" mouse="false"></Control>
+									<Label name="zhifu_name" text="美食城临时卡" width="180" height="35" font="14" float="true" pos="25,35,205,70" mouse="false"></Label>
+								</HorizontalLayout>
+								-->
+								
+								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_fulika" width="122" hegiht="80" float="true">
+									<Button name="diandan_jiesuan_zhifufangshi_fulika_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+									<Control name="zhifu_icon" bkimage="fulika_icon.png" width="30" height="30" float="true" pos="48,10,78,40" mouse="false"></Control>
+									<Label name="zhifu_name" text="福利卡" width="180" height="35" font="14" float="true" pos="40,35,220,70" mouse="false"></Label>
+								</HorizontalLayout>
+							</HorizontalLayout>
+						</VerticalLayout>
+					</HorizontalLayout>
 				</HorizontalLayout>
-			</HorizontalLayout>
-		</VerticalLayout>
+			</VerticalLayout>
+		</HorizontalLayout>
 		
 		<HorizontalLayout name="loading">
 			<Control></Control>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_tableitem.xml

@@ -3,7 +3,7 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<ZhengcanTableItem name="zhengcan_tableitem" bkcolor="#FFFFFFFF" width="177" height="140">
-		<Label name="tablename" float="true" pos="10,15,170,60" multiline="true" endellipsis="true" font="16"></Label>
+		<Label name="tablename" float="true" pos="10,15,170,60" wordbreak="true" endellipsis="true" font="16"></Label>
 		<Label name="status" font="14" float="true" pos="10,70,170,100" align="left"></Label>
 		
 		<Control></Control>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcanorder_info_page.xml

@@ -24,7 +24,7 @@
 
 						<Control height="10" />
 
-						<Label name="dianneiorder_info_page_memo" minheight="30" multiline="true" text="备注:" />
+						<Label name="dianneiorder_info_page_memo" minheight="30" wordbreak="true" text="备注:" />
 
 						<Control height="1" bkcolor="#FFEAEAEA" />
 

+ 4 - 4
bin/Win32/Debug/zhipuzi_pos_windows/skin/zidingyi_shoukuan_wnd.xml

@@ -29,7 +29,7 @@
 
 			<HorizontalLayout height="50" padding="0,20,0,0">
 				<Control></Control>
-				<Label name="shoukuanresult" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Label name="shoukuanresult" font="2" width="400" height="50" wordbreak="true" text="" visible="false" textcolor="#FF0000" align="center" />
 				<Control></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>
@@ -51,13 +51,13 @@
 			
 			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="2" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
 			<Label height="40" padding="0,80,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="3" textcolor="0xFF3CB371" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_fail_layout" visible="false">
@@ -69,7 +69,7 @@
 			
 			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_fail_money" text="订单支付失败" font="3" textcolor="0xFFD33E3A" align="center"></Label>
 			
-			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" multiline="true" align="center" />
+			<Label height="60" padding="20,30,20,0" name="shouyin_pay_fail_attention" text="" font="2" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
     </VerticalLayout>
 </Window>

BIN
dll/debug/DuiLib_d.dll


BIN
dll/release/DuiLib.dll


+ 16 - 2
zhipuzi_pos_windows/page/CZhengcanPageUI.cpp

@@ -459,7 +459,14 @@ void CZhengcanPageUI::UpdateTablePos()
 	rect.top = m_nPageHeight - 80 - 30 - nFenleiHeight;
 	rect.bottom = rect.top + 80;
 
-	pZhuantaiLayout->SetPos(rect);
+	// 强制设置固定大小和位置
+	//SIZE size;
+	size.cx = rect.left;
+	size.cy = rect.top;
+
+	pZhuantaiLayout->SetFixedXY(size);
+	pZhuantaiLayout->SetFixedWidth(rect.right - rect.left);
+	pZhuantaiLayout->SetFixedHeight(rect.bottom - rect.top);
 
 	//更新扫码点餐操作栏的位置
 	CHorizontalLayoutUI* pSaomadiancanLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("zhengcan_saomadiancan_layout")));
@@ -469,7 +476,14 @@ void CZhengcanPageUI::UpdateTablePos()
 	rect.top = nFenleiHeight + 200;
 	rect.bottom = rect.top + 102;
 
-	pSaomadiancanLayout->SetPos(rect);
+	// 强制设置固定大小和位置
+	//SIZE size;
+	size.cx = rect.left;
+	size.cy = rect.top;
+
+	pSaomadiancanLayout->SetFixedXY(size);
+	pSaomadiancanLayout->SetFixedWidth(rect.right - rect.left);
+	pSaomadiancanLayout->SetFixedHeight(rect.bottom - rect.top);
 }
 
 void CZhengcanPageUI::ClickTableAction()