张洋 2 weeks ago
parent
commit
6014549aa0

BIN
bin/Win32/Debug/zhipuzi_pos_windows/DuiLib_d.dll


+ 6 - 6
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_2.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<!-- 样式② 图左文右 250x82:缩略图 80x80 贴左/上/下铺满,名字价格居右(HLayout 子项高度只认 maxheight) -->
-	<DiandanFoodItem name="diandan_fooditem" width="250" height="82" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r8.png' corner='8,8,8,8'">
-		<HorizontalLayout width="250" height="82" inset="1,1,8,1" childpadding="9" mouse="false">
+	<!-- 样式② 图左文右 188x82 一行4个(R41):缩略图 80x80 贴左/上/下铺满,名字价格居右(HLayout 子项高度只认 maxheight) -->
+	<DiandanFoodItem name="diandan_fooditem" width="188" height="82" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r8.png' corner='8,8,8,8'">
+		<HorizontalLayout width="188" height="82" inset="1,1,8,1" childpadding="9" mouse="false">
 			<Control name="image" width="80" height="80" maxheight="80" bkimage="file='fc_img_ph.png'" mouse="false"></Control>
 
-			<VerticalLayout width="152" height="80" maxheight="80" mouse="false">
+			<VerticalLayout width="90" height="80" maxheight="80" mouse="false">
 				<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" wordbreak="true" endellipsis="true" mouse="false"></Label>
 				<Control mouse="false"></Control>
 				<Label name="price" height="19" font="113" textcolor="#FFF5623D" valign="top" mouse="false"></Label>
 			</VerticalLayout>
 		</HorizontalLayout>
 		<!-- 圆角遮罩:DuiLib 无裁剪,图片铺满后方角会戳出 fc_r8 圆角;外部填页面底色、洞内全透明,浮在上层盖住外沿 -->
-		<Control float="true" pos="0,0,250,82" bkimage="file='fc_mask_250x82.png'" mouse="false"></Control>
+		<Control float="true" pos="0,0,188,82" bkimage="file='fc_mask_188x82.png'" mouse="false"></Control>
 		<!-- 顶层描边框:透明中心只描边,盖在图片与圆角遮罩之上,修「描边弧线在圆角处被盖断」(R24) -->
-		<Control name="diandan_fooditem_frame" bkimage="file='fc_r8_frame.png' corner='8,8,8,8'" width="250" height="82" float="true" pos="0,0,250,82" mouse="false"></Control>
+		<Control name="diandan_fooditem_frame" bkimage="file='fc_r8_frame.png' corner='8,8,8,8'" width="188" height="82" float="true" pos="0,0,188,82" mouse="false"></Control>
 		<Label name="nature" visible="false" width="54" height="22" font="12" text="多属性" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_grn.png' corner='11,11,11,11'" align="center" valign="center" mouse="false"></Label>
 
 		<Label name="chengzhong" visible="false" width="54" height="22" font="12" text="称重" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_blue.png' corner='11,11,11,11'" align="center" valign="center" mouse="false"></Label>

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


BIN
dll/debug/DuiLib_d.dll


+ 1 - 1
zhipuzi_pos_windows/page/CAIxuexiPageUI.cpp

@@ -277,7 +277,7 @@ void CAIxuexiPageUI::InitFoodShow()
 	else if (setting_xianshi_is_youtu == "2")
 	{
 		SIZE itemsize;
-		itemsize.cx = 230;
+		itemsize.cx = 188;
 		itemsize.cy = 90;
 		m_foodLayout->SetItemSize(itemsize);
 

+ 2 - 2
zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -315,9 +315,9 @@ void CDiandanPageUI::InitFoodShow()
 	}
 	else if (setting_xianshi_is_youtu == "2")
 	{
-		//样式② 图左文右:3 列 x 250,卡片高 82
+		//样式② 图左文右:4 列 x 188,卡片高 82(R41 一行 4 个)
 		SIZE itemsize;
-		itemsize.cx = 250;
+		itemsize.cx = 188;
 		itemsize.cy = 82;
 		m_foodLayout->SetItemSize(itemsize);
 

+ 2 - 2
zhipuzi_pos_windows/page/CSaomashouyinPageUI.cpp

@@ -99,9 +99,9 @@ void CSaomashouyinPageUI::InitFoodShow()
 	}
 	else if (setting_xianshi_is_youtu == "2")
 	{
-		//样式② 图左文右:250x82(与 diandan_fooditem_youtu_2.xml 卡片一致)
+		//样式② 图左文右:188x82(与 diandan_fooditem_youtu_2.xml 卡片一致,R41 一行 4 个)
 		SIZE itemsize;
-		itemsize.cx = 250;
+		itemsize.cx = 188;
 		itemsize.cy = 82;
 		m_foodLayout->SetItemSize(itemsize);
 

+ 2 - 2
zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -200,9 +200,9 @@ void CShangpinPageUI::InitFoodShow()
 	}
 	else if (setting_xianshi_is_youtu == "2")
 	{
-		//样式② 图左文右:卡片 250 x 82
+		//样式② 图左文右:卡片 188 x 82(R41 一行 4 个)
 		SIZE itemsize;
-		itemsize.cx = 250;
+		itemsize.cx = 188;
 		itemsize.cy = 82;
 		m_foodLayout->SetItemSize(itemsize);
 

+ 1 - 1
zhipuzi_pos_windows/page/CYubaozhuangbiaoqianPageUI.cpp

@@ -282,7 +282,7 @@ void CYubaozhuangbiaoqianPageUI::InitFoodShow()
 	else if (setting_xianshi_is_youtu == "2")
 	{
 		SIZE itemsize;
-		itemsize.cx = 250;
+		itemsize.cx = 188;
 		itemsize.cy = 82;
 		m_foodLayout->SetItemSize(itemsize);
 

+ 1 - 1
zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -396,7 +396,7 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 	else if (setting_xianshi_is_youtu == "2")
 	{
 		SIZE itemsize;
-		itemsize.cx = 250;
+		itemsize.cx = 188;
 		itemsize.cy = 82;
 		m_foodLayout->SetItemSize(itemsize);