正餐点餐页面优化完，开始优化桌台页面。

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

@@ -1,285 +1,374 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Window>
+
+
 	<ZhengcanDiandanPage>
-		<HorizontalLayout>
-			<Control width="1" bkcolor="#FFD1D1D1"></Control>
+<HorizontalLayout>
+		<Control width="1" bkcolor="#FFD1D1D1"></Control>
+
+		<VerticalLayout name="page_layout">
+			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+				<Button name="diandan_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+				<Label name="diandan_page_table_name" text="" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
+			</HorizontalLayout>
 
-			<VerticalLayout name="page_layout">
-				<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
-					<Button name="diandan_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
-					<Label name="diandan_page_table_name" text="" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
+			<Control height="1" bkcolor="#FFF0F1F3"></Control>
+
+			<HorizontalLayout bkcolor="#FFF5F7FA" inset="12,12,12,12" childpadding="12">
+
+			<!-- ============ 左：购物车 390（白卡 radius 10，内容区 380 保持原样） ============ -->
+			<VerticalLayout width="390" bkcolor="#00000000" childpadding="12">
+				<!-- 称重卡：独立卡片置顶（未接电子秤时由 C++ 隐藏 diandan_page_chengzhong_layout）。C4 布局：状态竖排 / 数字块 164x54 左右居中 / 置零·去皮竖排，卡高 76 -->
+				<HorizontalLayout name="diandan_page_chengzhong_layout" height="76" bkimage="file='dc_cart.png' corner='10,10,10,10'" visible="false">
+					<VerticalLayout float="true" pos="14,16,66,60" mouse="false">
+						<Control name="diandan_page_status_chengzhong_wending" bkimage="deng_off.png" width="8" height="8" float="true" pos="0,4,8,12" mouse="false"/>
+						<Label name="diandan_page_label_chengzhong_wending" text="稳定" font="12" textcolor="#FF5F6368" float="true" pos="14,0,52,17" mouse="false"/>
+						<Control name="diandan_page_status_chengzhong_jingzhong" bkimage="deng_off.png" width="8" height="8" float="true" pos="0,31,8,39" mouse="false"/>
+						<Label name="diandan_page_label_chengzhong_jingzhong" text="净重" font="12" textcolor="#FF5F6368" float="true" pos="14,27,52,44" mouse="false"/>
+					</VerticalLayout>
+					<HorizontalLayout float="true" pos="113,11,277,65" bkimage="file='cz_num_bg.png'" mouse="false">
+						<Label name="diandan_page_label_chengzhong_value" text="0.000" align="right" font="132" textcolor="#FF2E9B5C" float="true" pos="8,6,118,48" mouse="false"/>
+						<Label name="diandan_page_label_chengzhong_unit" text="公斤" font="13" textcolor="#FF2E9B5C" float="true" pos="124,25,150,43" mouse="false"/>
+					</HorizontalLayout>
+					<Button name="diandan_page_chengzhong_zhiling" visible="false" float="true" pos="328,8,376,35" text="置零" font="12" textcolor="#FF2E9B5C" normalimage="file='cz_btn_n.png'" hotimage="file='cz_btn_h.png'" pushedimage="file='cz_btn_p.png'"/>
+					<Button name="diandan_page_chengzhong_qupi" visible="false" float="true" pos="328,41,376,68" text="去皮" font="12" textcolor="#FF2E9B5C" normalimage="file='cz_btn_n.png'" hotimage="file='cz_btn_h.png'" pushedimage="file='cz_btn_p.png'"/>
 				</HorizontalLayout>
-				
-				<Control height="1" bkcolor="#FFEBE8E8"></Control>
-				
-				<HorizontalLayout>				
-					<HorizontalLayout width="490" bkcolor="#FFFFFFFF">					
-						<VerticalLayout width="380" padding="0,0,0,0">					
-							<HorizontalLayout height="60">
-								<Control bkimage="member_login.png" width="32" height="32" padding="10,14,0,0"></Control>
-								
-								<Button name="btn_diandan_member_login" align="left" text="会员登录" height="38" width="135" padding="10,12,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							
-								<VerticalLayout name="diandan_page_member_info" width="135" padding="10,5,10,5" visible="false">
-									<Label name="diandan_page_member_name" height="20" padding="0,0,0,0"></Label>
-									<HorizontalLayout padding="0,5,0,0">
-										<Button name="diandan_page_member_info_btn" text="信息" font="14" height="20" width="40" padding="0,0,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-										
-										<Button name="diandan_page_member_out_btn" text="退出" textcolor="#FFFF4500" font="14" height="20" width="40" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF4500" bkcolor="#FFFFFFFF"></Button>
-									</HorizontalLayout>
-								</VerticalLayout>
-								
-								<Control></Control>
-								<Button name="btn_diandan_canpaihao" text="人数" height="38" width="100" padding="0,10,0,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-								<Control width="1" bkcolor="#FFEBE8E8" padding="5,15,15,15"></Control>
-								<Control bkimage="order_delete.png" width="20" height="20" padding="0,20,0,0"></Control>
-								<Button name="btn_diandan_qingkong" text="清空" height="38" width="40" padding="0,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							</HorizontalLayout>
-							
-							<HorizontalLayout height="50" bkcolor="#FFF5F5F5">
-								<Control bkimage="beizhu_tishi.png" width="24" height="24" padding="10,13,0,0"></Control>
-								<Label name="diandan_page_label_zhengdanbeizhu" text="整单备注：" height="30" padding="10,10,10,10" textcolor="#FF8D8D8D"></Label>
-							</HorizontalLayout>
-													
-							<List name="list_diandan_cart" padding="0,0,0,0" itemlinecolor="#FF000000" itemvalign="vcenter" vscrollbar="true">
-								<ListHeader inset="10,0,0,0" height="42">
-									<ListHeaderItem text="商品" width="220" align="left" />
-									<ListHeaderItem text="数量" width="80" align="center" />
-									<ListHeaderItem text="金额" width="80" align="center" />
-								</ListHeader>
-							</List>
-							
-							<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
-								<Label name="diandan_page_youhui_tishi" text="已优惠10元" textcolor="#FFFF3838" padding="15,0,0,0" width="270" hegiht="40"></Label>
-								<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF60B177" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-							</HorizontalLayout>
-
-							<Control height="1" bkcolor="#FFEBE8E8"></Control>
-					
-							<VerticalLayout height="125" bkcolor="#FFFFFFFF">
-								<HorizontalLayout height="50">
-									<Label name="diandan_page_otherprice" text="" width="200" align="left" padding="15,14,0,0" wordbreak="true" endellipsis="true"></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="55" name="diandan_pay_layout">
-									<Button name="btn_diandan_pay" text="结账" height="55" width="175" padding="10,0,0,0" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"></Button>
-									
-									<Button name="btn_diandan_xiadan" text="下单" height="55" width="175" padding="10,0,0,0" textcolor="#FFFFFFFF" normalimage="file='btn_red_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_red_dianji.png' corner='5,5,5,5'"></Button>
-								</HorizontalLayout>
-								
-								<HorizontalLayout height="55" name="jiesuan_pay_layout" visible="false">
-									<Button name="btn_diandan_jixujiacai" text="加菜" height="55" padding="20,0,20,0" textcolor="#FFFFFFFF"></Button>							
-								</HorizontalLayout>
-							</VerticalLayout>
+			<!-- 会员区块：独立卡片浮在灰底上（未登录白卡可点 / 登录浅绿卡） -->
+				<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'">
+	
+					<!-- 餐牌号 / 清空 药丸行 -->
+					<HorizontalLayout name="diandan_member_row" height="60" inset="14,8,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" textpadding="35,0,0,0" align="left" valign="center" 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"/>
 						</VerticalLayout>
-						
-						<Control width="1" bkcolor="#FFEBE8E8"></Control>
-						
-						<VerticalLayout width="110" padding="0,0,0,0" vscrollbar="true">
-							<Button name="btn_diandan_tuicai" width="90" height="40" padding="10,30,10,0" text="退菜" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-						
-							<Button name="btn_diandan_jia" width="90" height="40" padding="10,30,10,0" text="+" font="24" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							<Button name="btn_diandan_jian" width="90" height="40" padding="10,10,10,0" text="-" font="24" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							<Button name="btn_diandan_shanchu" width="90" height="40" padding="10,10,10,0" text="删除" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							<Button name="btn_diandan_guige" width="90" height="40" padding="10,10,10,0" text="规格/做法" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							
-							<Button name="btn_diandan_dabao" width="90" height="40" padding="10,10,10,0" text="打包" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							
-							<Button name="btn_diandan_zhengdanbeizhu" width="90" height="40" padding="10,10,10,0" text="整单备注" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							
-							<Button name="btn_diandan_chetai" width="90" height="40" padding="10,10,10,0" text="撤台" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							<Button name="btn_diandan_huantai" width="90" height="40" padding="10,10,10,0" text="换台" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-
-							<Button name="btn_diandan_yulandan" width="90" height="40" padding="10,10,10,0" text="打印预览单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							<!--
-							<Button name="btn_diandan_qianxiang" width="90" height="40" padding="10,15,10,0" text="打开钱箱" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							-->
+						<Control></Control>
+						<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>
-					
-					<Control width="1" bkcolor="#FFEBE8E8"></Control>
-					
-					<VerticalLayout name="diandan_food_layout">
-						<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
-							<HorizontalLayout name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-
-							</HorizontalLayout>
-						</VerticalLayout>
-						
-						<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
-						
-						</TileLayout>
-						
-						<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-							<Edit name="diandan_food_search_edit" tooltip="请输入商品名字或条码搜索" width="380" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
-							
-							<Label name="diandan_food_search_tishi" text="请输入商品名字或条码搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
-							
-							<Control bkimage="search_icon.png" width="25" height="26" pos="45,23,70,49" float="true"></Control>
-							
-							<Button name="diandan_food_search_clear" visible="false" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png" width="23" height="23" pos="365,23,68,46" float="true"></Button>
-						</HorizontalLayout>
+
+					<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>
+					</List>
+					<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>
+					<!-- 实线分隔：商品明细 / 优惠（与列表头下方同款 #FFF0F1F3） -->
+					<Control height="1" width="388" padding="1,0,0,0" bkcolor="#FFF0F1F3"/>
+
+					<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="30" 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="30" 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="46" inset="10,0,14,0">
+						<Label name="diandan_page_otherprice" text="" height="46" font="13" textcolor="#FF1F2329" align="left" valign="center" showhtml="true"/>
+						<Label name="diandan_page_totalprice" text="总价：{f 124}<c #E14B4A>¥0.00</c>" height="46" font="15" textcolor="#FF1F2329" align="right" valign="center" showhtml="true"/>
+					</HorizontalLayout>
+
+				</VerticalLayout>
+				<!-- 正餐底部按钮：加菜态 结账/下单；结账态 加菜 -->
+				<HorizontalLayout name="diandan_pay_layout" height="54" inset="0,0,0,0" childpadding="12">
+					<VerticalLayout width="184" height="54">
+						<Button name="btn_diandan_pay" text="" width="184" height="54" 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'"/>
+						<Control bkimage="dc_ico_cash.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+						<Label text="结账" font="15" textcolor="#FFFFFFFF" float="true" pos="46,0,184,54" align="left" valign="center" mouse="false"/>
 					</VerticalLayout>
-					
-					<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false">
-						<VerticalLayout name="diandan_jiesuan_youhui_layout" width="330">
-							<HorizontalLayout height="58">
-								<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="20"></Label>
-								<Control></Control>
-								<Button name="diandan_jiesuan_yincangyouhui_btn" text="隐藏优惠" height="36" width="90" padding="0,11,10,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-							</HorizontalLayout>	
-							
-							<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
-							
-							<HorizontalLayout padding="0,15,0,0" height="48">
-								<Label text="整单折扣：" width="90" height="48" padding="20,0,0,0"></Label>
-								<Button name="diandan_jiesuan_zhekou_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-								<Label text="%" width="60" height="48" padding="20,0,0,0"></Label>
-							</HorizontalLayout>
-							
-							<HorizontalLayout padding="0,15,0,0" height="48">
-								<Label text="加价：" width="90" height="48" padding="20,0,0,0"></Label>
-								<Button name="diandan_jiesuan_jiajia_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-								<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
-							</HorizontalLayout>
-							
-							<HorizontalLayout padding="0,15,0,0" height="48">
-								<Label text="优惠：" width="90" height="48" padding="20,0,0,0"></Label>
-								<Button name="diandan_jiesuan_youhui_value" text="" height="48" width="160" padding="0,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF"></Button>
-								<Label text="元" width="60" height="48" padding="20,0,0,0"></Label>
-							</HorizontalLayout>
-							
-							<HorizontalLayout padding="0,15,0,0" height="48">
-								<Label text="优惠券：" width="90" height="48" padding="20,0,0,0"></Label>
-								<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-								<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-								<Button name="diandan_jiesuan_youhuiquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-							</HorizontalLayout>
-							
-							<HorizontalLayout padding="0,15,0,0" height="48">
-								<Label text="商品券：" width="90" height="48" padding="20,0,0,0"></Label>
-								<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-								<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-								<Button name="diandan_jiesuan_shangpinquan_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-							</HorizontalLayout>
-							
-							<HorizontalLayout padding="0,15,0,0" height="48">
-								<Label text="次卡：" width="90" height="48" padding="20,0,0,0"></Label>
-								<Label name="diandan_jiesuan_cika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-								<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-								<Button name="diandan_jiesuan_cika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-							</HorizontalLayout>
-							
-							<HorizontalLayout padding="0,15,0,0" height="48">
-								<Label text="权益卡：" width="90" height="48" padding="20,0,0,0"></Label>
-								<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-								<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="35" width="90" padding="0,6,0,0" textcolor="#FF41A846" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FF41A846" bkcolor="#FFFFFFFF"></Button>
-								<Button name="diandan_jiesuan_quanyika_btn_cancel" visible="false" text="取消使用" height="35" width="90" padding="15,6,0,0" textcolor="#FFFF6666" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFFF6666" bkcolor="#FFFFFFFF"></Button>
-							</HorizontalLayout>
-							
-							<HorizontalLayout padding="0,15,0,0" height="130">
-								<Label text="抹零：" width="90" height="48" padding="20,0,0,0"></Label>
-								<VerticalLayout padding="0,10,0,0">
-									<HorizontalLayout padding="0,0,30,0" width="200" height="30">
-										<CheckBox name="diandan_jiesuan_moling_bumoling" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-										<Label name="" text="不抹零" width="150" height="30" padding="15,0,0,0"/>
-									</HorizontalLayout>
-									
-									<HorizontalLayout padding="0,0,30,0" width="200" height="30">
-										<CheckBox name="diandan_jiesuan_moling_molingdaojiao" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-										<Label name="" text="抹零到角" width="150" height="30" padding="15,0,0,0"/>
-									</HorizontalLayout>
-									
-									<HorizontalLayout padding="0,0,30,0" width="200" height="30">
-										<CheckBox name="diandan_jiesuan_moling_molingdaoyuan" group="diandan_jiesuan_moling" padding="0,7,0,7" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-										<Label name="" text="抹零到元" width="150" height="30" padding="15,0,0,0"/>
-									</HorizontalLayout>
-								</VerticalLayout>
-							</HorizontalLayout>
-						</VerticalLayout>
-						
-						<Control name="diandan_jiesuan_youhui_line" width="1" bkcolor="#FFEBE8E8"></Control>
-						
-						<VerticalLayout name="diandan_page_jiesuan_zhangdan_layout" vscrollbar="true">
-							<HorizontalLayout height="58">
-								<Label text="账单明细" height="58" padding="20,0,0,0" font="20"></Label>
-								<Control></Control>
-								<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" 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>
-							
-							<VerticalLayout name="diandan_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
-							
-							</VerticalLayout>
-							
-							<Control height="1" bkcolor="#FFEBE8E8" padding="10,10,10,0"></Control>
-							
-							<HorizontalLayout height="50">
-								<Control></Control>
-								<Label name="diandan_jiesuan_total_yingshou" text="" width="150" height="50" align="right" padding="0,0,15,0"/>
-							</HorizontalLayout>
-							
-							<Label text="支付方式" width="100" height="58" padding="20,30,0,0" font="20"></Label>
-							
-							<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
-							
-							<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout">
-								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
-									<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
-									<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
-									<Label name="zhifu_name" text="微信支付/支付宝/云闪付" wordbreak="true" width="115" height="40" font="14" float="true" pos="2,35,117,75" textcolor="#FFFFFFFF" mouse="false"></Label>
-								</HorizontalLayout>
-								
-								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">
-									<Button name="diandan_jiesuan_zhifufangshi_huiyuan_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
-									<Control name="zhifu_icon" bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="50,10,76,30" mouse="false"></Control>
-									<Label name="zhifu_name" text="会员支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
-								</HorizontalLayout>
-								
-								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
-									<Button name="diandan_jiesuan_zhifufangshi_xianjin_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
-									<Control name="zhifu_icon" bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="50,10,71,34" mouse="false"></Control>
-									<Label name="zhifu_name" text="现金支付" width="180" height="35" font="14" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
-								</HorizontalLayout>
-								
-								<!--
-								<HorizontalLayout name="diandan_jiesuan_zhifufangshi_gouwuka" width="122" hegiht="80" float="true">
-									<Button name="diandan_jiesuan_zhifufangshi_gouwuka_btn" text="" height="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-									<Control name="zhifu_icon" bkimage="gouwuka_icon.png" width="34" height="28" float="true" pos="45,10,79,38" mouse="false"></Control>
-									<Label name="zhifu_name" text="购物卡" width="180" height="35" font="14" float="true" pos="38,35,218,70" mouse="false"></Label>
+					<VerticalLayout width="184" height="54">
+						<Button name="btn_diandan_xiadan" text="" width="184" height="54" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+						<Control bkimage="dc_ico_note_grn.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+						<Label text="下单" font="15" textcolor="#FF60B177" float="true" pos="46,0,184,54" align="left" valign="center" mouse="false"/>
+					</VerticalLayout>
+				</HorizontalLayout>
+
+				<HorizontalLayout name="jiesuan_pay_layout" height="54" inset="0,0,0,0" childpadding="12" visible="false">
+					<VerticalLayout width="388" height="54">
+						<Button name="btn_diandan_jixujiacai" text="" width="388" height="54" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+						<!-- v92p: 图标+文字整体水平居中。内容宽=24(icon)+6(gap)+30(加菜≈15px×2)=60，居中起点=(388-60)/2=164 -->
+						<Control bkimage="dc_ico_add_grn.png" width="24" height="24" float="true" pos="164,15,188,39" mouse="false"/>
+						<Label text="加菜" font="15" textcolor="#FF60B177" float="true" pos="194,0,388,54" align="left" valign="center" mouse="false"/>
+					</VerticalLayout>
+				</HorizontalLayout>
+				<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>
+			<!-- ============ 中：操作条 110（diandan_page 布局，C++ 控制 wrapper 显隐） ============ -->
+
+			<VerticalLayout width="56" childpadding="7">
+
+				<!-- 退菜 -->
+				<VerticalLayout name="btn_diandan_tuicai_layout" width="56" height="56">
+					<Button name="btn_diandan_tuicai" 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_tuicai.png'" mouse="false"/>
+					<Label text="退菜" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+				</VerticalLayout>
+				<!-- 添加数量 -->
+				<VerticalLayout name="btn_diandan_jia_layout" width="56" height="56">
+					<Button name="btn_diandan_jia" 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_add_grn.png'" mouse="false"/>
+				</VerticalLayout>
+				<!-- 减少数量 -->
+				<VerticalLayout name="btn_diandan_jian_layout" 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 name="btn_diandan_shanchu_layout" 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 name="btn_diandan_guige_layout" 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 name="btn_diandan_dabao_layout" 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 name="btn_diandan_zhengdanbeizhu_layout" 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 name="btn_diandan_chetai_layout" width="56" height="56">
+					<Button name="btn_diandan_chetai" 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_chetai.png'" mouse="false"/>
+					<Label text="撤台" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+				</VerticalLayout>
+				<!-- 换台 -->
+				<VerticalLayout name="btn_diandan_huantai_layout" width="56" height="56">
+					<Button name="btn_diandan_huantai" 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_huantai.png'" mouse="false"/>
+					<Label text="换台" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+				</VerticalLayout>
+				<!-- 打印预览 -->
+				<VerticalLayout name="btn_diandan_yulandan_layout" width="56" height="56">
+					<Button name="btn_diandan_yulandan" 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_print.png'" mouse="false"/>
+					<Label text="打印预览" float="true" pos="0,29,56,49" font="12" textcolor="#FF5F6368" align="center" valign="center" mouse="false"/>
+				</VerticalLayout>
+				<!-- 打开钱箱 -->
+				<VerticalLayout name="btn_diandan_qianxiang_layout" width="56" height="56" visible="false">
+					<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>
+			</VerticalLayout>
+
+
+			<!-- ============ 右：分类 + 商品网格 + 搜索（自适应 800） ============ -->
+			<VerticalLayout name="diandan_food_layout" childpadding="12">
+				<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
+					<Container name="diandan_fenlei_layout">
+					</Container>
+				</VerticalLayout>
+
+				<TileLayout name="diandan_foodlist" bkcolor="#00000000" vscrollbar="true" hscrollbar="false" childpadding="10">
+				</TileLayout>
+
+				<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>
+			</VerticalLayout>
+
+			<!-- ============ 结算面板（默认隐藏，内部保持原样） ============ -->
+			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFF5F7FA" childpadding="12" visible="false">
+				<VerticalLayout name="diandan_jiesuan_youhui_layout" width="330" bkimage="file='card_r10.png' corner='10,10,10,10'">
+					<HorizontalLayout height="48" inset="18,0,18,0" childvalign="vcenter">
+						<Label text="选择优惠" width="120" height="48" font="16" textcolor="#FF1F2329" valign="center"/>
+						<Control></Control>
+						<Button name="diandan_jiesuan_yincangyouhui_btn" text="隐藏优惠" height="30" maxheight="30" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+					</HorizontalLayout>
+
+
+					<VerticalLayout inset="18,12,18,12" childpadding="9">
+						<HorizontalLayout height="36" childpadding="8" childvalign="vcenter">
+							<Label text="整单折扣：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+							<Button name="diandan_jiesuan_zhekou_value" text="100" height="32" maxheight="32" width="128" maxwidth="128" font="13" textcolor="#FF1F2329" normalimage="file='input_r8_n.png' corner='8,8,8,8'" hotimage="file='input_r8_h.png' corner='8,8,8,8'" pushedimage="file='input_r8_p.png' corner='8,8,8,8'"/>
+							<Label text="%" width="40" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+						</HorizontalLayout>
+
+						<HorizontalLayout height="36" childpadding="8" childvalign="vcenter">
+							<Label text="加价：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+							<Button name="diandan_jiesuan_jiajia_value" text="0" height="32" maxheight="32" width="128" maxwidth="128" font="13" textcolor="#FF1F2329" normalimage="file='input_r8_n.png' corner='8,8,8,8'" hotimage="file='input_r8_h.png' corner='8,8,8,8'" pushedimage="file='input_r8_p.png' corner='8,8,8,8'"/>
+							<Label text="元" width="40" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+						</HorizontalLayout>
+
+						<HorizontalLayout height="36" childpadding="8" childvalign="vcenter">
+							<Label text="优惠：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+							<Button name="diandan_jiesuan_youhui_value" text="0" height="32" maxheight="32" width="128" maxwidth="128" font="13" textcolor="#FF1F2329" normalimage="file='input_r8_n.png' corner='8,8,8,8'" hotimage="file='input_r8_h.png' corner='8,8,8,8'" pushedimage="file='input_r8_p.png' corner='8,8,8,8'"/>
+							<Label text="元" width="40" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+						</HorizontalLayout>
+
+						<HorizontalLayout height="36" childpadding="8" childvalign="vcenter">
+							<Label text="优惠券：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+							<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_youhuiquan_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
+						</HorizontalLayout>
+
+						<HorizontalLayout height="36" childpadding="8" childvalign="vcenter">
+							<Label text="商品券：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+							<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_shangpinquan_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
+						</HorizontalLayout>
+
+						<HorizontalLayout height="36" childpadding="8" childvalign="vcenter">
+							<Label text="次卡：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+							<Label name="diandan_jiesuan_cika_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_cika_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
+						</HorizontalLayout>
+
+						<HorizontalLayout height="36" childpadding="8" childvalign="vcenter">
+							<Label text="权益卡：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
+							<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_quanyika_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
+						</HorizontalLayout>
+
+						<HorizontalLayout height="96" childpadding="8">
+							<Label text="抹零：" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368"/>
+							<VerticalLayout childpadding="8" padding="0,4,0,0">
+								<HorizontalLayout height="24" childpadding="8" childvalign="vcenter">
+									<CheckBox name="diandan_jiesuan_moling_bumoling" group="diandan_jiesuan_moling" width="13" height="13" maxheight="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="不抹零" width="120" height="24" font="13" textcolor="#FF5F6368" valign="center"/>
 								</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 height="24" childpadding="8" childvalign="vcenter">
+									<CheckBox name="diandan_jiesuan_moling_molingdaojiao" group="diandan_jiesuan_moling" width="13" height="13" maxheight="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="抹零到角" width="120" height="24" font="13" textcolor="#FF5F6368" valign="center"/>
 								</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 height="24" childpadding="8" childvalign="vcenter">
+									<CheckBox name="diandan_jiesuan_moling_molingdaoyuan" group="diandan_jiesuan_moling" width="13" height="13" maxheight="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="抹零到元" width="120" height="24" font="13" textcolor="#FF5F6368" valign="center"/>
 								</HorizontalLayout>
-							</HorizontalLayout>
-						</VerticalLayout>
+							</VerticalLayout>
+						</HorizontalLayout>
+					</VerticalLayout>
+				</VerticalLayout>
+
+
+				<VerticalLayout name="diandan_page_jiesuan_zhangdan_layout" vscrollbar="true" bkimage="file='card_r10.png' corner='10,10,10,10'">
+					<HorizontalLayout height="48">
+						<Label text="账单明细" height="48" padding="18,0,0,0" font="16"/>
+						<Control></Control>
+						<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" visible="false" height="30" maxheight="30" width="80" padding="0,11,18,0" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
 					</HorizontalLayout>
-				</HorizontalLayout>
-			</VerticalLayout>
+
+
+					<VerticalLayout name="diandan_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
+					</VerticalLayout>
+
+					<Control height="1" bkcolor="#FFF0F1F3" padding="10,10,10,0"/>
+
+					<HorizontalLayout height="50">
+						<Control></Control>
+						<Label name="diandan_jiesuan_total_yingshou" text="" width="240" height="50" align="right" padding="0,0,18,0" showhtml="true" font="113"/>
+					</HorizontalLayout>
+
+					<Label text="支付方式" width="120" height="48" padding="18,18,0,0" font="16"/>
+
+
+					<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout">
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" height="54" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" width="120" height="54" maxheight="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 name="zhifu_icon" bkimage="dc_ico_scan.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+							<Label name="zhifu_name" text="扫码支付" font="13" textcolor="#FFFFFFFF" float="true" pos="46,0,116,54" align="left" valign="center" endellipsis="true" mouse="false"/>
+						</HorizontalLayout>
+
+<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" height="54" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_huiyuan_btn" text="" width="120" height="54" maxheight="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 name="zhifu_icon" bkimage="dc_ico_card.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+							<Label name="zhifu_name" text="会员支付" font="13" textcolor="#FFFFFFFF" float="true" pos="46,0,116,54" align="left" valign="center" endellipsis="true" mouse="false"/>
+						</HorizontalLayout>
+
+<HorizontalLayout name="diandan_jiesuan_zhifufangshi_xianjin" width="120" height="54" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_xianjin_btn" text="" width="120" height="54" maxheight="54" normalimage="file='pay_cash_n.png' corner='8,8,8,8'" hotimage="file='pay_cash_h.png' corner='8,8,8,8'" pushedimage="file='pay_cash_p.png' corner='8,8,8,8'"/>
+							<Control name="zhifu_icon" bkimage="dc_ico_cash.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+							<Label name="zhifu_name" text="现金支付" font="13" textcolor="#FFFFFFFF" float="true" pos="46,0,116,54" align="left" valign="center" endellipsis="true" mouse="false"/>
+						</HorizontalLayout>
+
+<HorizontalLayout name="diandan_jiesuan_zhifufangshi_fulika" width="120" height="54" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_fulika_btn" text="" width="120" height="54" maxheight="54" normalimage="file='pay_fuli_n.png' corner='8,8,8,8'" hotimage="file='pay_fuli_h.png' corner='8,8,8,8'" pushedimage="file='pay_fuli_p.png' corner='8,8,8,8'"/>
+							<Control name="zhifu_icon" bkimage="dc_ico_fuli.png" width="24" height="24" float="true" pos="16,15,40,39" mouse="false"/>
+							<Label name="zhifu_name" text="福利卡" font="13" textcolor="#FFFFFFFF" float="true" pos="46,0,116,54" align="left" valign="center" endellipsis="true" mouse="false"/>
+						</HorizontalLayout>
+					</HorizontalLayout>
+				</VerticalLayout>
+			</HorizontalLayout>
 		</HorizontalLayout>
-		
-		<HorizontalLayout name="loading">
+	</VerticalLayout>
+</HorizontalLayout>
+	<HorizontalLayout name="loading">
+		<Control></Control>
+		<VerticalLayout width="24">
 			<Control></Control>
-			<VerticalLayout width="24">
-				<Control></Control>
-				<HorizontalLayout height="24">
-					<GifAnim bkimage="loading.gif" autosize="true"></GifAnim>
-				</HorizontalLayout>
-				<Control></Control>
-			</VerticalLayout>
+			<HorizontalLayout height="24">
+				<GifAnim bkimage="loading.gif" autosize="true"></GifAnim>
+			</HorizontalLayout>
 			<Control></Control>
-		</HorizontalLayout>
-	</ZhengcanDiandanPage>
-</Window>
+		</VerticalLayout>
+		<Control></Control>
+	</HorizontalLayout>
+</ZhengcanDiandanPage>
+</Window>

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -24,6 +24,7 @@
 #include "../wnd/CZhengcanRenshuWnd.h"
 #include "../wnd/CNumInputWnd.h"
 #include "../wnd/CHuiyuanInfoShowWnd.h"
+#include "../wnd/CHuiyuanChongzhiWnd.h"
 
 #include "../print/CPosPrinter.h"
 
@@ -322,11 +323,11 @@ void CZhengcanDiandanPageUI::UpdateFoodtypePos()
 	}
 
 	//根据宽度计算每行显示的数量
-	int nMeihangNum = (nWidth - 491) / 140;
+	int nMeihangNum = (nWidth - 482) / 138;
 
 	int num = 0;
 
-	CHorizontalLayoutUI* pFenleiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_fenlei_layout")));
+	CContainerUI* pFenleiLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("diandan_fenlei_layout")));
 	for (int i = 0; i < nFoodtypeNum; i++)
 	{
 		CButtonUI* curItem = static_cast<CButtonUI*>(pFenleiLayout->GetItemAt(i));
@@ -335,10 +336,10 @@ void CZhengcanDiandanPageUI::UpdateFoodtypePos()
 		int curCol = num % nMeihangNum + 1;
 
 		RECT rect;
-		rect.left = (curCol - 1) * 140 + 10;
+		rect.left = (curCol - 1) * 138;
 		rect.right = rect.left + 130;
-		rect.top = (curRow - 1) * 52 + 10;
-		rect.bottom = rect.top + 42;
+		rect.top = (curRow - 1) * 46 + 8;
+		rect.bottom = rect.top + 38;
 
 		// 强制设置固定大小和位置
 		SIZE size;
@@ -354,7 +355,7 @@ void CZhengcanDiandanPageUI::UpdateFoodtypePos()
 
 	//调整区域高度
 	int lastRow = (num - 1) / nMeihangNum + 1;
-	pFenleiLayout->SetFixedHeight(lastRow * 52 + 10);
+	pFenleiLayout->SetFixedHeight(lastRow * 46 + 8);
 
 	//处理滚动条问题
 	CVerticalLayoutUI* pFenleiScrollLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_fenlei_layout_scrolllayout")));
@@ -363,7 +364,7 @@ void CZhengcanDiandanPageUI::UpdateFoodtypePos()
 		lastRow = 2;
 	}
 
-	pFenleiScrollLayout->SetFixedHeight(lastRow * 52 + 10);
+	pFenleiScrollLayout->SetFixedHeight(lastRow * 46 + 8);
 
 	SIZE size;
 	size.cx = 0;
@@ -383,8 +384,8 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 	if (setting_xianshi_is_youtu == "1")
 	{
 		SIZE itemsize;
-		itemsize.cx = 130;
-		itemsize.cy = 200;
+		itemsize.cx = 148;
+		itemsize.cy = 172;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_youtu.xml");
@@ -392,8 +393,8 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 	else if (setting_xianshi_is_youtu == "2")
 	{
 		SIZE itemsize;
-		itemsize.cx = 230;
-		itemsize.cy = 90;
+		itemsize.cx = 250;
+		itemsize.cy = 82;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_youtu_2.xml");
@@ -401,8 +402,8 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 	else if (setting_xianshi_is_youtu == "3")
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 120;
+		itemsize.cx = 148;
+		itemsize.cy = 150;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_youtu_3.xml");
@@ -410,8 +411,8 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 	else
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 100;
+		itemsize.cx = 148;
+		itemsize.cy = 96;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_wutu.xml");
@@ -691,12 +692,15 @@ void CZhengcanDiandanPageUI::InitJiesuanZhifu()
 			CButtonUI* newButton = new CButtonUI();
 
 			newButton->SetFixedWidth(120);
-			newButton->SetFixedHeight(80);
+			newButton->SetFixedHeight(54);
 			newButton->SetText(CLewaimaiString::UTF8ToUnicode(selfpay.name).c_str());
 
-			newButton->SetBorderSize(1);
-			newButton->SetBorderColor(0xFFC1C1C1);
-			newButton->SetBkColor(0xFFF7F7F7);
+			//与固定支付方式统一：白色圆角按钮（pay_more 三态图），文字深灰
+			newButton->SetAttribute(L"normalimage", L"file='pay_more_n.png' corner='8,8,8,8'");
+			newButton->SetAttribute(L"hotimage", L"file='pay_more_h.png' corner='8,8,8,8'");
+			newButton->SetAttribute(L"pushedimage", L"file='pay_more_p.png' corner='8,8,8,8'");
+			newButton->SetAttribute(L"textcolor", L"#FF5F6368");
+			newButton->SetAttribute(L"font", L"13");
 
 			//设置定义属性，在点击按钮的时候好区分
 			newButton->SetAttribute(L"name", L"diandan_jiesuan_zhifufangshi_zidingyi_btn");
@@ -725,11 +729,11 @@ void CZhengcanDiandanPageUI::UpdateJiesuanZhifuPos()
 	int nZhangdanWidth;
 	if (m_is_yincangyouhui == true)
 	{
-		nZhangdanWidth = nWidth - 491 - 5;
+		nZhangdanWidth = nWidth - 481 - 13;				// 隐藏优惠后只剩账单卡；13=右侧 inset12 + 余量1
 	}
 	else
 	{
-		nZhangdanWidth = nWidth - 491 - 331 - 5;
+		nZhangdanWidth = nWidth - 481 - 330 - 12 - 13;	// 优惠卡330 + 卡间距12；13=右侧 inset12 + 余量1
 	}
 
 	if (nZhangdanWidth < 300)
@@ -740,7 +744,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanZhifuPos()
 	pZhangdanLayout->SetFixedWidth(nZhangdanWidth);
 
 	//根据宽度计算每行显示的数量
-	int nMeihangNum = (nZhangdanWidth) / 144;
+	int nMeihangNum = (nZhangdanWidth) / 132;
 	if (nMeihangNum < 1)
 	{
 		nMeihangNum = 1;
@@ -757,10 +761,10 @@ void CZhengcanDiandanPageUI::UpdateJiesuanZhifuPos()
 		int curCol = num % nMeihangNum + 1;
 
 		RECT rect;
-		rect.left = (curCol - 1) * 140 + 20;
+		rect.left = (curCol - 1) * 132 + 20;
 		rect.right = rect.left + 120;
-		rect.top = (curRow - 1) * 100 + 20;
-		rect.bottom = rect.top + 80;
+		rect.top = (curRow - 1) * 64 + 6;
+		rect.bottom = rect.top + 54;
 
 		// 强制设置固定大小和位置
 		SIZE size;
@@ -776,7 +780,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanZhifuPos()
 
 	//调整区域高度
 	int lastRow = (num - 1) / nMeihangNum + 1;
-	pZhifufangshiLayout->SetFixedHeight(lastRow * 105);
+	pZhifufangshiLayout->SetFixedHeight((lastRow - 1) * 64 + 60);
 }
 
 //展示结算页面，隐藏选购页面
@@ -799,29 +803,29 @@ void CZhengcanDiandanPageUI::ShowJiesuanPage()
 	pJiesuanPayLayout->SetVisible(true);
 
 	//处理一些按钮的显示与隐藏
-	CButtonUI* jiaBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_jia"));
-	jiaBtn->SetVisible(false);
+	CVerticalLayoutUI* jiaLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_jia_layout"));
+	jiaLayout->SetVisible(false);
 
-	CButtonUI* jianBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_jian"));
-	jianBtn->SetVisible(false);
+	CVerticalLayoutUI* jianLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_jian_layout"));
+	jianLayout->SetVisible(false);
 
-	CButtonUI* shanchuBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_shanchu"));
-	shanchuBtn->SetVisible(false);
+	CVerticalLayoutUI* shanchuLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_shanchu_layout"));
+	shanchuLayout->SetVisible(false);
 
-	CButtonUI* guigeBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_guige"));
-	guigeBtn->SetVisible(false);
+	CVerticalLayoutUI* guigeLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_guige_layout"));
+	guigeLayout->SetVisible(false);
 
-	CButtonUI* tuicaiBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_tuicai"));
-	tuicaiBtn->SetVisible(true);
+	CVerticalLayoutUI* tuicaiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_tuicai_layout"));
+	tuicaiLayout->SetVisible(true);
 
-	CButtonUI* dabaoBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_dabao"));
-	dabaoBtn->SetVisible(false);
+	CVerticalLayoutUI* dabaoLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_dabao_layout"));
+	dabaoLayout->SetVisible(false);
 
-	CButtonUI* chetaiBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_chetai"));
-	chetaiBtn->SetVisible(false);
+	CVerticalLayoutUI* chetaiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_chetai_layout"));
+	chetaiLayout->SetVisible(false);
 
-	CButtonUI* huantaiBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_huantai"));
-	huantaiBtn->SetVisible(true);
+	CVerticalLayoutUI* huantaiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_huantai_layout"));
+	huantaiLayout->SetVisible(true);
 
 	//把购物车的商品，进行展示处理
 	for (std::vector<CListContainerElementUI*>::iterator it = m_history_cart_item.begin(); it != m_history_cart_item.end(); it++)
@@ -864,37 +868,37 @@ void CZhengcanDiandanPageUI::ShowXuangouPage()
 	pJiesuanPayLayout->SetVisible(false);
 
 	//处理一些按钮的显示与隐藏
-	CButtonUI* jiaBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_jia"));
-	jiaBtn->SetVisible(true);
+	CVerticalLayoutUI* jiaLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_jia_layout"));
+	jiaLayout->SetVisible(true);
 
-	CButtonUI* jianBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_jian"));
-	jianBtn->SetVisible(true);
+	CVerticalLayoutUI* jianLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_jian_layout"));
+	jianLayout->SetVisible(true);
 
-	CButtonUI* shanchuBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_shanchu"));
-	shanchuBtn->SetVisible(true);
+	CVerticalLayoutUI* shanchuLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_shanchu_layout"));
+	shanchuLayout->SetVisible(true);
 
-	CButtonUI* guigeBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_guige"));
-	guigeBtn->SetVisible(true);
+	CVerticalLayoutUI* guigeLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_guige_layout"));
+	guigeLayout->SetVisible(true);
 
-	CButtonUI* tuicaiBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_tuicai"));
-	tuicaiBtn->SetVisible(false);
+	CVerticalLayoutUI* tuicaiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_tuicai_layout"));
+	tuicaiLayout->SetVisible(false);
 
-	CButtonUI* dabaoBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_dabao"));
-	dabaoBtn->SetVisible(true);
+	CVerticalLayoutUI* dabaoLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_dabao_layout"));
+	dabaoLayout->SetVisible(true);
 
-	CButtonUI* chetaiBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_chetai"));
+	CVerticalLayoutUI* chetaiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_chetai_layout"));
 	if (m_order_id == "0")
 	{
 		//还没下单，才显示撤台
-		chetaiBtn->SetVisible(true);
+		chetaiLayout->SetVisible(true);
 	}
 	else
 	{
-		chetaiBtn->SetVisible(false);
+		chetaiLayout->SetVisible(false);
 	}
 
-	CButtonUI* huantaiBtn = static_cast<CButtonUI*>(this->FindSubControl(L"btn_diandan_huantai"));
-	huantaiBtn->SetVisible(true);
+	CVerticalLayoutUI* huantaiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"btn_diandan_huantai_layout"));
+	huantaiLayout->SetVisible(true);
 
 	//把购物车的商品，进行展示处理
 	for (std::vector<CListContainerElementUI*>::iterator it = m_history_cart_item.begin(); it != m_history_cart_item.end(); it++)
@@ -914,6 +918,33 @@ void CZhengcanDiandanPageUI::ShowXuangouPage()
 	}
 }
 
+//刷新购物车选中项的商品名称颜色（选中绿色，其余恢复默认）
+void CZhengcanDiandanPageUI::RefreshCartItemSelectedColor()
+{
+	CListUI* pList = static_cast<CListUI*>(this->FindSubControl(_T("list_diandan_cart")));
+	if (pList == NULL)
+	{
+		return;
+	}
+
+	for (int i = 0; i < pList->GetCount(); i++)
+	{
+		CListContainerElementUI* pEle = static_cast<CListContainerElementUI*>(pList->GetItemAt(i));
+		if (pEle == NULL)
+		{
+			continue;
+		}
+
+		CLabelUI* pName = static_cast<CLabelUI*>(pEle->FindSubControl(_T("diandan_cart_item_name")));
+		if (pName == NULL)
+		{
+			continue;
+		}
+
+		pName->SetTextColor(pEle->IsSelected() ? 0xFF2E9B5C : 0xFF1F2329);
+	}
+}
+
 //处理按钮点击类事件
 void CZhengcanDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 {
@@ -923,6 +954,12 @@ void CZhengcanDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 	{
 		m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
 	}
+	else if (name == L"diandan_cart_item")
+	{
+		//购物车行被选中：选中行名字绿色，其余恢复黑色（底色由 List 的 itemselectedbkcolor 处理）
+		this->RefreshCartItemSelectedColor();
+		return;
+	}
 	else if (name == L"diandan_fooditem")
 	{
 		CDiandanFoodItemUI* fooditemUI = static_cast<CDiandanFoodItemUI*>(msg.pSender);
@@ -997,6 +1034,11 @@ void CZhengcanDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 		//点击会员登录
 		this->ClickMemberLogin();
 	}
+	else if (name == L"btn_diandan_member_chongzhi")
+	{
+		//点击会员充值
+		this->ClickMemberChongzhi();
+	}
 	else if (name == L"diandan_jiesuan_zhekou_value")
 	{
 		//点击整单折扣
@@ -1406,6 +1448,12 @@ void CZhengcanDiandanPageUI::UpdateShopcartShow(bool is_add_new)
 		CLabelUI* attention = new CLabelUI();
 		attention->SetText((L"-----------------------  第" + std::to_wstring(m_cur_diandan_order.m_order_history_array[i].xiadanNum + 1) + L"次下单 -----------------------").c_str());
 		attention->SetTextColor(0xFFBBBBBB);
+		// v92q：真根因——ListHeader::EstimateSize(UIList.cpp:1617) 把 float 分隔线 pos="0,33,388,34" 的 388 宽
+		// 也累加进表头估算宽：238+52+60+388=738。list body(UIList.cpp:1513) 按 MAX(cxNeeded=738, 可用宽)
+		// 给本 label 一个 738 宽矩形，align=center 的中心落到 369，超出可见区约 373 → 文字整体跑右边被裁。
+		// UIList.cpp:1515 是唯一按 GetMaxWidth 钳制超宽的地方 → SetMaxWidth(388) 钳回列表内容宽，
+		// label 恢复 388 宽、起点在列表左，align=center 中心=194 正中。（v92j 之前居中正常，因旧表头无该 float 线）
+		attention->SetMaxWidth(388);
 		attention->SetAttribute(L"align", L"center");
 
 		pList->Add(attention);
@@ -1504,6 +1552,9 @@ void CZhengcanDiandanPageUI::UpdateShopcartShow(bool is_add_new)
 
 	//更新结算信息
 	UpdateJiesuanInfo();
+
+	//刷新购物车选中项颜色
+	RefreshCartItemSelectedColor();
 }
 
 void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
@@ -1821,21 +1872,21 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 	std::wstring otherPrice = L"";
 	if (m_dabao > 0)
 	{
-		std::wstring ws_dabaofei = L"打包费 " + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_dabao, 2)) + L" 元 ";
+		std::wstring ws_dabaofei = L"打包费： <b><c #E14B4A>" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_dabao, 2)) + L"</c></b> 元 ";
 		otherPrice += ws_dabaofei;
 	}
 
 	//开台费
 	if (m_kaitai > 0)
 	{
-		std::wstring ws_kaitaifei = L"开台费 " + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_kaitai, 2)) + L" 元 ";
+		std::wstring ws_kaitaifei = L"开台费： <b><c #E14B4A>" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_kaitai, 2)) + L"</c></b> 元 ";
 		otherPrice += ws_kaitaifei;
 	}
 
 	//茶位费
 	if (m_chawei > 0)
 	{
-		std::wstring ws_chaweifei = L"茶位费 " + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_chawei, 2)) + L" 元 ";
+		std::wstring ws_chaweifei = L"茶位费： <b><c #E14B4A>" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_chawei, 2)) + L"</c></b> 元 ";
 		otherPrice += ws_chaweifei;
 	}
 
@@ -1843,7 +1894,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 	//再刷新总价展示
 	CLabelUI* pTotalPrice = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_totalprice")));
-	pTotalPrice->SetText((L"总价：¥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(cur_price, 2))).c_str());
+	pTotalPrice->SetText((L"总价：{f 124}<c #E14B4A>¥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(cur_price, 2)) + L"</c>").c_str());
 
 	//再刷新账单明细展示
 	CVerticalLayoutUI* pmingxiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_zhangdanmingxi_jiage_layout")));
@@ -1881,6 +1932,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"商品券优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_shangpinquan_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1897,6 +1949,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"次卡优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_cika_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1913,6 +1966,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"商品会员价优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_total_member_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1929,6 +1983,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"整单折扣优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_zhekou_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1945,6 +2000,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"会员整单折扣优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_member_zhekou_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1961,6 +2017,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"权益卡优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_quanyika_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1977,6 +2034,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"满减优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_manjian_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1993,6 +2051,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"优惠券优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_youhuiquan_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -2009,6 +2068,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"人工优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_rengong_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -2025,6 +2085,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 		pName->SetText(L"抹零优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_moling_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -2097,7 +2158,7 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 	pmingxiLayout->SetFixedHeight(item_num * 40);
 
 	CLabelUI* pYingshou = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_total_yingshou")));
-	pYingshou->SetText((L"应收金额：" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(cur_price, 2)) + L"元").c_str());
+	pYingshou->SetText((L"应收金额：<f 117><c #3CB371>" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(cur_price, 2)) + L" 元</c>").c_str());
 
 	//同步更新副屏的显示内容
 	CShuangpingTool::GetInstance()->UpdateShow(m_cur_diandan_order, total_youhui, cur_price, m_dabao, m_kaitai, m_chawei);
@@ -2577,6 +2638,13 @@ void CZhengcanDiandanPageUI::ClickZhengdanMemo()
 			CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_label_zhengdanbeizhu")));
 			pLabel->SetText((L"整单备注：" + CLewaimaiString::UTF8ToUnicode(sMemo)).c_str());
 
+			//输入内容后才显示整单备注整行（无内容则保持隐藏）
+			CControlUI* pBeizhuLayout = this->FindSubControl(_T("diandan_page_zhengdanbeizhu_layout"));
+			if (pBeizhuLayout != NULL)
+			{
+				pBeizhuLayout->SetVisible(!sMemo.empty());
+			}
+
 			//保存备注，提交订单的时候用
 			m_cur_diandan_order.SetMemo(sMemo);
 
@@ -3004,9 +3072,15 @@ void CZhengcanDiandanPageUI::ClickMemberLogin()
 			std::wstring memberInfo = L"会员：" + CLewaimaiString::UTF8ToUnicode(m_member_name);
 			pMemberInfo->SetText(memberInfo.c_str());
 
+			CLabelUI* pMemberBalance = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_member_balance")));
+
+			pMemberBalance->SetText((L"¥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(atof(m_balance.c_str()), 2))).c_str());
+
+
 			CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
 			pMemberLoginBtn->SetVisible(false);
 
+			this->FindSubControl(_T("diandan_member_login_wrap"))->SetVisible(false);
 			this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(true);
 
 			this->UpdateJiesuanInfo();
@@ -3027,6 +3101,48 @@ void CZhengcanDiandanPageUI::ClickMemberLogin()
 	}
 }
 
+//处理会员充值（正餐页内直接充值，成功后按 旧余额+充值+赠送 口径刷新余额显示）
+void CZhengcanDiandanPageUI::ClickMemberChongzhi()
+{
+	if (m_is_show_modal_wnd == true)
+	{
+		return;
+	}
+
+	if (m_member_id == "")
+	{
+		return;
+	}
+
+	CHuiyuanChongzhiWnd* pChongzhiWnd = new CHuiyuanChongzhiWnd();
+	if (pChongzhiWnd != NULL)
+	{
+		m_is_show_modal_wnd = true;
+		m_curModalWnd = pChongzhiWnd;
+
+		pChongzhiWnd->Create(m_pManager->GetPaintWindow(), _T(""), UI_WNDSTYLE_DIALOG, WS_EX_TOOLWINDOW);
+		pChongzhiWnd->SetIcon(IDI_ICON_DUILIB);
+		pChongzhiWnd->CenterWindow();
+
+		pChongzhiWnd->SetCurBalance(m_balance);
+		pChongzhiWnd->m_member_id = m_member_id;
+		pChongzhiWnd->m_member_card_no = m_card_no;
+
+		UINT ret = pChongzhiWnd->ShowModal();
+		if (ret == IDOK)
+		{
+			//充值成功：本地计算新余额并刷新显示（与会员页同口径）
+			m_balance = CLewaimaiString::DoubleToString(atof(m_balance.c_str()) + atof(pChongzhiWnd->m_chongzhi.c_str()) + atof(pChongzhiWnd->m_zengsong.c_str()), 2);
+
+			CLabelUI* pMemberBalance = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_member_balance")));
+			pMemberBalance->SetText((L"¥" + CLewaimaiString::UTF8ToUnicode(m_balance)).c_str());
+		}
+
+		m_is_show_modal_wnd = false;
+		delete pChongzhiWnd;
+	}
+}
+
 //处理会员退出登陆
 void CZhengcanDiandanPageUI::ClickMemberLogout()
 {
@@ -3035,6 +3151,7 @@ void CZhengcanDiandanPageUI::ClickMemberLogout()
 	CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
 	pMemberLoginBtn->SetVisible(true);
 
+	this->FindSubControl(_T("diandan_member_login_wrap"))->SetVisible(true);
 	this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(false);
 
 	this->UpdateJiesuanInfo();

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.h

@@ -75,6 +75,9 @@ public:
 	//对订单做了任何改变之后，刷新购物车显示
 	void UpdateShopcartShow(bool is_add_new = false);
 
+	//刷新购物车选中项的商品名称颜色（选中绿色，其余恢复默认）
+	void RefreshCartItemSelectedColor();
+
 	//任何可以引起价格变化的，比如添加、修改、删除商品，或者修改优惠等，需要重新计算总价格，刷新结算账单等地方的显示，都要调用这个方法
 	void UpdateJiesuanInfo();
 
@@ -123,6 +126,9 @@ public:
 	//处理会员登录
 	void ClickMemberLogin();
 
+	//处理会员充值
+	void ClickMemberChongzhi();
+
 	//处理会员退出登陆
 	void ClickMemberLogout();