merge

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1061,18 +1061,17 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
             //考虑是否用大号字体
             bool is_big_name = false;
 
-			/*暂时全部打印小字，这里注释掉
             if(foodNameVector.size() <= 2)
             {
                 //不超过2行，可以用大的字体
                 is_big_name = true;
-            }*/
+            }
 
             //LOG_INFO("foodNameVector size:" << foodNameVector.size());
 			
             for(std::vector<std::string>::iterator it = foodNameVector.begin(); it != foodNameVector.end(); it++)
             {
-                LOG_INFO("nRow:" << nRow << ", 准备打印商品名字：" << (*it).c_str());
+                //LOG_INFO("nRow:" << nRow << ", 准备打印商品名字：" << (*it).c_str());
 
                 if(is_big_name)
                 {
@@ -1089,15 +1088,15 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 			int nPriceY;
 			if (biaoqian_height ==  30)
 			{
-				nPriceY = 180;
+				nPriceY = 170;
 			}
 			else if (biaoqian_height == 25)
 			{
-				nPriceY = 140;
+				nPriceY = 130;
 			}
 			else if (biaoqian_height == 20)
 			{
-				nPriceY = 100;
+				nPriceY = 90;
 			}
 
             //打印价格