diff --git a/CosmeticManager.cpp b/CosmeticManager.cpp index 48a063e..0316a6c 100644 --- a/CosmeticManager.cpp +++ b/CosmeticManager.cpp @@ -107,12 +107,12 @@ void CosmeticManager::displayAll() const { for (int i = 0; i < count; ++i) { std::cout << "品牌: " << cosmetics[i]->getName() << " | 价格: " << cosmetics[i]->getPrice() - << " | 类型: " << (cosmetics[i]->getType() ? "国产" : "进口") + << " | 类型: " << (cosmetics[i]->getType() ? "国产" : "进口")// 注意,这里还为开放其他类型,若需2种以上要新构建 << " | 过期日期: " << cosmetics[i]->getExpirationDate() // 新增 << std::endl; launchWindow("化妆品信息", "品牌: " + cosmetics[i]->getName() + " | 价格: " + std::to_string(cosmetics[i]->getPrice()) - + " | 类型: " + (cosmetics[i]->getType() ? "国产" : "进口") + + " | 类型: " + (cosmetics[i]->getType() ? "国产" : "进口")// 注意,这里还为开放其他类型,若需2种以上要新构建 + " | 过期日期: " + cosmetics[i]->getExpirationDate()); } } diff --git a/main.cpp b/main.cpp index f81b8b9..79639ae 100644 --- a/main.cpp +++ b/main.cpp @@ -110,17 +110,13 @@ int main() { if (cosmetic) { std::cout << "品牌: " << cosmetic->getName() << "\n" << "价格: " << cosmetic->getPrice() << "\n" - << "类型: " << (cosmetic->getType() ? "国产" : "进口") << "\n" + << "类型: " << (cosmetic->getType() ? "国产" : "进口") << "\n"// 注意,这里还为开放其他类型,若需2种以上要新构 << "过期日期: " << cosmetic->getExpirationDate() << "\n" << std::endl; - manager.launchWindow("查询成功",cosmetic->getName() + "\n" - + "价格: " + std::to_string(cosmetic->getPrice()) + "\n" - + "类型: " + (cosmetic->getType() ? "国产" : "进口") + "\n" - + "过期日期: " + cosmetic->getExpirationDate()); msgboxTitle="查询成功"; msgboxContent=cosmetic->getName() + "\n" + "价格: " + std::to_string(cosmetic->getPrice()) + "\n" - + "类型: " + (cosmetic->getType() ? "国产" : "进口") + "\n" + + "类型: " + (cosmetic->getType() ? "国产" : "进口") + "\n"// 注意,这里还为开放其他类型,若需2种以上要新构建 + "过期日期: " + cosmetic->getExpirationDate(); std::cout << msgboxContent << std::endl; manager.launchWindow(msgboxTitle,msgboxContent);