张洋 3 лет назад
Родитель
Сommit
4c0097ffae
1 измененных файлов с 17 добавлено и 14 удалено
  1. 17 14
      zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.cpp

+ 17 - 14
zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.cpp

@@ -828,27 +828,30 @@ void CFulikaShoukuanWnd::StartShoukuan()
 	//先判断收款码的格式是否正确
 	CEditUI* pShoujihaoEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("shoujihao_edit")));
 	std::wstring ws_Shoujihao = pShoujihaoEdit->GetText();
-	if (ws_Shoujihao.length() == 0)
-	{
-		pLabel->SetText(L"手机号不能为空");
-		pLabel->SetVisible(true);
-
-		return;
-	}
-
 	m_shoujihao = CLewaimaiString::UnicodeToUTF8(ws_Shoujihao);
 
 	CEditUI* pPasswordEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("password_edit")));
 	std::wstring ws_Password = pPasswordEdit->GetText();
-	if (ws_Password.length() == 0)
+	m_password = CLewaimaiString::UnicodeToUTF8(ws_Password);
+
+	if (m_shoukuanModel == 2)
 	{
-		pLabel->SetText(L"密码不能为空");
-		pLabel->SetVisible(true);
+		if (ws_Shoujihao.length() == 0)
+		{
+			pLabel->SetText(L"手机号不能为空");
+			pLabel->SetVisible(true);
 
-		return;
-	}
+			return;
+		}
 
-	m_password = CLewaimaiString::UnicodeToUTF8(ws_Password);
+		if (ws_Password.length() == 0)
+		{
+			pLabel->SetText(L"密码不能为空");
+			pLabel->SetVisible(true);
+
+			return;
+		}
+	}	
 
 	//全部验证通过,就可以开始修改状态了
 	m_shoukuan_status = 1;