소스 검색

点单页面差不多,先保存一下

张洋 1 개월 전
부모
커밋
8a047bf613
100개의 변경된 파일과 418개의 추가작업 그리고 340개의 파일을 삭제
  1. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/bb_tab_active_hot.png
  2. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/bt_cat_hot.png
  3. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/bt_cat_n.png
  4. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/bt_cat_sel.png
  5. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_border_green.png
  6. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_border_green_Hover.png
  7. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_green_dianji.png
  8. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_green_zhengchang.png
  9. 40 38
      bin/Win32/Debug/zhipuzi_pos_windows/skin/canpai_input_dlg.xml
  10. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_cancel_h.png
  11. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_cancel_n.png
  12. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_cancel_p.png
  13. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_fn_h.png
  14. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_fn_n.png
  15. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_fn_p.png
  16. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_input.png
  17. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_ok_h.png
  18. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_ok_n.png
  19. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_ok_p.png
  20. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_pad_h.png
  21. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_pad_n.png
  22. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_pad_p.png
  23. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ai_h.png
  24. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ai_n.png
  25. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ai_p.png
  26. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ava.png
  27. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ava_off.png
  28. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_cart.png
  29. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_dashline.png
  30. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_add.png
  31. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_add_grn.png
  32. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_ai.png
  33. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_ai16.png
  34. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_card.png
  35. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_clear.png
  36. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_clear14.png
  37. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_clear_red.png
  38. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_del.png
  39. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_drawer.png
  40. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_handle.png
  41. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_member.png
  42. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_member_gray.png
  43. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_minus.png
  44. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_more.png
  45. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_note.png
  46. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_pack.png
  47. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_paizi.png
  48. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_paizi16.png
  49. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_save.png
  50. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_scan.png
  51. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_search.png
  52. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_search16.png
  53. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_spec.png
  54. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_take.png
  55. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_warn.png
  56. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_warn12.png
  57. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill.png
  58. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill_h.png
  59. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill_red.png
  60. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill_white.png
  61. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_search.png
  62. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/deng_on.png
  63. 11 11
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_cart_item.xml
  64. 15 9
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_wutu.xml
  65. 17 11
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu.xml
  66. 17 14
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_2.xml
  67. 13 11
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_3.xml
  68. 255 217
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml
  69. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/download_xuanfu.png
  70. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_chip_blue.png
  71. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_chip_gray.png
  72. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_chip_grn.png
  73. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_img_ph.png
  74. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r10.png
  75. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r10_hot.png
  76. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r8.png
  77. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r8_hot.png
  78. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_topmask.png
  79. 11 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/foodtype_option.xml
  80. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_btn4.png
  81. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_btn4_hot.png
  82. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_btn4_pushed.png
  83. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_card8.png
  84. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_card8_hot.png
  85. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_card8_pushed.png
  86. 22 16
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gengduo_item.xml
  87. 17 12
      bin/Win32/Debug/zhipuzi_pos_windows/skin/gengduo_page.xml
  88. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/hyinfo_btn_main_hover.png
  89. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/hyinfo_btn_main_normal.png
  90. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_add.png
  91. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_close_xuanfu.png
  92. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_fangda_xuanfu.png
  93. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_shou_xuanfu.png
  94. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_suoxiao_xuanfu.png
  95. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/input_focus.png
  96. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/input_green.png
  97. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/jb_btn_green_normal.png
  98. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/kefu_xuanfu.png
  99. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/key_pushed.png
  100. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/skin/login_arrow_hot.png

BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/bb_tab_active_hot.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/bt_cat_hot.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/bt_cat_n.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/bt_cat_sel.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_border_green.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_border_green_Hover.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_green_dianji.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/btn_green_zhengchang.png


+ 40 - 38
bin/Win32/Debug/zhipuzi_pos_windows/skin/canpai_input_dlg.xml

@@ -1,43 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="700,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
-	
-	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
-			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
-			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
+<Window size="420,460" caption="0,0,0,52" roundcorner="10,10" shadowsize="3" showshadow="true">
+
+	<VerticalLayout bkcolor="#FFFFFFFF">
+		<!-- 标题栏 52:标题居左,关闭按钮居右 -->
+		<HorizontalLayout height="52" inset="18,0,12,0">
+			<Label name="memo_dlg_title" text="" height="52" maxheight="52" font="16" textcolor="#FF1F2329" valign="center"/>
+			<Control></Control>
+			<Button name="closebtn" keyboard="false" text="×" font="20" textcolor="#FF8A9099" width="28" height="28" maxheight="28" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"/>
 		</HorizontalLayout>
 		</HorizontalLayout>
-		
-		<HorizontalLayout>
-			<VerticalLayout width="370">
-				<Label name="name" text="请输入餐牌号" height="30" width="250" padding="30,50,0,0" align="left"/>
-	
-				<Edit name="content" width="250" height="50" padding="30,30,0,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
-				
-				<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
-				
-				<HorizontalLayout height="56" valign="center" padding="30,100,0,20">
-					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="250" padding="0,0,0,0" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
-				</HorizontalLayout>
-			</VerticalLayout>
-			
-			<HorizontalLayout width="330" height="406" bkcolor="#FFF3F3F3">
-				<Button name="jianpan_1" text="1" font="26" heiht="60" width="60" float="true" pos="10,0,110,90" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_2" text="2" font="26" heiht="60" width="60" float="true" pos="120,0,220,90" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_3" text="3" font="26" heiht="60" width="60" float="true" pos="230,0,330,90" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				
-				<Button name="jianpan_4" text="4" font="26" heiht="60" width="60" float="true" pos="10,100,110,190" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_5" text="5" font="26" heiht="60" width="60" float="true" pos="120,100,220,190" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_6" text="6" font="26" heiht="60" width="60" float="true" pos="230,100,330,190" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				
-				<Button name="jianpan_7" text="7" font="26" heiht="60" width="60" float="true" pos="10,200,110,290" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_8" text="8" font="26" heiht="60" width="60" float="true" pos="120,200,220,290" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_9" text="9" font="26" heiht="60" width="60" float="true" pos="230,200,330,290" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				
-				<Button name="jianpan_qingkong" text="清空" font="26" heiht="60" width="60" float="true" pos="10,300,110,390" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_0" text="0" font="26" heiht="60" width="60" float="true" pos="120,300,220,390" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-				<Button name="jianpan_x" text="X" font="26" heiht="60" width="60" float="true" pos="230,300,330,390" normalimage="file='shuzi_btn_normal.png' corner='5,5,5,5'" hotimage="file='shuzi_btn_hover.png' corner='5,5,5,5'" pushedimage="file='shuzi_btn_push.png' corner='5,5,5,5'"></Button>
-			</HorizontalLayout>
+
+		<Control height="1" bkcolor="#FFF0F1F3"/>
+
+		<!-- 输入区:外缩 18,输入框 52 高绿边框圆角 8,文字 24px 右对齐 -->
+		<VerticalLayout inset="18,18,18,0">
+			<Edit name="content" height="52" font="24" textcolor="#FF1F2329" align="right" textpadding="16,0,16,0" bkcolor="#FFFFFFFF" nativebkcolor="#FFFFFFFF" normalimage="file='cp_input.png' corner='8,8,8,8'"/>
+
+			<Label name="errinfo" text="" width="384" height="30" float="true" pos="0,56,384,86" align="left" valign="top" textcolor="#FFE14B4A" visible="false"/>
+
+			<!-- 数字键盘 3 列 x 4 行:格子 121x46,间距 10,顶部留 16 -->
+			<Container height="230">
+				<Button name="jianpan_1" text="1" font="17" textcolor="#FF1F2329" float="true" pos="0,16,121,62" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_2" text="2" font="17" textcolor="#FF1F2329" float="true" pos="131,16,252,62" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_3" text="3" font="17" textcolor="#FF1F2329" float="true" pos="262,16,383,62" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_4" text="4" font="17" textcolor="#FF1F2329" float="true" pos="0,72,121,118" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_5" text="5" font="17" textcolor="#FF1F2329" float="true" pos="131,72,252,118" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_6" text="6" font="17" textcolor="#FF1F2329" float="true" pos="262,72,383,118" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_7" text="7" font="17" textcolor="#FF1F2329" float="true" pos="0,128,121,174" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_8" text="8" font="17" textcolor="#FF1F2329" float="true" pos="131,128,252,174" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_9" text="9" font="17" textcolor="#FF1F2329" float="true" pos="262,128,383,174" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_qingkong" text="清空" font="14" textcolor="#FF5F6368" float="true" pos="0,184,121,230" normalimage="file='cp_fn_n.png' corner='8,8,8,8'" hotimage="file='cp_fn_h.png' corner='8,8,8,8'" pushedimage="file='cp_fn_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_0" text="0" font="17" textcolor="#FF1F2329" float="true" pos="131,184,252,230" normalimage="file='cp_pad_n.png' corner='8,8,8,8'" hotimage="file='cp_pad_h.png' corner='8,8,8,8'" pushedimage="file='cp_pad_p.png' corner='8,8,8,8'" />
+				<Button name="jianpan_x" text="删除" font="14" textcolor="#FF5F6368" float="true" pos="262,184,383,230" normalimage="file='cp_fn_n.png' corner='8,8,8,8'" hotimage="file='cp_fn_h.png' corner='8,8,8,8'" pushedimage="file='cp_fn_p.png' corner='8,8,8,8'" />
+			</Container>
+		</VerticalLayout>
+
+		<Control height="20"/>
+
+		<!-- 底部按钮:各占一半,高 44,上下留足呼吸空间 -->
+		<HorizontalLayout height="86" inset="18,14,18,18" childpadding="12" childvalign="vcenter">
+			<Button name="cancel" text="取消" font="15" textcolor="#FF5F6368" height="44" maxheight="44" normalimage="file='cp_cancel_n.png' corner='8,8,8,8'" hotimage="file='cp_cancel_h.png' corner='8,8,8,8'" pushedimage="file='cp_cancel_p.png' corner='8,8,8,8'"/>
+			<Button name="save" text="确定" font="15" textcolor="#FFFFFFFF" height="44" maxheight="44" normalimage="file='cp_ok_n.png' corner='8,8,8,8'" hotimage="file='cp_ok_h.png' corner='8,8,8,8'" pushedimage="file='cp_ok_p.png' corner='8,8,8,8'"/>
 		</HorizontalLayout>
 		</HorizontalLayout>
-		
 	</VerticalLayout>
 	</VerticalLayout>
 </Window>
 </Window>

BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_cancel_h.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_cancel_n.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_cancel_p.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_fn_h.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_fn_n.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_fn_p.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_input.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_ok_h.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_ok_n.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_ok_p.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_pad_h.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_pad_n.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/cp_pad_p.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ai_h.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ai_n.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ai_p.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ava.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ava_off.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_cart.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_dashline.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_add.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_add_grn.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_ai.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_ai16.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_card.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_clear.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_clear14.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_clear_red.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_del.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_drawer.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_handle.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_member.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_member_gray.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_minus.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_more.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_note.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_pack.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_paizi.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_paizi16.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_save.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_scan.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_search.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_search16.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_spec.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_take.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_warn.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_ico_warn12.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill_h.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill_red.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_pill_white.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/dc_search.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/deng_on.png


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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-
-<Window> 
-	<ListContainerElement name="diandan_cart_item" width="380" height="42">
-		<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" />
+<Window>
+	<!-- 购物车行:根 inset 14 与 ListHeader 对齐,商品 238 + 数量 52 + 金额 60(总和 350 <= 354) -->
+	<ListContainerElement name="diandan_cart_item" height="48" inset="14,0,14,0">
+		<VerticalLayout width="238">
+			<VerticalLayout height="42" childvalign="vcenter">
+				<Label name="diandan_cart_item_name" width="238" align="left" wordbreak="true" endellipsis="true" autocalcheight="true"/>
+			</VerticalLayout>
+			<Label name="diandan_cart_item_nature" width="238" height="42" align="left" padding="0,0,10,0" textcolor="#FF8A9099" visible="false" wordbreak="true" endellipsis="true"/>
 		</VerticalLayout>
 		</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> 
+		<Label name="diandan_cart_item_num" width="52" valign="vcenter" align="center"/>
+		<Label name="diandan_cart_item_price" width="60" valign="vcenter" align="right"/>
+	</ListContainerElement>
 </Window>
 </Window>

+ 15 - 9
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_wutu.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<Window>	
-	<!-- 宽度130,高度90-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="140" height="100">
-		<Label name="foodname" width="140" height="50" padding="5,26,5,0" font="18" wordbreak="true" endellipsis="true" align="center"></Label>
-		<Label name="price" width="140" height="24" font="16" textcolor="#FFFF7F50" align="center"></Label>
-		
-		<Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-		<Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
-		<Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+<Window>
+	<!-- 样式④ 纯文字 148x96:顶部留 26 给角标,名字 2 行 + 价格,上下 spacer 让内容垂直居中 -->
+	<DiandanFoodItem name="diandan_fooditem" width="148" height="96" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r8.png' corner='8,8,8,8'">
+		<VerticalLayout width="148" height="96" inset="10,26,10,10" childpadding="5">
+			<Control></Control>
+			<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true" align="center"></Label>
+			<Label name="price" height="19" font="113" textcolor="#FFF5623D" valign="top" align="center"></Label>
+			<Control></Control>
+		</VerticalLayout>
+		<Label name="nature" visible="false" width="54" height="22" font="12" text="多属性" float="true" pos="10,6,64,28" textcolor="#FFFFFFFF" bkimage="file='fc_chip_grn.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="chengzhong" visible="false" width="54" height="22" font="12" text="称重" float="true" pos="10,6,64,28" textcolor="#FFFFFFFF" bkimage="file='fc_chip_blue.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="kucun" visible="false" width="54" height="22" font="12" text="已售罄" float="true" pos="10,6,64,28" textcolor="#FFFFFFFF" bkimage="file='fc_chip_gray.png' corner='11,11,11,11'" align="center" valign="center"></Label>
 	</DiandanFoodItem>
 	</DiandanFoodItem>
+
 </Window>
 </Window>

+ 17 - 11
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu.xml

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<Window>	
-	<!-- 宽度130,高度90,图片高度也是130-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="200">
-		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-
-		<Label name="foodname" width="130" height="44" font="16" wordbreak="true" endellipsis="true"></Label>
-		<Label name="price" height="26" font="16" textcolor="#FFFF7F50" align="left"></Label>
-		
-		<Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-		<Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
-		<Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+<Window>
+	<!-- 样式① 图上文下 148x164:图 140x96 内缩 4 避圆角,文字区 64 高(名字 2 行 + 价格贴底) -->
+	<DiandanFoodItem name="diandan_fooditem" width="148" height="164" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r10.png' corner='10,10,10,10'">
+		<Control name="image" width="148" height="96" bkimage="file='fc_img_ph.png'"></Control>
+		<Control bkimage="file='fc_topmask.png'" width="148" height="164" float="true" pos="0,0,148,164" mouse="false"/>
+
+		<VerticalLayout width="148" height="64" inset="10,6,10,2">
+			<Label name="foodname" height="36" font="13" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true"></Label>
+			<Control></Control>
+			<Label name="price" height="20" font="114" textcolor="#FFF5623D" valign="top"></Label>
+		</VerticalLayout>
+		<Label name="nature" visible="false" width="54" height="22" font="12" text="多属性" float="true" pos="10,10,64,32" textcolor="#FFFFFFFF" bkimage="file='fc_chip_grn.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="chengzhong" visible="false" width="54" height="22" font="12" text="称重" float="true" pos="10,10,64,32" textcolor="#FFFFFFFF" bkimage="file='fc_chip_blue.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="kucun" visible="false" width="54" height="22" font="12" text="已售罄" float="true" pos="10,10,64,32" textcolor="#FFFFFFFF" bkimage="file='fc_chip_gray.png' corner='11,11,11,11'" align="center" valign="center"></Label>
 	</DiandanFoodItem>
 	</DiandanFoodItem>
+
 </Window>
 </Window>

+ 17 - 14
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_2.xml

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<Window>	
-	<!-- 宽度130,高度90,图片高度也是130-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="230" height="90">
-        <HorizontalLayout width="230" height="90" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-            <Control name="image" width="90" height="90" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
-            
-            <VerticalLayout width="130" height="90" padding="5,0,5,0">
-                <Label name="foodname" width="130" height="60" font="16" wordbreak="true" endellipsis="true"></Label>
-                <Label name="price" width="130" height="30" font="16" textcolor="#FFFF7F50" align="left"></Label>
-            </VerticalLayout>
+<Window>
+	<!-- 样式② 图左文右 250x76:缩略图 62x62 居左,名字价格居右(HLayout 子项高度只认 maxheight) -->
+	<DiandanFoodItem name="diandan_fooditem" width="250" height="76" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r8.png' corner='8,8,8,8'">
+		<HorizontalLayout width="250" height="76" inset="3,3,0,3" childpadding="9">
+			<Control name="image" width="62" height="62" maxheight="62" bkimage="file='fc_img_ph.png'"></Control>
 
 
-            <Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-            <Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
-            <Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
-        </HorizontalLayout>
+			<VerticalLayout width="176" height="70" maxheight="70">
+				<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true"></Label>
+				<Control></Control>
+				<Label name="price" height="19" font="113" textcolor="#FFF5623D" valign="top"></Label>
+			</VerticalLayout>
+		</HorizontalLayout>
+		<Label name="nature" visible="false" width="54" height="22" font="12" text="多属性" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_grn.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="chengzhong" visible="false" width="54" height="22" font="12" text="称重" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_blue.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="kucun" visible="false" width="54" height="22" font="12" text="已售罄" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_gray.png' corner='11,11,11,11'" align="center" valign="center"></Label>
 	</DiandanFoodItem>
 	</DiandanFoodItem>
+
 </Window>
 </Window>

+ 13 - 11
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_3.xml

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<Window>	
-	<!-- 宽度130,高度90,图片高度也是130-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="140" height="120">
-		<Control name="image" height="120" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
+<Window>
+	<!-- 样式③ 名字价格压图 148x150:图内缩 3 避圆角,底部信息条 66 高(半透明底预混成实色 #FFF5F7F8) -->
+	<DiandanFoodItem name="diandan_fooditem" width="148" height="150" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r8.png' corner='8,8,8,8'">
+		<Control name="image" width="148" height="150" padding="3,3,3,0" bkimage="file='fc_img_ph.png'"></Control>
 
 
-		<VerticalLayout name="diandan_fooditem_name_layout" width="140" height="44" float="true" pos="0,76,140,120" bkcolor="#C0FFFFFF" padding="5,0,5,0">
-			<Label name="foodname" width="140" height="22" font="16" wordbreak="true" endellipsis="true"></Label>
-			<Label name="price" height="22" font="16" textcolor="#FFFF7F50" align="left"></Label>
+		<VerticalLayout width="142" height="66" float="true" pos="3,81,145,147" mouse="false" inset="8,5,8,6" childpadding="2">
+			<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true"></Label>
+			<Label name="price" height="19" font="113" textcolor="#FFF5623D" valign="top"></Label>
 		</VerticalLayout>
 		</VerticalLayout>
-		
-		<Label name="nature" visible="false" width="50" height="26" font="12" text="多属性" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF2E8B57" align="center"></Label>		
-		<Label name="chengzhong" visible="false" width="50" height="26" font="12" text="称重" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FFFF4500" align="center"></Label>		
-		<Label name="kucun" visible="false" width="50" height="35" font="12" text="已售空" float="true" pos="0,0,40,22" textcolor="#FFFFFFFF" bkcolor="#FF696969" align="center"></Label>
+		<Label name="nature" visible="false" width="54" height="22" font="12" text="多属性" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_grn.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="chengzhong" visible="false" width="54" height="22" font="12" text="称重" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_blue.png' corner='11,11,11,11'" align="center" valign="center"></Label>
+
+		<Label name="kucun" visible="false" width="54" height="22" font="12" text="已售罄" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_gray.png' corner='11,11,11,11'" align="center" valign="center"></Label>
 	</DiandanFoodItem>
 	</DiandanFoodItem>
+
 </Window>
 </Window>

+ 255 - 217
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -1,291 +1,329 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 <Window>
 
 
+
 	<DiandanPage>
 	<DiandanPage>
-		<HorizontalLayout>
-			<Control width="1" bkcolor="#FFD1D1D1"></Control>
+		<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,12,12" childpadding="12">
 
 
-			<HorizontalLayout width="490" bkcolor="#FFFFFFFF">					
-				<VerticalLayout width="380" padding="0,0,0,0">
+			<!-- ============ 左:购物车 390(白卡 radius 10,内容区 380 保持原样) ============ -->
+			<VerticalLayout width="390" bkcolor="#00000000" childpadding="12">
+				<!-- 会员区块:独立卡片浮在灰底上(未登录白卡可点 / 登录浅绿卡) -->
+				<HorizontalLayout height="66" name="diandan_member_login_wrap">
+					<VerticalLayout>
+						<Button name="btn_diandan_member_login" text="" tooltip="点击登录会员" width="390" height="66" float="true" pos="0,0,390,66" normalimage="file='mb_login_n.png' corner='8,8,8,8'" hotimage="file='mb_login_h.png' corner='8,8,8,8'" pushedimage="file='mb_login_h.png' corner='8,8,8,8'"/>
+						<Control bkimage="dc_ava_off.png" width="32" height="32" float="true" pos="12,17,44,49" mouse="false"/>
+						<Label text="会员登录" font="115" textcolor="#FF1F2329" float="true" pos="54,14,220,35" mouse="false"/>
+						<Label text="未登录,点击此处登录会员" font="12" textcolor="#FF8A9099" float="true" pos="54,37,320,55" mouse="false"/>
+						<Label text="›" font="16" textcolor="#FF8A9099" float="true" pos="372,17,388,49" align="center" mouse="false"/>
+					</VerticalLayout>
+				</HorizontalLayout>
+				<VerticalLayout name="diandan_page_member_info" visible="false" height="66" bkimage="file='mb_card_n.png' corner='8,8,8,8'">
+					<Control bkimage="dc_ava.png" width="32" height="32" float="true" pos="12,17,44,49" mouse="false"/>
+					<VerticalLayout inset="54,10,110,11">
+						<HorizontalLayout height="21" childpadding="10">
+							<Label name="diandan_page_member_name" text="" font="115" textcolor="#FF1F2329" autocalcwidth="true" maxwidth="120" endellipsis="true"/>
+							<Button name="diandan_page_member_info_btn" text="更多信息" font="12" textcolor="#FF2E9B5C" width="48" height="21" maxheight="21" hottextcolor="#FF2E9B5C" pushedtextcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="0"/>
+						</HorizontalLayout>
+						<HorizontalLayout height="22" padding="0,2,0,0" childpadding="4">
+							<Label text="余额" font="12" width="26" textcolor="#FF5F6368"/>
+							<Label name="diandan_page_member_balance" text="" font="114" textcolor="#FFF5623D"/>
+						</HorizontalLayout>
+					</VerticalLayout>
+					<HorizontalLayout float="true" pos="284,20,380,46" childpadding="8">
+						<Button name="btn_diandan_member_chongzhi" text="充值" width="44" height="26" font="12" textcolor="#FFFFFFFF" normalimage="file='mb_act_n.png' corner='6,6,6,6'" hotimage="file='mb_act_h.png' corner='6,6,6,6'" pushedimage="file='mb_act_h.png' corner='6,6,6,6'"/>
+						<Button name="diandan_page_member_out_btn" text="退出" width="44" height="26" font="12" textcolor="#FF5F6368" normalimage="file='mb_act_g.png' corner='6,6,6,6'" hotimage="file='mb_act_gh.png' corner='6,6,6,6'" pushedimage="file='mb_act_gh.png' corner='6,6,6,6'"/>
+					</HorizontalLayout>
+				</VerticalLayout>
+
+				<!-- 购物车区块:白卡(餐牌 / 列表 / 备注 / 优惠 / 总价) -->
+				<VerticalLayout bkimage="file='dc_cart.png' corner='10,10,10,10'">
+					<!-- 称重区:保留原样,电子秤未连接时由 C++ 隐藏 -->
 					<HorizontalLayout name="diandan_page_chengzhong_layout" height="100">
 					<HorizontalLayout name="diandan_page_chengzhong_layout" height="100">
 						<VerticalLayout width="80">
 						<VerticalLayout width="80">
-							<Control name="diandan_page_status_chengzhong_wending" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,28,23,36" mouse="false"></Control>
-							<Label name="diandan_page_label_chengzhong_wending" text="稳定" height="20" padding="30,20,0,0" font="14"></Label>
-
-							<Control name="diandan_page_status_chengzhong_jingzhong" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,68,23,76" mouse="false"></Control>
-							<Label name="diandan_page_label_chengzhong_jingzhong" text="净重" height="20" padding="30,20,0,0" font="14"></Label>
-						</VerticalLayout>							
-
+							<Control name="diandan_page_status_chengzhong_wending" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,28,23,36" mouse="false"/>
+							<Label name="diandan_page_label_chengzhong_wending" text="稳定" height="20" padding="30,20,0,0" font="14"/>
+							<Control name="diandan_page_status_chengzhong_jingzhong" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,68,23,76" mouse="false"/>
+							<Label name="diandan_page_label_chengzhong_jingzhong" text="净重" height="20" padding="30,20,0,0" font="14"/>
+						</VerticalLayout>
 						<HorizontalLayout width="200">
 						<HorizontalLayout width="200">
-							<Label name="diandan_page_label_chengzhong_value" text="0.000" align="right" width="135" height="40" padding="0,35,0,0" textcolor="#FF3CB371" font="140"></Label>
-							<Label name="diandan_page_label_chengzhong_unit" text="公斤" height="30" padding="15,40,0,0" font="16"></Label>
+							<Label name="diandan_page_label_chengzhong_value" text="0.000" align="right" width="135" height="40" padding="0,35,0,0" textcolor="#FF2E9B5C" font="140"/>
+							<Label name="diandan_page_label_chengzhong_unit" text="公斤" height="30" padding="15,40,0,0" font="16"/>
 						</HorizontalLayout>
 						</HorizontalLayout>
-
 						<VerticalLayout>
 						<VerticalLayout>
-							<Button name="diandan_page_chengzhong_zhiling" visible="false" width="80" height="32" padding="10,10,10,0" text="置零" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
-							<Button name="diandan_page_chengzhong_qupi" visible="false" width="80" height="32" padding="10,15,10,0" text="去皮" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
-
+							<Button name="diandan_page_chengzhong_zhiling" visible="false" width="80" height="32" padding="10,10,10,0" text="置零" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'"/>
+							<Button name="diandan_page_chengzhong_qupi" visible="false" width="80" height="32" padding="10,15,10,0" text="去皮" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'"/>
 						</VerticalLayout>
 						</VerticalLayout>
 					</HorizontalLayout>
 					</HorizontalLayout>
 
 
-					<Control height="1" bkcolor="#FFEBE8E8"></Control>
-
-					<HorizontalLayout name="btn_diandan_qingkong" 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>
-						
-						<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>							
-						
+					<!-- 餐牌号 / 清空 药丸行 -->
+					<HorizontalLayout name="diandan_member_row" height="52" inset="14,0,14,0" childpadding="8" childvalign="vcenter">
+						<VerticalLayout width="104" height="32">
+							<Button name="btn_diandan_canpaihao" text="" tooltip="输入餐牌号" width="104" height="32" font="13" textcolor="#FF5F6368" normalimage="file='dc_pill.png' corner='16,16,16,16'" hotimage="file='dc_pill_h.png' corner='16,16,16,16'" pushedimage="file='dc_pill_h.png' corner='16,16,16,16'"/>
+							<Control bkimage="dc_ico_paizi16.png" width="16" height="16" float="true" pos="13,8,29,24" mouse="false"/>
+							<Label name="diandan_canpaihao_text" text="餐牌号" font="13" textcolor="#FF5F6368" float="true" pos="35,0,102,32" valign="center" endellipsis="true" mouse="false"/>
+						</VerticalLayout>
 						<Control></Control>
 						<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" 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>
+						<VerticalLayout width="76" height="32">
+							<Button name="btn_diandan_qingkong" text="" tooltip="清空购物车" width="76" height="32" normalimage="file='dc_pill_white.png' corner='16,16,16,16'" hotimage="file='dc_pill_red.png' corner='16,16,16,16'" pushedimage="file='dc_pill_red.png' corner='16,16,16,16'"/>
+							<Label text="清空" font="13" textcolor="#FF8A9099" float="true" pos="0,0,76,32" align="center" valign="center" mouse="false"/>
+						</VerticalLayout>
 					</HorizontalLayout>
 					</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" />
+
+				<HorizontalLayout name="diandan_page_zhengdanbeizhu_layout" height="40" bkcolor="#FFF5F7FA" padding="1,0,1,0" childpadding="8" childvalign="vcenter" visible="false">
+					<Control bkimage="dc_ico_warn12.png" width="12" height="12" maxheight="12" padding="14,0,0,0"/>
+					<Label name="diandan_page_label_zhengdanbeizhu" text="整单备注:" font="13" textcolor="#FFA8ADB3" valign="center"/>
+				</HorizontalLayout>
+					<List name="list_diandan_cart" inset="1,0,1,0" vscrollbar="true" itemselectedbkcolor="#FFE8F7F0" itemhotbkcolor="#FFEFF9F4">
+						<ListHeader inset="14,0,14,0" height="34">
+							<ListHeaderItem text="商品" width="238" align="left" font="13" textcolor="#FF5F6368"/>
+							<ListHeaderItem text="数量" width="52" align="center" font="13" textcolor="#FF5F6368"/>
+							<ListHeaderItem text="金额" width="60" align="right" font="13" textcolor="#FF5F6368"/>
+							<Control height="1" float="true" pos="0,33,388,34" bkcolor="#FFF0F1F3" mouse="false"/>
 						</ListHeader>
 						</ListHeader>
 					</List>
 					</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>
+					<!-- 虚线分隔:商品明细 / 优惠 -->
+					<Control height="1" width="388" bkimage="file='dc_dashline.png'"/>
+
+					<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="40" bkcolor="#FFFFFFFF" visible="false" padding="10,0,10,0" childvalign="vcenter">
+						<Label name="diandan_page_youhui_tishi" text="已优惠10元" textcolor="#FFE14B4A" font="13" padding="0,0,0,0" width="160" height="40" align="left" valign="center"/>
+						<Control></Control>
+						<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" maxheight="30" width="76" padding="0,0,0,0" font="12" textcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"/>
+					</HorizontalLayout>
+
+					<!-- 总价(左:打包费 / 右:总价) -->
+					<HorizontalLayout height="48" inset="10,0,14,0">
+						<Label name="diandan_page_otherprice" text="" height="48" font="13" textcolor="#FF1F2329" align="left" valign="center" showhtml="true"/>
+						<Label name="diandan_page_totalprice" text="总价:{f 124}<c #E14B4A>¥0.00</c>" height="48" font="15" textcolor="#FF1F2329" align="right" valign="center" showhtml="true"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
 
 
-					<Control height="1" bkcolor="#FFEBE8E8"></Control>
-			
-					<VerticalLayout height="145" bkcolor="#FFFFFFFF">
-						<HorizontalLayout height="50">
-							<Label name="diandan_page_otherprice" text="" width="200" align="left" padding="15,14,0,0"></Label>
-							<Label name="diandan_page_totalprice" text="总价:¥0.00" font="20" textcolor="#FFFF4444" width="150" align="right" padding="0,0,15,0"></Label>
-						</HorizontalLayout>
-						
-						<HorizontalLayout height="90" name="diandan_pay_layout">
-							<Button name="btn_diandan_weixinzhifu_pay" text="" height="75" width="113" 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="微信支付/支付宝/云闪付" 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="113" 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>
-							<Label text="会员支付" width="110" height="35" font="14" float="true" pos="159,35,269,70" textcolor="#FFFFFFFF" mouse="false"></Label>
-							
-							<Button name="btn_diandan_gengduozhifu_pay" text="" height="75" width="113" padding="10,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-							<Control bkimage="gengduozhifu_icon.png" width="21" height="21" float="true" pos="299,10,320,31" mouse="false"></Control>
-							<Label text="更多支付" width="110" height="35" font="14" float="true" pos="282,35,392,70" mouse="false"></Label>
-						</HorizontalLayout>
-						
-						<Button visible="false" name="btn_diandan_jixujiacai" text="继续点单" height="55" padding="20,20,20,15" textcolor="#FFFFFFFF"></Button>
-					</VerticalLayout>
-				</VerticalLayout>
-				
-				<Control width="1" bkcolor="#FFEBE8E8"></Control>
-				
-				<VerticalLayout width="110" padding="0,0,0,0" vscrollbar="true">
-					<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_cundan" 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_qudan" 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'" />
-					
-					<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" float="true" pos="85,325,104,344" textcolor="#FFFFFFFF" bkimage="num_bkg.png" bordercolor="#FFFF0000" bordersize="0"></Label>
-					
-					<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_qianxiang" width="90" height="40" padding="10,10,10,30" 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>
 				</VerticalLayout>
-			</HorizontalLayout>
-			
-			<Control width="1" bkcolor="#FFEBE8E8"></Control>
-			
-			<VerticalLayout name="diandan_food_layout">
-				<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
-					<Container name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 
 
+				<!-- 支付按钮:扫码绿 / 会员橙 / 更多白;左右与购物车对齐、上下距 12px、按钮间距 12px -->
+				<HorizontalLayout name="diandan_pay_layout" height="54" inset="0,0,0,0" childpadding="12">
+					<VerticalLayout width="122" height="54">
+						<Button name="btn_diandan_weixinzhifu_pay" text="" width="122" height="54" normalimage="file='pay_scan_n.png' corner='8,8,8,8'" hotimage="file='pay_scan_h.png' corner='8,8,8,8'" pushedimage="file='pay_scan_p.png' corner='8,8,8,8'"/>
+						<Control bkimage="dc_ico_scan.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+						<Label text="扫码支付" font="13" textcolor="#FFFFFFFF" float="true" pos="46,0,110,54" align="left" valign="center" mouse="false"/>
+					</VerticalLayout>
+					<VerticalLayout width="122" height="54">
+						<Button name="btn_diandan_huiyuanzhifu_pay" text="" width="122" height="54" normalimage="file='pay_member_n.png' corner='8,8,8,8'" hotimage="file='pay_member_h.png' corner='8,8,8,8'" pushedimage="file='pay_member_p.png' corner='8,8,8,8'"/>
+						<Control bkimage="dc_ico_card.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+						<Label text="会员支付" font="13" textcolor="#FFFFFFFF" float="true" pos="46,0,110,54" align="left" valign="center" mouse="false"/>
+					</VerticalLayout>
+					<VerticalLayout width="122" height="54">
+						<Button name="btn_diandan_gengduozhifu_pay" text="" width="122" height="54" normalimage="file='pay_more_n.png' corner='8,8,8,8'" hotimage="file='pay_more_h.png' corner='8,8,8,8'" pushedimage="file='pay_more_p.png' corner='8,8,8,8'"/>
+						<Control bkimage="dc_ico_more.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+						<Label text="更多支付" font="13" textcolor="#FF5F6368" float="true" pos="46,0,110,54" align="left" valign="center" mouse="false"/>
+					</VerticalLayout>
+				</HorizontalLayout>
+
+				<!-- 继续点单:仅结算(优惠/账单)页显示于购物车底部;默认隐藏,由 C++ ShowJiesuanPage/ShowXuangouPage 控制 -->
+				<Button visible="false" name="btn_diandan_jixujiacai" text="继续点单" height="54" font="15" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='8,8,8,8'" hotimage="file='btn_green_xuanfu.png' corner='8,8,8,8'" pushedimage="file='btn_green_dianji.png' corner='8,8,8,8'"/>
+			</VerticalLayout>
+			<!-- ============ 中:操作条 56(图标 + 文字竖排,整卡都是热区) ============ -->
+			<VerticalLayout width="56" childpadding="7">
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_jia" tooltip="添加数量" text="" width="56" height="56" normalimage="file='op_plus_n.png' corner='10,10,10,10'" hotimage="file='op_plus_h.png' corner='10,10,10,10'" pushedimage="file='op_plus_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,18,38,38" bkimage="file='op_ico_add_grn.png'" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_jian" tooltip="减少数量" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,18,38,38" bkimage="file='op_ico_minus.png'" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_shanchu" tooltip="删除" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,8,38,28" bkimage="file='op_ico_del.png'" mouse="false"/>
+				<Label text="删除" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_guige" tooltip="规格/做法" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,8,38,28" bkimage="file='op_ico_spec.png'" mouse="false"/>
+				<Label text="规格/做法" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_dabao" tooltip="打包" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,8,38,28" bkimage="file='op_ico_pack.png'" mouse="false"/>
+				<Label text="打包" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_cundan" tooltip="存单" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,8,38,28" bkimage="file='op_ico_save.png'" mouse="false"/>
+				<Label text="存单" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_qudan" tooltip="取单" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,8,38,28" bkimage="file='op_ico_take.png'" mouse="false"/>
+				<Label text="取单" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_zhengdanbeizhu" tooltip="整单备注" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,8,38,28" bkimage="file='op_ico_note.png'" mouse="false"/>
+				<Label text="整单备注" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+			</VerticalLayout>
+			<VerticalLayout width="56" height="56">
+				<Button name="btn_diandan_qianxiang" tooltip="打开钱箱" text="" width="56" height="56" normalimage="file='op_n.png' corner='10,10,10,10'" hotimage="file='op_h.png' corner='10,10,10,10'" pushedimage="file='op_p.png' corner='10,10,10,10'"/>
+				<Control float="true" pos="18,8,38,28" bkimage="file='op_ico_drawer.png'" mouse="false"/>
+				<Label text="打开钱箱" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+			</VerticalLayout>
+			<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" valign="center" float="true" pos="37,372,56,391" font="12" textcolor="#FFFFFFFF" bkimage="num_bkg.png" bordercolor="#FFFF0000" bordersize="0"/>
+			</VerticalLayout>
+
+			<!-- ============ 右:分类 + 商品网格 + 搜索(自适应 800) ============ -->
+			<VerticalLayout name="diandan_food_layout" childpadding="12">
+				<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
+					<Container name="diandan_fenlei_layout">
 					</Container>
 					</Container>
 				</VerticalLayout>
 				</VerticalLayout>
-				
-				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
-				
+
+				<TileLayout name="diandan_foodlist" bkcolor="#00000000" vscrollbar="true" hscrollbar="false" childpadding="10">
 				</TileLayout>
 				</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" width="23" height="23" pos="365,23,388,46" float="true" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png"></Button>
-
-					<Button name="diandan_page_aixuexi_btn" width="120" height="50" text="AI学习" textcolor="#FFFFFFFF" padding="30,10,0,0" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+
+				<HorizontalLayout height="40" childpadding="10">
+					<HorizontalLayout bkimage="file='dc_search.png' corner='20,20,20,20'" inset="16,0,12,0" childpadding="8" childvalign="vcenter">
+						<Control bkimage="dc_ico_search16.png" width="16" height="16" maxheight="16"/>
+						<Edit name="diandan_food_search_edit" tooltip="请输入商品名字或条码搜索" font="12" textcolor="#FF1F2329" maxheight="24" bkcolor="#00000000" nativebkcolor="#FFEFF1F3"/>
+						<Label name="diandan_food_search_tishi" text="请输入商品名字或条码搜索" width="150" height="20" font="12" float="true" pos="40,10,190,30" mouse="false" valign="center" textcolor="#FFA8ADB3"/>
+						<Button name="diandan_food_search_clear" visible="false" width="23" height="23" maxheight="23" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png"/>
+					</HorizontalLayout>
+
+					<VerticalLayout width="120" height="40">
+						<Button name="diandan_page_aixuexi_btn" tooltip="AI学习" text="" width="120" height="40" normalimage="file='dc_ai_n.png' corner='20,20,20,20'" hotimage="file='dc_ai_h.png' corner='20,20,20,20'" pushedimage="file='dc_ai_p.png' corner='20,20,20,20'"/>
+						<Control float="true" pos="20,12,36,28" bkimage="dc_ico_ai16.png" mouse="false"/>
+						<Label text="AI学习" float="true" pos="40,9,100,31" font="13" textcolor="#FFFFFFFF" align="center" valign="center" mouse="false"/>
+					</VerticalLayout>
 				</HorizontalLayout>
 				</HorizontalLayout>
 			</VerticalLayout>
 			</VerticalLayout>
-			
+
+			<!-- ============ 结算面板(默认隐藏,内部保持原样) ============ -->
 			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false">
 			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false">
 				<VerticalLayout name="diandan_jiesuan_youhui_layout" width="330">
 				<VerticalLayout name="diandan_jiesuan_youhui_layout" width="330">
 					<HorizontalLayout height="58">
 					<HorizontalLayout height="58">
-						<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="20"></Label>
+						<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="20"/>
 						<Control></Control>
 						<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>
-					
+						<Button name="diandan_jiesuan_yincangyouhui_btn" text="隐藏优惠" height="36" maxheight="36" width="90" padding="0,11,10,0" textcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF2E9B5C" bkcolor="#FFFFFFFF"/>
+					</HorizontalLayout>
+
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"/>
+
 					<HorizontalLayout padding="0,15,0,0" height="48">
 					<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>
+						<Label text="整单折扣:" width="90" height="48" padding="20,0,0,0"/>
+						<Button name="diandan_jiesuan_zhekou_value" text="" height="48" maxheight="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"/>
+						<Label text="%" width="60" height="48" padding="20,0,0,0"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
-					
+
 					<HorizontalLayout padding="0,15,0,0" height="48">
 					<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>
+						<Label text="加价:" width="90" height="48" padding="20,0,0,0"/>
+						<Button name="diandan_jiesuan_jiajia_value" text="" height="48" maxheight="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"/>
+						<Label text="元" width="60" height="48" padding="20,0,0,0"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
-					
+
 					<HorizontalLayout padding="0,15,0,0" height="48">
 					<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>
+						<Label text="优惠:" width="90" height="48" padding="20,0,0,0"/>
+						<Button name="diandan_jiesuan_youhui_value" text="" height="48" maxheight="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"/>
+						<Label text="元" width="60" height="48" padding="20,0,0,0"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
-					
+
 					<HorizontalLayout padding="0,15,0,0" height="48">
 					<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>
+						<Label text="优惠券:" width="90" height="48" padding="20,0,0,0"/>
+						<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"/>
+						<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="35" maxheight="35" width="90" padding="0,6,0,0" textcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF2E9B5C" bkcolor="#FFFFFFFF"/>
+						<Button name="diandan_jiesuan_youhuiquan_btn_cancel" visible="false" text="取消使用" height="35" maxheight="35" width="90" padding="15,6,0,0" textcolor="#FFE14B4A" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFE14B4A" bkcolor="#FFFFFFFF"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
-					
+
 					<HorizontalLayout padding="0,15,0,0" height="48">
 					<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>
+						<Label text="商品券:" width="90" height="48" padding="20,0,0,0"/>
+						<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"/>
+						<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="35" maxheight="35" width="90" padding="0,6,0,0" textcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF2E9B5C" bkcolor="#FFFFFFFF"/>
+						<Button name="diandan_jiesuan_shangpinquan_btn_cancel" visible="false" text="取消使用" height="35" maxheight="35" width="90" padding="15,6,0,0" textcolor="#FFE14B4A" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFE14B4A" bkcolor="#FFFFFFFF"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
-					
+
 					<HorizontalLayout padding="0,15,0,0" height="48">
 					<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>
+						<Label text="次卡:" width="90" height="48" padding="20,0,0,0"/>
+						<Label name="diandan_jiesuan_cika_status" text="未使用" width="70" height="48" padding="0,0,0,0"/>
+						<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="35" maxheight="35" width="90" padding="0,6,0,0" textcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF2E9B5C" bkcolor="#FFFFFFFF"/>
+						<Button name="diandan_jiesuan_cika_btn_cancel" visible="false" text="取消使用" height="35" maxheight="35" width="90" padding="15,6,0,0" textcolor="#FFE14B4A" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFE14B4A" bkcolor="#FFFFFFFF"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
-					
+
 					<HorizontalLayout padding="0,15,0,0" height="48">
 					<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>
+						<Label text="权益卡:" width="90" height="48" padding="20,0,0,0"/>
+						<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="70" height="48" padding="0,0,0,0"/>
+						<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="35" maxheight="35" width="90" padding="0,6,0,0" textcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF2E9B5C" bkcolor="#FFFFFFFF"/>
+						<Button name="diandan_jiesuan_quanyika_btn_cancel" visible="false" text="取消使用" height="35" maxheight="35" width="90" padding="15,6,0,0" textcolor="#FFE14B4A" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFE14B4A" bkcolor="#FFFFFFFF"/>
 					</HorizontalLayout>
 					</HorizontalLayout>
-					
+
 					<HorizontalLayout padding="0,15,0,0" height="130">
 					<HorizontalLayout padding="0,15,0,0" height="130">
-						<Label text="抹零:" width="90" height="48" padding="20,0,0,0"></Label>
+						<Label text="抹零:" width="90" height="48" padding="20,0,0,0"/>
 						<VerticalLayout padding="0,10,0,0">
 						<VerticalLayout padding="0,10,0,0">
 							<HorizontalLayout padding="0,0,30,0" width="200" height="30">
 							<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"/>
+								<CheckBox name="diandan_jiesuan_moling_bumoling" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" maxheight="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label text="不抹零" width="150" height="30" maxheight="30" padding="15,0,0,0"/>
 							</HorizontalLayout>
 							</HorizontalLayout>
-							
+
 							<HorizontalLayout padding="0,0,30,0" width="200" height="30">
 							<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"/>
+								<CheckBox name="diandan_jiesuan_moling_molingdaojiao" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" maxheight="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label text="抹零到角" width="150" height="30" maxheight="30" padding="15,0,0,0"/>
 							</HorizontalLayout>
 							</HorizontalLayout>
-							
+
 							<HorizontalLayout padding="0,0,30,0" width="200" height="30">
 							<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"/>
+								<CheckBox name="diandan_jiesuan_moling_molingdaoyuan" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" maxheight="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label text="抹零到元" width="150" height="30" maxheight="30" padding="15,0,0,0"/>
 							</HorizontalLayout>
 							</HorizontalLayout>
 						</VerticalLayout>
 						</VerticalLayout>
 					</HorizontalLayout>
 					</HorizontalLayout>
 				</VerticalLayout>
 				</VerticalLayout>
-				
-				<Control name="diandan_jiesuan_youhui_line" width="1" bkcolor="#FFEBE8E8"></Control>
-				
+
+				<Control name="diandan_jiesuan_youhui_line" width="1" bkcolor="#FFEBE8E8"/>
+
 				<VerticalLayout name="diandan_page_jiesuan_zhangdan_layout" vscrollbar="true">
 				<VerticalLayout name="diandan_page_jiesuan_zhangdan_layout" vscrollbar="true">
 					<HorizontalLayout height="58">
 					<HorizontalLayout height="58">
-						<Label text="账单明细" height="58" padding="20,0,0,0" font="20"></Label>
+						<Label text="账单明细" height="58" padding="20,0,0,0" font="20"/>
 						<Control></Control>
 						<Control></Control>
-						<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" visible="false" 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>
-					
+						<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" visible="false" height="36" maxheight="36" width="90" padding="0,11,10,0" textcolor="#FF2E9B5C" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF2E9B5C" bkcolor="#FFFFFFFF"/>
+					</HorizontalLayout>
+
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"/>
+
 					<VerticalLayout name="diandan_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
 					<VerticalLayout name="diandan_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
-					
 					</VerticalLayout>
 					</VerticalLayout>
-					
-					<Control height="1" bkcolor="#FFEBE8E8" padding="10,10,10,0"></Control>
-					
+
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,10,10,0"/>
+
 					<HorizontalLayout height="50">
 					<HorizontalLayout height="50">
 						<Control></Control>
 						<Control></Control>
 						<Label name="diandan_jiesuan_total_yingshou" text="" width="150" height="50" align="right" padding="0,0,15,0"/>
 						<Label name="diandan_jiesuan_total_yingshou" text="" width="150" height="50" align="right" padding="0,0,15,0"/>
 					</HorizontalLayout>
 					</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>
-					
+
+					<Label text="支付方式" width="100" height="58" padding="20,30,0,0" font="20"/>
+
+					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"/>
+
 					<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout">
 					<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 name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" height="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"/>
+							<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"/>
+							<Label name="zhifu_name" text="微信支付/支付宝/云闪付" wordbreak="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"/>
 						</HorizontalLayout>
 						</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 name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" height="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"/>
+							<Control name="zhifu_icon" bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="50,10,76,30" mouse="false"/>
+							<Label name="zhifu_name" text="会员支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"/>
 						</HorizontalLayout>
 						</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 name="diandan_jiesuan_zhifufangshi_xianjin" width="120" height="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"/>
+							<Control name="zhifu_icon" bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="50,10,71,34" mouse="false"/>
+							<Label name="zhifu_name" text="现金支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"/>
 						</HorizontalLayout>
 						</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 name="diandan_jiesuan_zhifufangshi_fulika" width="122" height="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"/>
+							<Control name="zhifu_icon" bkimage="fulika_icon.png" width="30" height="30" float="true" pos="48,10,78,40" mouse="false"/>
+							<Label name="zhifu_name" text="福利卡" width="180" height="35" font="14" float="true" pos="40,35,220,70" mouse="false"/>
 						</HorizontalLayout>
 						</HorizontalLayout>
 					</HorizontalLayout>
 					</HorizontalLayout>
 				</VerticalLayout>
 				</VerticalLayout>
 			</HorizontalLayout>
 			</HorizontalLayout>
 		</HorizontalLayout>
 		</HorizontalLayout>
 	</DiandanPage>
 	</DiandanPage>
-</Window>
+</Window>

BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/download_xuanfu.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_chip_blue.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_chip_gray.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_chip_grn.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_img_ph.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r10.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r10_hot.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r8.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_r8_hot.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/fc_topmask.png


+ 11 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/foodtype_option.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 <Window>
-	<FoodtypeOption endellipsis="true" align="center" valign="center" width="130" height="42" float="true" padding="15,19,0,0" bkcolor="#FFECECEC" selectedtextcolor="#FFFFFFFF" selectedbkcolor="#FF3CB371">
+	<!-- 分类胶囊 130x38 圆角 19。
+	     ⚠️ 删掉了 align="center":Option 继承 Button,align 走的是 float 对齐而不是文字对齐,
+	        一旦设了 DT_CENTER,SetFloatPos 就把 X 居中、完全无视 C++ 的 SetFixedXY,
+	        所有分类会叠在容器正中。文字居中由 CButtonUI 构造函数的 DT_CENTER 默认保证。 -->
+	<FoodtypeOption endellipsis="true" width="130" height="38" float="true" font="13"
+		textcolor="#FF5F6368" selectedtextcolor="#FFFFFFFF" pushedtextcolor="#FFFFFFFF" pushedtextcolor="#FFFFFFFF"
+		bkcolor="#00000000" selectedbkcolor="#00000000"
+		normalimage="file='bt_cat_n.png' corner='19,19,19,19'"
+		hotimage="file='bt_cat_hot.png' corner='19,19,19,19'"
+		pushedimage="file='bt_cat_sel.png' corner='19,19,19,19'"
+		selectedimage="file='bt_cat_sel.png' corner='19,19,19,19'">
 	</FoodtypeOption>
 	</FoodtypeOption>
 </Window>
 </Window>

BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_btn4.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_btn4_hot.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_btn4_pushed.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_card8.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_card8_hot.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/gd_card8_pushed.png


+ 22 - 16
bin/Win32/Debug/zhipuzi_pos_windows/skin/gengduo_item.xml

@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 <Window>
-	<VerticalLayout width="120" height="160" float="true">
-		<VerticalLayout width="120" height="120" bkcolor="#FFECECEC">
-			<HorizontalLayout height="52" padding="0,19,0,0">
-				<Control></Control>
-				<Control name="image" width="52" height="52"></Control>
-				<Control></Control>
-			</HorizontalLayout>
-			<Label name="title" height="30" align="center"></Label>
-			
-			<Button name="gengduo_item_btn" width="120" height="120" normalimage="" hotimage="" pushedimage="" bordersize="0" float="true" pos="0,0,120,120"></Button>
+	<!-- 更多页功能卡(风格⑧ 可拖拽卡片):108x108 卡片 + 8 间距 + 26 排序行 = 142 -->
+	<!-- 三态背景由 Button 承担(非 float,先绘制);图标/文字/拖拽手柄用 float 画在上层且 mouse=false,
+	     这样点击会穿透到 Button,卡片整块都是热区 -->
+	<VerticalLayout width="108" height="142" maxheight="142" childpadding="8">
+		<VerticalLayout width="108" height="108" maxheight="108">
+			<Button name="gengduo_item_btn" height="108" maxheight="108" text="" bordersize="0" bkcolor="#00000000"
+				normalimage="file='gd_card8.png'" hotimage="file='gd_card8_hot.png'" pushedimage="file='gd_card8_pushed.png'"/>
+			<Control name="image" float="true" pos="36,23,72,59" mouse="false"/>
+			<Label name="title" float="true" pos="0,67,108,85" font="13" textcolor="#FF1F2329" align="center" valign="top" mouse="false"/>
+			<Control name="handle" float="true" pos="88,7,100,23" bkimage="file='dc_ico_handle.png'" mouse="false"/>
 		</VerticalLayout>
 		</VerticalLayout>
-		
-		<HorizontalLayout height="40" padding="0,0,0,0">
-			<Button name="front" text="前移" font="14" heiht="25" width="36" padding="0,15,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" textcolor="#FF3CB371" bordercolor="#FF3CB371"></Button>
-			<Button name="back" text="后移" font="14" heiht="25" width="36" padding="6,15,6,0" normalimage="" hotimage="" pushedimage="" bordersize="1" textcolor="#FF3CB371" bordercolor="#FF3CB371"></Button>
-			<Button name="exchange" text="下移" font="14" heiht="25" width="36" padding="0,15,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" textcolor="#FF3CB371" bordercolor="#FF3CB371"></Button>
+		<!-- 排序操作行:HLayout 子项高度只认 maxheight(DuiLib 铁律) -->
+		<HorizontalLayout height="26" maxheight="26" childpadding="5">
+			<Button name="front" text="前移" width="32" maxheight="26" font="12" textcolor="#FF2E9B5C"
+				bordersize="0" bkcolor="#00000000"
+				normalimage="file='gd_btn4.png' corner='4,4,4,4'" hotimage="file='gd_btn4_hot.png' corner='4,4,4,4'" pushedimage="file='gd_btn4_pushed.png' corner='4,4,4,4'"/>
+			<Button name="back" text="后移" width="32" maxheight="26" font="12" textcolor="#FF2E9B5C"
+				bordersize="0" bkcolor="#00000000"
+				normalimage="file='gd_btn4.png' corner='4,4,4,4'" hotimage="file='gd_btn4_hot.png' corner='4,4,4,4'" pushedimage="file='gd_btn4_pushed.png' corner='4,4,4,4'"/>
+			<Button name="exchange" text="下移" width="32" maxheight="26" font="12" textcolor="#FF2E9B5C"
+				bordersize="0" bkcolor="#00000000"
+				normalimage="file='gd_btn4.png' corner='4,4,4,4'" hotimage="file='gd_btn4_hot.png' corner='4,4,4,4'" pushedimage="file='gd_btn4_pushed.png' corner='4,4,4,4'"/>
 		</HorizontalLayout>
 		</HorizontalLayout>
 	</VerticalLayout>
 	</VerticalLayout>
-</Window>
+</Window>

+ 17 - 12
bin/Win32/Debug/zhipuzi_pos_windows/skin/gengduo_page.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 <Window>
-	
 	<GengduoPage>
 	<GengduoPage>
-		<VerticalLayout>
-			<Label text="常用功能" height="30" font="20" padding="20,20,0,0"></Label>				
-			<HorizontalLayout name="gengduo_page_changyong_layout">					
-				
+		<VerticalLayout bkcolor="#FFF5F7FA" inset="26,22,26,0" childpadding="14">
+			<HorizontalLayout height="24" maxheight="24" childvalign="vcenter">
+				<Label text="常用功能" font="116" textcolor="#FF1F2329" maxheight="22" valign="top" mouse="false"/>
+				<Button name="changyong_reset" text="重置排序" font="13" width="66" maxheight="24" textcolor="#FF2E9B5C"
+					hottextcolor="#FF2E9B5C" pushedtextcolor="#FF2E9B5C" bordersize="0" bkcolor="#00000000"
+					normalimage="" hotimage="" pushedimage=""/>
 			</HorizontalLayout>
 			</HorizontalLayout>
-		
-			<Label text="更多功能" height="30" font="20" padding="20,20,0,0"></Label>
-			<HorizontalLayout name="gengduo_page_gengduo_layout">					
-				
+			<HorizontalLayout name="gengduo_page_changyong_layout" height="142" maxheight="142" childpadding="18"/>
+
+			<HorizontalLayout height="24" maxheight="24" childvalign="vcenter">
+				<Label text="更多功能" font="116" textcolor="#FF1F2329" maxheight="22" valign="top" mouse="false"/>
+				<Button name="gengduo_reset" text="重置排序" font="13" width="66" maxheight="24" textcolor="#FF2E9B5C"
+					hottextcolor="#FF2E9B5C" pushedtextcolor="#FF2E9B5C" bordersize="0" bkcolor="#00000000"
+					normalimage="" hotimage="" pushedimage=""/>
 			</HorizontalLayout>
 			</HorizontalLayout>
-			
-			<Control></Control>
+			<HorizontalLayout name="gengduo_page_gengduo_layout" height="142" maxheight="142" childpadding="18"/>
+
+			<Control/>
 		</VerticalLayout>
 		</VerticalLayout>
 	</GengduoPage>
 	</GengduoPage>
-</Window>
+</Window>

BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/hyinfo_btn_main_hover.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/hyinfo_btn_main_normal.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_add.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_close_xuanfu.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_fangda_xuanfu.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_shou_xuanfu.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/icon_suoxiao_xuanfu.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/input_focus.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/input_green.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/jb_btn_green_normal.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/kefu_xuanfu.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/key_pushed.png


BIN
bin/Win32/Debug/zhipuzi_pos_windows/skin/login_arrow_hot.png


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.