1

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

@@ -4,25 +4,26 @@
 		<HorizontalLayout>
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 			
-			<VerticalLayout>
+			<!-- 桌台页面背景：与点单页右侧商品区（diandan_food_layout）统一为 #F5F7FA -->
+			<VerticalLayout bkcolor="#FFF5F7FA">
 				<HorizontalLayout name="zhengcan_zhuozi_type_layout_scrolllayout" vscrollbar="true">
-					<HorizontalLayout name="zhengcan_zhuozi_type_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+					<HorizontalLayout name="zhengcan_zhuozi_type_layout" padding="0,0,0,0">
 
 					</HorizontalLayout>
 				</HorizontalLayout>
 				
-				<VerticalLayout name="zhengcan_tablelist_scrolllayout" vscrollbar="true" bkcolor="#FFFFFFFF">
+				<VerticalLayout name="zhengcan_tablelist_scrolllayout" vscrollbar="true" bkcolor="#FFF5F7FA">
 					<VerticalLayout name="zhengcan_tablelist" padding="0,0,0,0">
 					
 					</VerticalLayout>
 					
-					<HorizontalLayout visible="false" name="zhengcan_zhuantai_layout" float="true" width="700" height="80" bkcolor="#FFFFFFFF">
-						<Label text="选择要转入的桌台" font="20" padding="20,0,0,0"></Label>
+					<!-- 转台操作栏：白卡圆角悬浮条；尺寸优化为 600×64、底部边距 24，
+					     确定按钮改用全站主按钮资产 btn_green_zhengchang（R71 修复 btn_r8_green 实为白底的问题） -->
+					<HorizontalLayout visible="false" name="zhengcan_zhuantai_layout" float="true" width="600" height="64" bkimage="file='card_r10.png' corner='10,10,10,10'" inset="20,0,20,0" childpadding="12" childvalign="vcenter">
+						<Label text="选择要转入的桌台" font="20" textcolor="#FF1F2329" valign="center"></Label>
 						<Control></Control>
-						
-						<Button name="zhengcan_zhuantai_cancel" text="取消" height="45" width="120" padding="10,17,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="zhengcan_zhuantai_queding" text="确定" height="45" width="120" padding="10,17,20,0" textcolor="#FFFFFFFF" normalimage="file='btn_border_blue.png' corner='5,5,5,5'" hotimage="file='btn_border_blue_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_blue_Click.png' corner='5,5,5,5'"></Button>
+						<Button name="zhengcan_zhuantai_cancel" text="取消" height="40" width="100" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'"></Button>
+						<Button name="zhengcan_zhuantai_queding" text="确定" height="40" width="100" 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'"></Button>
 					</HorizontalLayout>
 					
 					<VerticalLayout name="zhengcan_saomadiancan_layout" float="true" width="182" height="52" bkimage="file='saomadiancan_attention_bk.png' corner='26,26,26,26'">

zhipuzi_pos_windows/page/CZhengcanPageUI.cpp

@@ -449,17 +449,17 @@ void CZhengcanPageUI::UpdateTablePos()
 
 	m_table_mutex.unlock();
 
-	//更新转台操作栏的位置
+	//更新转台操作栏的位置（R71：操作栏尺寸 700×80 -> 600×64，底部边距 30 -> 24）
 	CHorizontalLayoutUI* pZhuantaiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("zhengcan_zhuantai_layout")));
 
 	CVerticalLayoutUI* pFenleiScrollLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("zhengcan_zhuozi_type_layout_scrolllayout")));
 	int nFenleiHeight = pFenleiScrollLayout->GetFixedHeight();
 
 	RECT rect;
-	rect.left = (nWidth - 700) / 2;
-	rect.right = rect.left + 700;
-	rect.top = m_nPageHeight - 80 - 30 - nFenleiHeight;
-	rect.bottom = rect.top + 80;
+	rect.left = (nWidth - 600) / 2;
+	rect.right = rect.left + 600;
+	rect.top = m_nPageHeight - 64 - 24 - nFenleiHeight;
+	rect.bottom = rect.top + 64;
 
 	// 强制设置固定大小和位置
 	//SIZE size;