张洋 4 лет назад
Родитель
Сommit
e5047775be

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -62,7 +62,7 @@
 				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 				
 				<VerticalLayout height="165" bkcolor="#FFFFFFFF">
-					<HorizontalLayout>
+					<HorizontalLayout height="75">
 						<Label name="diandan_page_otherprice" text="" width="250" align="left" padding="15,10,0,0"></Label>
 						<Label name="diandan_page_totalprice" text="总价:¥0.00" font="0" textcolor="#FFFF0000" width="250" align="right" padding="0,10,15,0"></Label>
 					</HorizontalLayout>

+ 7 - 0
zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -2065,6 +2065,11 @@ void CDiandanPageUI::StartWeixinzhifuShoukuan()
 		return;
 	}
 
+	if (m_cur_diandan_order.getItemNum() == 0)
+	{
+		return;
+	}
+
 	CWeixinzhifuShoukuanWnd* pShoukuanWnd = new CWeixinzhifuShoukuanWnd;
 	if (pShoukuanWnd != NULL)
 	{
@@ -2101,6 +2106,8 @@ void CDiandanPageUI::StartWeixinzhifuShoukuan()
 		}
 
 		delete pShoukuanWnd;
+
+		m_is_show_shoukuan = false;
 	}
 }