点单页面基本改完

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

@@ -7,22 +7,20 @@
 
 			<!-- ============ 左：购物车 390（白卡 radius 10，内容区 380 保持原样） ============ -->
 			<VerticalLayout width="390" bkcolor="#00000000" childpadding="12">
-				<!-- 称重卡：独立卡片置顶（电子秤未连接时由 C++ 隐藏 diandan_page_chengzhong_layout） -->
-				<HorizontalLayout name="diandan_page_chengzhong_layout" height="100" bkimage="file='dc_cart.png' corner='10,10,10,10'">
-					<VerticalLayout width="80">
-						<Control name="diandan_page_status_chengzhong_wending" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,28,23,36" mouse="false"/>
-						<Label name="diandan_page_label_chengzhong_wending" text="稳定" height="20" padding="30,20,0,0" font="14"/>
-						<Control name="diandan_page_status_chengzhong_jingzhong" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,68,23,76" mouse="false"/>
-						<Label name="diandan_page_label_chengzhong_jingzhong" text="净重" height="20" padding="30,20,0,0" font="14"/>
+				<!-- 称重卡：独立卡片置顶（未接电子秤时由 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'">
+					<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 width="200">
-						<Label name="diandan_page_label_chengzhong_value" text="0.000" align="right" width="135" height="40" padding="0,35,0,0" textcolor="#FF2E9B5C" font="140"/>
-						<Label name="diandan_page_label_chengzhong_unit" text="公斤" height="30" padding="15,40,0,0" font="16"/>
+					<HorizontalLayout 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>
-					<VerticalLayout>
-						<Button name="diandan_page_chengzhong_zhiling" visible="false" width="80" height="32" padding="10,10,10,0" text="置零" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'"/>
-						<Button name="diandan_page_chengzhong_qupi" visible="false" width="80" height="32" padding="10,15,10,0" text="去皮" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'"/>
-					</VerticalLayout>
+					<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>
 			<!-- 会员区块：独立卡片浮在灰底上（未登录白卡可点 / 登录浅绿卡） -->
 				<HorizontalLayout height="66" name="diandan_member_login_wrap">

zhipuzi_pos_windows/page/CGengduoPageUI.cpp

@@ -189,13 +189,13 @@ void CGengduoPageUI::Refresh()
 		}
 		else if (*it == "zhengcan")
 		{
-			pTitle->SetText(L"桌台");
+			pTitle->SetText(L"桌台收银");
 			pImage->SetBkImage(L"nav_zhuotai_grn36.png");
 			pItem->SetName(L"zhengcan");
 		}
 		else if (*it == "saomashouyin")
 		{
-			pTitle->SetText(L"收银");
+			pTitle->SetText(L"扫码收银");
 			pImage->SetBkImage(L"nav_shouyin_grn36.png");
 			pItem->SetName(L"saomashouyin");
 		}
@@ -351,7 +351,7 @@ void CGengduoPageUI::Refresh()
 		}
 		else if (*it == "zhengcan")
 		{
-			pTitle->SetText(L"桌台");
+			pTitle->SetText(L"桌台收银");
 			pImage->SetBkImage(L"nav_zhuotai_grn36.png");
 			pItem->SetName(L"zhengcan");
 			pExchange->SetText(L"上移");
@@ -362,7 +362,7 @@ void CGengduoPageUI::Refresh()
 		}
 		else if (*it == "saomashouyin")
 		{
-			pTitle->SetText(L"收银");
+			pTitle->SetText(L"扫码收银");
 			pImage->SetBkImage(L"nav_shouyin_grn36.png");
 			pItem->SetName(L"saomashouyin");
 

zhipuzi_pos_windows/tool/CSetting.cpp

@@ -579,7 +579,7 @@ void CSetting::Init()
 		m_paramsMap[setting_kuaijiejian_caigou_vk] = "";
 	}
 
-	//快捷键相关的设置（桌台页面，默认为空）
+	//快捷键相关的设置（桌台收银页面，默认为空）
 	std::string setting_kuaijiejian_zhuotai_mod = "setting_kuaijiejian_zhuotai_mod";
 	if (m_paramsMap.find(setting_kuaijiejian_zhuotai_mod) == m_paramsMap.end())
 	{

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -1230,7 +1230,7 @@ void CMainWnd::UpdateGongnengDaohang()
 		else if (curName == "zhengcan")
 		{
 			newOption->SetName(L"main_zhengcan");
-			newOption->SetText(L"桌台");
+			newOption->SetText(L"桌台收银");
 
 			newOption->SetNormalImage(L"file='nav_zhuotai.png' source='0,0,24,24' dest='24,10,48,34'");
 			newOption->SetSelectedImage(L"file='nav_zhuotai_on.png' source='0,0,24,24' dest='24,10,48,34'");
@@ -1238,7 +1238,7 @@ void CMainWnd::UpdateGongnengDaohang()
 		else if (curName == "saomashouyin")
 		{
 			newOption->SetName(L"main_saomashouyin");
-			newOption->SetText(L"收银");
+			newOption->SetText(L"扫码收银");
 
 			newOption->SetNormalImage(L"file='nav_shouyin.png' source='0,0,24,24' dest='24,10,48,34'");
 			newOption->SetSelectedImage(L"file='nav_shouyin_on.png' source='0,0,24,24' dest='24,10,48,34'");
@@ -1931,7 +1931,7 @@ void CMainWnd::UpdateRegisterHotKey()
 
 	RegisterHotKey(m_hWnd, WM_MYHOTKEY_CAIGOU, caigou_mod, caigou_vk);
 
-	//桌台页面
+	//桌台收银页面
 	UINT zhuotai_mod = (UINT)atoi(CSetting::GetInstance()->GetParam("setting_kuaijiejian_zhuotai_mod").c_str());
 	UINT zhuotai_vk = (UINT)atoi(CSetting::GetInstance()->GetParam("setting_kuaijiejian_zhuotai_vk").c_str());