扫码收银优化好了

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

@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Window>
+	<!-- 账单明细行：name 左对齐自适应，value 右对齐固定宽；窄卡（扫码收银页）由 C++ 按可用宽重设 -->
 	<HorizontalLayout padding="0,8,0,0">
-		<Label name="name" text="" height="24" width="130" align="left" font="13" textcolor="#FF1F2329"/>
+		<Label name="name" text="" height="24" width="130" align="left" font="13" textcolor="#FF1F2329" endellipsis="true"/>
 		<Control></Control>
 		<Label name="value" text="" height="24" width="160" align="right" font="113" textcolor="#FF1F2329"/>
 	</HorizontalLayout>
-</Window>
+</Window>

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

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<Window> 
-	<ListContainerElement name="saomashouyin_cart_item" width="610" height="42">
-		<Label name="saomashouyin_cart_item_xuhao" width="50" height="42" align="center"/> 
+<Window>
+	<!-- 购物车行：根 inset 10 与 ListHeader 对齐，序号32 + 商品202 + 条码140 + 单价68 + 数量30 + 小计62（总和 534 <= 534） -->
+	<ListContainerElement name="saomashouyin_cart_item" height="42" inset="10,0,10,0">
+		<Label name="saomashouyin_cart_item_xuhao" width="32" height="42" align="center" valign="vcenter"/>
 
-		<VerticalLayout width="200" height="84">
-			<Label name="saomashouyin_cart_item_name" width="200" height="42" align="center" valign="vcenter" padding="0,0,0,0"  endellipsis="true"/>
+		<VerticalLayout width="202" height="84">
+			<Label name="saomashouyin_cart_item_name" width="202" height="42" align="center" valign="vcenter" endellipsis="true"/>
 
-			<Label name="saomashouyin_cart_item_nature" width="200" height="42" align="center" padding="0,0,10,0" textcolor="#FF808080" visiable="false" wordbreak="true" endellipsis="true" />
+			<Label name="saomashouyin_cart_item_nature" width="202" height="42" align="center" padding="0,0,10,0" textcolor="#FF8A9099" visible="false" wordbreak="true" endellipsis="true"/>
 		</VerticalLayout>
-		
-		<Label name="saomashouyin_cart_item_tiaoma" width="150" height="42" align="center"/> 
 
-		<Label name="saomashouyin_cart_item_danjia" width="80" height="42" align="center"/> 
-		<Label name="saomashouyin_cart_item_num" width="50" height="42" align="center"/> 
-		<Label name="saomashouyin_cart_item_price" width="80" height="42" align="center"/>
-	</ListContainerElement> 
+		<Label name="saomashouyin_cart_item_tiaoma" width="140" height="42" align="center" valign="vcenter" endellipsis="true"/>
+
+		<Label name="saomashouyin_cart_item_danjia" width="68" height="42" align="center" valign="vcenter" endellipsis="true"/>
+		<Label name="saomashouyin_cart_item_num" width="30" height="42" align="center" valign="vcenter"/>
+		<Label name="saomashouyin_cart_item_price" width="62" height="42" align="center" valign="vcenter" endellipsis="true"/>
+	</ListContainerElement>
 </Window>

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

@@ -2,239 +2,266 @@
 <Window>
 
 	<SaomashouyinPage>
-		<HorizontalLayout>
-			<Control width="1" bkcolor="#FFD1D1D1"></Control>
-
-			<HorizontalLayout width="610" bkcolor="#FFFFFFFF">					
-				<VerticalLayout padding="0,0,0,0">
-					<Control height="1" bkcolor="#FFEBE8E8"></Control>
-
-					<HorizontalLayout name="btn_saomashouyin_qingkong" height="60">
-						<Control bkimage="member_login.png" width="32" height="32" padding="10,14,0,0"></Control>
-						
-						<Button name="btn_saomashouyin_member_login" align="left" text="会员登录" height="38" width="135" padding="10,12,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
-						
-						<VerticalLayout name="saomashouyin_page_member_info" width="135" padding="10,5,10,5" visible="false">
-							<Label name="saomashouyin_page_member_name" height="20" padding="0,0,0,0"></Label>
-							<HorizontalLayout padding="0,5,0,0">
-								<Button name="saomashouyin_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="saomashouyin_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 bkcolor="#FFF5F7FA" inset="12,12,12,12" childpadding="12">
+
+			<!-- ============ 左：购物车 556（白卡 radius 10，灰底浮卡，同点单页） ============ -->
+			<VerticalLayout width="556" bkcolor="#00000000" childpadding="12">
+				<!-- 会员区块：未登录白卡可点 / 登录浅绿卡 -->
+				<HorizontalLayout height="66" name="saomashouyin_member_login_wrap">
+					<VerticalLayout>
+						<Button name="btn_saomashouyin_member_login" text="" tooltip="点击登录会员" width="556" height="66" float="true" pos="0,0,556,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="538,17,554,49" align="center" mouse="false"/>
+					</VerticalLayout>
+				</HorizontalLayout>
+				<VerticalLayout name="saomashouyin_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="saomashouyin_page_member_name" text="" font="115" textcolor="#FF1F2329" autocalcwidth="true" maxwidth="120" endellipsis="true"/>
+							<Button name="saomashouyin_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="saomashouyin_page_member_balance" text="" font="114" textcolor="#FFF5623D"/>
+						</HorizontalLayout>
+					</VerticalLayout>
+					<HorizontalLayout float="true" pos="450,20,546,46" childpadding="8">
+						<Button name="btn_saomashouyin_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="saomashouyin_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="saomashouyin_member_row" height="60" inset="14,8,14,0" childpadding="8" childvalign="vcenter">
 						<Control></Control>
-						<Control width="100"></Control>
-						<Control bkimage="order_delete.png" width="20" height="20" padding="0,20,0,0"></Control>
-						<Button name="btn_saomashouyin_qingkong" text="清空" height="38" width="40" padding="0,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+						<VerticalLayout width="76" height="32">
+							<Button name="btn_saomashouyin_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 height="1" bkcolor="#FFEBE8E8"></Control>
-											
-					<List name="list_saomashouyin_cart" padding="0,0,0,0" itemlinecolor="#FF000000" itemvalign="vcenter" vscrollbar="true">
-						<ListHeader inset="0,0,0,0" height="42">
-							<ListHeaderItem text="序号" width="50" align="center" />
-							<ListHeaderItem text="商品" width="200" align="center" />
-							<ListHeaderItem text="条码" width="150" align="center" />
-							<ListHeaderItem text="单价" width="80" align="center" />
-							<ListHeaderItem text="数量" width="50" align="center" />
-							<ListHeaderItem text="小计" width="80" align="center" />
+					<List name="list_saomashouyin_cart" inset="1,0,1,0" vscrollbar="true" itemselectedbkcolor="#FFE8F7F0" itemhotbkcolor="#FFEFF9F4">
+						<ListHeader inset="10,0,10,0" height="34">
+							<ListHeaderItem text="序号" width="32" align="center" font="12" textcolor="#FF5F6368"/>
+							<ListHeaderItem text="商品" width="202" align="center" font="12" textcolor="#FF5F6368"/>
+							<ListHeaderItem text="条码" width="140" align="center" font="12" textcolor="#FF5F6368"/>
+							<ListHeaderItem text="单价" width="68" align="center" font="12" textcolor="#FF5F6368"/>
+							<ListHeaderItem text="数量" width="30" align="center" font="12" textcolor="#FF5F6368"/>
+							<ListHeaderItem text="小计" width="62" align="center" font="12" textcolor="#FF5F6368"/>
+							<Control height="1" float="true" pos="0,33,554,34" bkcolor="#FFF0F1F3" mouse="false"/>
 						</ListHeader>
 					</List>
-					
-					<HorizontalLayout name="saomashouyin_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
-						<Label name="saomashouyin_page_youhui_tishi" text="已优惠10元" textcolor="#FFFF3838" padding="15,0,0,0" width="270" height="40"></Label>
-						<Button name="btn_saomashouyin_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF60B177" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+
+					<HorizontalLayout name="saomashouyin_page_youhui_tishi_layout" height="30" bkcolor="#FFFFFFFF" visible="false" padding="10,0,10,0" childvalign="vcenter">
+						<Label name="saomashouyin_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_saomashouyin_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>
 
-					<Control height="1" bkcolor="#FFEBE8E8"></Control>
-			
-					<VerticalLayout height="145" bkcolor="#FFFFFFFF">
-						<HorizontalLayout height="70">
-							<Label name="saomashouyin_page_fenshu" text="共计0行，0件商品" font="20" textcolor="#FFFF4444" width="200" align="left" padding="15,0,0,0"></Label>
+					<!-- 实线分隔：商品明细 / 份数（与列表头下方同款 #FFF0F1F3） -->
+					<Control height="1" width="554" padding="1,0,0,0" bkcolor="#FFF0F1F3"/>
+
+					<!-- 份数 -->
+					<HorizontalLayout height="46" inset="14,0,14,0">
+						<Label name="saomashouyin_page_fenshu" text="" height="46" font="13" textcolor="#FF1F2329" align="left" valign="center" showhtml="true"/>
+					</HorizontalLayout>
 
-							<Control></Control>
-							
-							<HorizontalLayout width="310" height="50">
-								<Button name="btn_saomashouyin_cundan" width="90" height="40" padding="10,10,0,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_saomashouyin_qudan" width="90" height="40" padding="10,10,0,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_saomashouyin_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'" />
-
-								<Label name="saomashouyin_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" float="true" pos="185,10,204,29" textcolor="#FFFFFFFF" bkimage="num_bkg.png" bordercolor="#FFFF0000" bordersize="0"></Label>
-							</HorizontalLayout>
-						</HorizontalLayout>						
-
-						<HorizontalLayout height="70">
-							<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-								<Edit name="saomashouyin_food_search_edit" tooltip="请输入商品名字或条码搜索" width="380" height="50" padding="15,10,0,10" textpadding="50,0,50,0" borderround="15,15" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
-								
-								<Label name="saomashouyin_food_search_tishi" text="请输入商品名字或条码搜索" width="120" height="35" font="16" float="true" pos="75,18,410,50" mouse="false"></Label>
-								
-								<Control bkimage="search_icon.png" width="25" height="26" pos="30,23,55,49" float="true"></Control>
-								
-								<Button name="saomashouyin_food_search_clear" visible="false" width="23" height="23" pos="350,23,373,46" float="true" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png"></Button>
-							</HorizontalLayout>
-
-							<Button name="btn_saomashouyin_qianxiang" width="90" height="40" padding="10,10,10,0" text="打开钱箱" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-						</HorizontalLayout>
-					</VerticalLayout>
 				</VerticalLayout>
-				
-				<Control width="1" bkcolor="#FFEBE8E8"></Control>
-			</HorizontalLayout>
-			
-			<Control width="1" bkcolor="#FFEBE8E8"></Control>
 
-			<VerticalLayout name="saomashouyin_food_layout" visible="false">				
-				<TileLayout name="saomashouyin_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
-				
+				<!-- 搜索行：圆角胶囊搜索框 + AI学习（与点单页同款） -->
+				<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="saomashouyin_food_search_edit" tooltip="" font="12" textcolor="#FF1F2329" maxheight="24" bkcolor="#00000000" nativebkcolor="#FFEFF1F3"/>
+						<Label name="saomashouyin_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="saomashouyin_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="saomashouyin_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>
+
+				<!-- 继续点单：预留（当前无处理逻辑，默认隐藏） -->
+				<Button visible="false" name="btn_saomashouyin_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_saomashouyin_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 width="56" height="56">
+				<Button name="btn_saomashouyin_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_saomashouyin_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_saomashouyin_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_saomashouyin_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_saomashouyin_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="saomashouyin_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" valign="center" float="true" pos="37,246,56,265" font="12" textcolor="#FFFFFFFF" bkimage="num_bkg.png" bordercolor="#FFFF0000" bordersize="0"/>
+			</VerticalLayout>
+
+			<!-- ============ 右：商品网格（搜索时显示，无分类条） ============ -->
+			<VerticalLayout name="saomashouyin_food_layout" visible="false">
+				<TileLayout name="saomashouyin_foodlist" bkcolor="#00000000" vscrollbar="true" hscrollbar="false" childpadding="10">
 				</TileLayout>
 			</VerticalLayout>
-			
-			<HorizontalLayout name="saomashouyin_jiesuan_layout" bkcolor="#FFFFFFFF">
-				<VerticalLayout name="saomashouyin_jiesuan_youhui_layout" width="330">
-					<HorizontalLayout height="58">
-						<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="20"></Label>
+
+			<!-- ============ 结算面板（默认显示） ============ -->
+			<HorizontalLayout name="saomashouyin_jiesuan_layout" bkcolor="#FFF5F7FA" childpadding="12">
+				<VerticalLayout name="saomashouyin_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="saomashouyin_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="saomashouyin_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="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_youhuiquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-						<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_shangpinquan_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-						<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_cika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-						<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_quanyika_status" text="未使用" width="70" height="48" padding="0,0,0,0"></Label>
-						<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_moling_bumoling" group="saomashouyin_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="saomashouyin_jiesuan_moling_molingdaojiao" group="saomashouyin_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="saomashouyin_jiesuan_moling_molingdaoyuan" group="saomashouyin_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>
+						<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_youhuiquan_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_shangpinquan_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_cika_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_quanyika_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
+							<Control></Control>
+							<Button name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_moling_bumoling" group="saomashouyin_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 height="24" childpadding="8" childvalign="vcenter">
+									<CheckBox name="saomashouyin_jiesuan_moling_molingdaojiao" group="saomashouyin_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 height="24" childpadding="8" childvalign="vcenter">
+									<CheckBox name="saomashouyin_jiesuan_moling_molingdaoyuan" group="saomashouyin_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>
+							</VerticalLayout>
+						</HorizontalLayout>
+					</VerticalLayout>
 				</VerticalLayout>
-				
-				<Control name="saomashouyin_jiesuan_youhui_line" width="1" bkcolor="#FFEBE8E8"></Control>
-				
-				<VerticalLayout name="saomashouyin_page_jiesuan_zhangdan_layout" vscrollbar="true">
-					<HorizontalLayout height="58">
-						<Label text="账单明细" height="58" padding="20,0,0,0" font="20"></Label>
+
+
+				<VerticalLayout name="saomashouyin_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="saomashouyin_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="saomashouyin_jiesuan_zhangdanmingxi_jiage_layout" padding="20,0,20,0" height="100">
-					
+						<Button name="saomashouyin_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>
+
+
+					<VerticalLayout name="saomashouyin_jiesuan_zhangdanmingxi_jiage_layout" padding="14,0,14,0" height="100">
 					</VerticalLayout>
-					
-					<Control height="1" bkcolor="#FFEBE8E8" padding="10,10,10,0"></Control>
-					
+
+					<Control height="1" bkcolor="#FFF0F1F3" padding="10,10,10,0"/>
+
 					<HorizontalLayout height="50">
 						<Control></Control>
-						<Label name="saomashouyin_jiesuan_total_yingshou" text="" width="150" height="50" align="right" padding="0,0,15,0"/>
+						<Label name="saomashouyin_jiesuan_total_yingshou" text="" width="240" height="50" align="right" padding="0,0,18,0" showhtml="true" font="113"/>
 					</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="120" height="48" padding="18,18,0,0" font="16"/>
+
+
 					<HorizontalLayout name="saomashouyin_jiesuan_zhifufangshi_layout">
-						<HorizontalLayout name="saomashouyin_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
-							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">
-							<Button name="saomashouyin_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 name="saomashouyin_jiesuan_zhifufangshi_weixinzhifu" width="120" height="54" float="true">
+							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
-							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_gouwuka" width="122" hegiht="80" float="true">
-							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_huiyuan" width="120" height="54" float="true">
+							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_meishicheng" width="122" hegiht="80" float="true">
-							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_xianjin" width="120" height="54" float="true">
+							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_fulika" width="122" hegiht="80" float="true">
-							<Button name="saomashouyin_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="saomashouyin_jiesuan_zhifufangshi_fulika" width="120" height="54" float="true">
+							<Button name="saomashouyin_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>
 	</SaomashouyinPage>
-</Window>
+</Window>

zhipuzi_pos_windows/page/CSaomashouyinPageUI.cpp

@@ -21,6 +21,7 @@
 #include "../wnd/CGuadanWnd.h"
 #include "../wnd/CNumInputWnd.h"
 #include "../wnd/CHuiyuanInfoShowWnd.h"
+#include "../wnd/CHuiyuanChongzhiWnd.h"
 
 #include "../print/CPosPrinter.h"
 
@@ -85,36 +86,40 @@ void CSaomashouyinPageUI::InitFoodShow()
 
 	if (setting_xianshi_is_youtu == "1")
 	{
+		//样式① 图上文下：148x172（与 diandan_fooditem_youtu.xml 卡片一致）
 		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");
 	}
 	else if (setting_xianshi_is_youtu == "2")
 	{
+		//样式② 图左文右：250x82（与 diandan_fooditem_youtu_2.xml 卡片一致）
 		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");
 	}
 	else if (setting_xianshi_is_youtu == "3")
 	{
+		//样式③ 名字价格压图：148x150（与 diandan_fooditem_youtu_3.xml 卡片一致）
 		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");
 	}
 	else
 	{
+		//样式④ 纯文字：148x96（与 diandan_fooditem_wutu.xml 卡片一致）
 		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");
@@ -349,12 +354,15 @@ void CSaomashouyinPageUI::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"saomashouyin_jiesuan_zhifufangshi_zidingyi_btn");
@@ -383,26 +391,30 @@ void CSaomashouyinPageUI::UpdateJiesuanZhifuPos()
 	int nZhangdanWidth;
 	if (m_is_yincangyouhui == true)
 	{
-		nZhangdanWidth = nWidth - 611 - 5;
+		nZhangdanWidth = nWidth - 647 - 13;				// 隐藏优惠后只剩账单卡；13=右侧 inset12 + 余量1
 	}
 	else
 	{
-		nZhangdanWidth = nWidth - 611 - 331 - 5;
+		nZhangdanWidth = nWidth - 647 - 330 - 12 - 13;	// 优惠卡330 + 卡间距12；13=右侧 inset12 + 余量1
 	}
 
-	if (nZhangdanWidth < 300)
+	if (nZhangdanWidth < 292)
 	{
-		nZhangdanWidth = 300;
+		nZhangdanWidth = 292;							// 2 个支付按钮（20+132+120=272）+ 右边距 20
 	}
 	CVerticalLayoutUI* pZhangdanLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"saomashouyin_page_jiesuan_zhangdan_layout"));
 	pZhangdanLayout->SetFixedWidth(nZhangdanWidth);
 
-	//根据宽度计算每行显示的数量
-	int nMeihangNum = (nZhangdanWidth) / 144;
+	//根据宽度计算每行显示的数量（扫码收银页按需求固定每行 2 个支付方式）
+	int nMeihangNum = (nZhangdanWidth) / 132;
 	if (nMeihangNum < 1)
 	{
 		nMeihangNum = 1;
 	}
+	if (nMeihangNum > 2)
+	{
+		nMeihangNum = 2;
+	}
 
 	int num = 0;
 
@@ -415,10 +427,10 @@ void CSaomashouyinPageUI::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;
@@ -434,7 +446,7 @@ void CSaomashouyinPageUI::UpdateJiesuanZhifuPos()
 
 	//调整区域高度
 	int lastRow = (num - 1) / nMeihangNum + 1;
-	pZhifufangshiLayout->SetFixedHeight(lastRow * 105);
+	pZhifufangshiLayout->SetFixedHeight((lastRow - 1) * 64 + 60);
 }
 
 //展示结算页面，隐藏选购页面
@@ -537,6 +549,17 @@ void CSaomashouyinPageUI::HandleClickMsg(TNotifyUI& msg)
 		//点击会员登录
 		this->ClickMemberLogin();
 	}
+	else if (name == L"btn_saomashouyin_member_chongzhi")
+	{
+		//点击会员充值
+		this->ClickMemberChongzhi();
+	}
+	else if (name == L"saomashouyin_cart_item")
+	{
+		//购物车行被选中：选中行名字绿色，其余恢复黑色（底色由 List 的 itemselectedbkcolor 处理）
+		this->RefreshCartItemSelectedColor();
+		return;
+	}
 	else if (name == L"saomashouyin_jiesuan_zhekou_value")
 	{
 		//点击整单折扣
@@ -850,6 +873,41 @@ bool CSaomashouyinPageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM l
 	return false;
 }
 
+
+//刷新购物车行选中文字色（选中行名字绿色 #2E9B5C，其余恢复默认 #1F2329）
+void CSaomashouyinPageUI::RefreshCartItemSelectedColor()
+{
+	CListUI* pList = static_cast<CListUI*>(this->FindSubControl(_T("list_saomashouyin_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("saomashouyin_cart_item_name")));
+		if (pName == NULL)
+		{
+			continue;
+		}
+
+		pName->SetTextColor(pEle->IsSelected() ? 0xFF2E9B5C : 0xFF1F2329);
+
+		//序号同步高亮，选中行更容易辨认
+		CLabelUI* pXuhao = static_cast<CLabelUI*>(pEle->FindSubControl(_T("saomashouyin_cart_item_xuhao")));
+		if (pXuhao != NULL)
+		{
+			pXuhao->SetTextColor(pEle->IsSelected() ? 0xFF2E9B5C : 0xFF1F2329);
+		}
+	}
+}
+
 void CSaomashouyinPageUI::UpdateShopcartShow(bool is_add_new)
 {
 	//先保留选中
@@ -965,7 +1023,8 @@ void CSaomashouyinPageUI::UpdateShopcartShow(bool is_add_new)
 		pList->SetScrollPos(ScrollPos);
 	}
 
-	//更新结算信息
+	//更新选中行文字色 + 结算信息
+	RefreshCartItemSelectedColor();
 	UpdateJiesuanInfo();
 }
 
@@ -1268,18 +1327,40 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 
 	if (m_cur_diandan_order.getItemNum() > 0)
 	{
-		std::wstring ws_fenshu = L"共计" + std::to_wstring(m_cur_diandan_order.getItemNum()) + L"行，" + std::to_wstring(m_cur_diandan_order.getTotalNum()) + L"件商品";
+		std::wstring ws_fenshu = L"共计<b><c #E14B4A>" + std::to_wstring(m_cur_diandan_order.getItemNum()) + L"</c></b>行，<b><c #E14B4A>" + std::to_wstring(m_cur_diandan_order.getTotalNum()) + L"</c></b>件商品";
 		pFenshuLabel->SetText(ws_fenshu.c_str());
 	}
 	else
 	{
-		pFenshuLabel->SetText(L"共0行，0件商品");
+		pFenshuLabel->SetText(L"共<b><c #E14B4A>0</c></b>行，<b><c #E14B4A>0</c></b>件商品");
 	}
 
 	//再刷新账单明细展示
 	CVerticalLayoutUI* pmingxiLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("saomashouyin_jiesuan_zhangdanmingxi_jiage_layout")));
 	pmingxiLayout->RemoveAll();
 
+	//账单卡偏窄时，明细行的 name/value 宽度按容器实际可用宽自适应，避免右侧金额被裁掉
+	int nMingxiContainerW = pmingxiLayout->GetWidth();
+	if (nMingxiContainerW <= 28)
+	{
+		//首帧尚未布局时 GetWidth() 可能为 0，退回用账单卡宽兜底
+		CVerticalLayoutUI* pZhangdan = static_cast<CVerticalLayoutUI*>(this->FindSubControl(L"saomashouyin_page_jiesuan_zhangdan_layout"));
+		if (pZhangdan != NULL)
+		{
+			nMingxiContainerW = pZhangdan->GetWidth();
+		}
+	}
+
+	int nMingxiAvail = nMingxiContainerW - 28;			//28 = 容器左右 padding 14+14
+	if (nMingxiAvail < 200)
+	{
+		nMingxiAvail = 200;
+	}
+	int nMingxiValueW = nMingxiAvail / 2;				//金额列占一半
+	if (nMingxiValueW < 110) { nMingxiValueW = 110; }
+	int nMingxiNameW = nMingxiAvail - nMingxiValueW;
+	if (nMingxiNameW < 90) { nMingxiNameW = 90; }
+
 	int item_num = 0;
 
 	//先显示基础价格
@@ -1293,6 +1374,10 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"商品原价：");
 		pValue->SetText((CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(jichu_price, 2)) + L"元").c_str());
 
@@ -1310,8 +1395,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"商品券优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_shangpinquan_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1326,8 +1416,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"次卡优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_cika_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1342,8 +1437,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"商品会员价优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_total_member_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1358,8 +1458,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"整单折扣优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_zhekou_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1374,8 +1479,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"会员整单折扣优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_member_zhekou_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1390,8 +1500,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"权益卡优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_quanyika_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1406,8 +1521,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"满减优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_manjian_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1422,8 +1542,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"优惠券优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_youhuiquan_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1438,8 +1563,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"人工优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_rengong_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1454,8 +1584,13 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"抹零优惠：");
 		pValue->SetText((L"-" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_moling_youhui, 2)) + L"元").c_str());
+		pValue->SetTextColor(0xFFE14B4A);
 
 		item_num++;
 	}
@@ -1471,6 +1606,10 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"打包费：");
 		pValue->SetText((L"+" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_dabao, 2)) + L"元").c_str());
 
@@ -1487,16 +1626,20 @@ void CSaomashouyinPageUI::UpdateJiesuanInfo()
 		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
 		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
 
+		//按容器可用宽重设明细行宽度（防止窄卡截断）
+		pName->SetFixedWidth(nMingxiNameW);
+		pValue->SetFixedWidth(nMingxiValueW);
+
 		pName->SetText(L"人工加价：");
 		pValue->SetText((L"+" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_jiajia, 2)) + L"元").c_str());
 
 		item_num++;
 	}
 
-	pmingxiLayout->SetFixedHeight(item_num * 40);
+	pmingxiLayout->SetFixedHeight(item_num * 32);
 
 	CLabelUI* pYingshou = static_cast<CLabelUI*>(this->FindSubControl(_T("saomashouyin_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);
@@ -2033,8 +2176,15 @@ void CSaomashouyinPageUI::ClickMemberLogin()
 			m_card_identify = pMemberLoginDlg->m_card_identify;
 
 			CLabelUI* pMemberInfo = static_cast<CLabelUI*>(this->FindSubControl(_T("saomashouyin_page_member_name")));
-			std::wstring memberInfo = L"会员：" + CLewaimaiString::UTF8ToUnicode(m_member_name);
-			pMemberInfo->SetText(memberInfo.c_str());
+			pMemberInfo->SetText(CLewaimaiString::UTF8ToUnicode(m_member_name).c_str());
+			//动态文本 SetText 后须清缓存，避免 autocalcwidth 不刷新
+			pMemberInfo->SetFont(pMemberInfo->GetFont());
+
+			CLabelUI* pMemberBalance = static_cast<CLabelUI*>(this->FindSubControl(_T("saomashouyin_page_member_balance")));
+			pMemberBalance->SetText((L"¥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(atof(m_balance.c_str()), 2))).c_str());
+
+			//整块隐藏登录卡（浮层说明文字随卡一起隐藏）
+			this->FindSubControl(_T("saomashouyin_member_login_wrap"))->SetVisible(false);
 
 			CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_saomashouyin_member_login")));
 			pMemberLoginBtn->SetVisible(false);
@@ -2067,11 +2217,56 @@ void CSaomashouyinPageUI::ClickMemberLogout()
 	CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_saomashouyin_member_login")));
 	pMemberLoginBtn->SetVisible(true);
 
+	this->FindSubControl(_T("saomashouyin_member_login_wrap"))->SetVisible(true);
+
 	this->FindSubControl(_T("saomashouyin_page_member_info"))->SetVisible(false);
 
 	this->UpdateJiesuanInfo();
 }
 
+
+//会员充值（照搬点单页实现，充值成功后刷新本页余额）
+void CSaomashouyinPageUI::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("saomashouyin_page_member_balance")));
+			pMemberBalance->SetText((L"¥" + CLewaimaiString::UTF8ToUnicode(m_balance)).c_str());
+		}
+
+		m_is_show_modal_wnd = false;
+		delete pChongzhiWnd;
+	}
+}
+
 void CSaomashouyinPageUI::ClickMemberInfoShow()
 {
 	if (m_is_show_modal_wnd == true)
@@ -3329,8 +3524,12 @@ void CSaomashouyinPageUI::StartSearchFood(std::string foodname)
 
 	m_sousuo_foodname = foodname;
 
+	//搜索开始：隐藏占位提示语，避免与输入内容重影
 	CLabelUI* pTishi = static_cast<CLabelUI*>(this->FindSubControl(_T("saomashouyin_food_search_tishi")));
-	pTishi->SetVisible(false);
+	if (pTishi != NULL)
+	{
+		pTishi->SetVisible(false);
+	}
 
 	this->InitFoodShow();
 }
@@ -3346,8 +3545,12 @@ void CSaomashouyinPageUI::StopSerachFood()
 
 	m_cur_type_id = m_type_id_before_sousuo;
 
+	//搜索结束：输入框已清空，恢复占位提示语
 	CLabelUI* pTishi = static_cast<CLabelUI*>(this->FindSubControl(_T("saomashouyin_food_search_tishi")));
-	pTishi->SetVisible(true);
+	if (pTishi != NULL)
+	{
+		pTishi->SetVisible(true);
+	}
 
 	this->InitFoodShow();
 }
@@ -3513,9 +3716,9 @@ void CSaomashouyinPageUI::SetPos(RECT rc, bool bNeedInvalidate)
 {
 	m_nPageWidth = rc.right - rc.left;
 
-	if (m_nPageWidth + 91 < 1260)
+	if (m_nPageWidth < 1294)
 	{
-		//小屏幕上，默认隐藏优惠区域
+		//窗口放不下「优惠卡330 + 账单卡292」整列时，隐藏优惠区域，避免账单卡被右侧截断
 		this->YincangYouhui();
 	}
 	else
@@ -3535,7 +3738,6 @@ void CSaomashouyinPageUI::YincangYouhui()
 	m_is_yincangyouhui = true;
 
 	this->FindSubControl(L"saomashouyin_jiesuan_youhui_layout")->SetVisible(false);
-	this->FindSubControl(L"saomashouyin_jiesuan_youhui_line")->SetVisible(false);
 
 	this->FindSubControl(L"saomashouyin_jiesuan_yincangyouhui_btn")->SetVisible(false);
 	this->FindSubControl(L"saomashouyin_jiesuan_xianshiyouhui_btn")->SetVisible(true);
@@ -3549,7 +3751,6 @@ void CSaomashouyinPageUI::XianshiYouhui()
 	m_is_yincangyouhui = false;
 
 	this->FindSubControl(L"saomashouyin_jiesuan_youhui_layout")->SetVisible(true);
-	this->FindSubControl(L"saomashouyin_jiesuan_youhui_line")->SetVisible(true);
 
 	this->FindSubControl(L"saomashouyin_jiesuan_yincangyouhui_btn")->SetVisible(true);
 	this->FindSubControl(L"saomashouyin_jiesuan_xianshiyouhui_btn")->SetVisible(false);

zhipuzi_pos_windows/page/CSaomashouyinPageUI.h

@@ -102,12 +102,14 @@ public:
 
 	//处理会员登录
 	void ClickMemberLogin();
+	void ClickMemberChongzhi();
 
 	//处理会员退出登陆
 	void ClickMemberLogout();
 
 	//展示会员详情
 	void ClickMemberInfoShow();
+	void RefreshCartItemSelectedColor();
 
 	//点击AI学习
 	void ClickAixuexi();

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -274,6 +274,11 @@ void CMainWnd::Notify(TNotifyUI& msg)
 				szEditName = _T("diandan_food_search_edit");
 				szTishiName = _T("diandan_food_search_tishi");
 			}
+			else if (name == _T("saomashouyin_food_search_edit"))
+			{
+				szEditName = _T("saomashouyin_food_search_edit");
+				szTishiName = _T("saomashouyin_food_search_tishi");
+			}
 			else if (name == _T("yubaozhuangbiaoqian_food_search_edit"))
 			{
 				szEditName = _T("yubaozhuangbiaoqian_food_search_edit");
@@ -306,6 +311,10 @@ void CMainWnd::Notify(TNotifyUI& msg)
 			{
 				szTishiName = _T("diandan_food_search_tishi");
 			}
+			else if (name == _T("saomashouyin_food_search_edit"))
+			{
+				szTishiName = _T("saomashouyin_food_search_tishi");
+			}
 			else if (name == _T("yubaozhuangbiaoqian_food_search_edit"))
 			{
 				szTishiName = _T("yubaozhuangbiaoqian_food_search_tishi");