开始处理windows接单软件问题

bin/Win32/Debug/lewaimai_pos_windows/skin/setting.xml

@@ -159,6 +159,7 @@
 							<ListLabelElement text="30*20mm" />
 							<ListLabelElement text="60*50mm" />
 							<ListLabelElement text="50*40mm" />
+							<ListLabelElement text="40*60mm" />
 						</Combo>
 					</HorizontalLayout>
 					

lewaimai_pos_windows/control/CWaimaiOrderInfoUI.cpp

@@ -101,7 +101,7 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 		CLabelUI *pDabaoFee = new CLabelUI;
 		pDabaoFee->SetFixedHeight(30);
 
-		wstring dabao_fee = L"打包费：" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_delivery, 2));
+		wstring dabao_fee = L"打包费：" + CLewaimaiString::UTF8ToUnicode(order.m_dabao_money);
 		pDabaoFee->SetText(dabao_fee.c_str());
 
 		pFeesLayout->Add(pDabaoFee);

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1027,6 +1027,11 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 		biaoqian_width = 50;
 		biaoqian_height = 40;
 	}
+	else  if (printer_guige == "40*60mm")
+	{
+		biaoqian_width = 40;
+		biaoqian_height = 60;
+	}
 	else
 	{
 		biaoqian_width = 40;
@@ -1152,6 +1157,10 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 			{
 				nPriceY = 250;
 			}
+			else if (biaoqian_height == 60)
+			{
+				nPriceY = 410;
+			}
 
             //打印价格
             std::string priceInfo = CLewaimaiString::UTF8ToANSI(food_price) + "元";

lewaimai_pos_windows/wnd/CMainWnd.cpp

@@ -1183,6 +1183,10 @@ void CMainWnd::HandleItemSelectMsg(TNotifyUI& msg)
 		{
 			CSetting::SetParam("setting_biaoqian_printer_guige", "50*40mm");
 		}
+		else if (com->GetCurSel() == 6)
+		{
+			CSetting::SetParam("setting_biaoqian_printer_guige", "40*60mm");
+		}
 	}
 	else if (name == _T("setting_biaoqian_printer_fangxiang"))
 	{
@@ -2068,6 +2072,12 @@ void CMainWnd::InitSettingStatus()
 		com->SelectItem(5, false, false);
 		com->SetText(L"50*40mm");
 	}
+	else if (setting_biaoqian_printer_guige == "40*60mm")
+	{
+		com->SetInternVisible(true);
+		com->SelectItem(6, false, false);
+		com->SetText(L"40*60mm");
+	}
 
 	com = static_cast<CComboUI*>(m_pm.FindControl(_T("setting_biaoqian_printer_fangxiang")));
 	std::string setting_biaoqian_printer_fangxiang = CSetting::GetParam("setting_biaoqian_printer_fangxiang");