Commit cad561ff by NitefullWind

1. 流水查询界面暂时不区分支付渠道。

parent af787909
...@@ -281,11 +281,12 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error) ...@@ -281,11 +281,12 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
item3->setTextAlignment(Qt::AlignCenter); item3->setTextAlignment(Qt::AlignCenter);
ui->tableWidget->setItem(0, 3, item3); ui->tableWidget->setItem(0, 3, item3);
if(_posType == SIMPHONY) { //NOTE 显示支付渠道
QTableWidgetItem *item4 = new QTableWidgetItem(tmp[JSON_KEY_PAYMENTMETHOD].toString()); // if(_posType == SIMPHONY) {
item4->setTextAlignment(Qt::AlignCenter); // QTableWidgetItem *item4 = new QTableWidgetItem(tmp[JSON_KEY_PAYMENTMETHOD].toString());
ui->tableWidget->setItem(0, 4, item4); // item4->setTextAlignment(Qt::AlignCenter);
} // ui->tableWidget->setItem(0, 4, item4);
// }
if(_posType != SPCC) { if(_posType != SPCC) {
QWidget *pWdg = new QWidget(ui->tableWidget); QWidget *pWdg = new QWidget(ui->tableWidget);
...@@ -683,9 +684,10 @@ void HostWidget::on_btn_find_check_clicked() ...@@ -683,9 +684,10 @@ void HostWidget::on_btn_find_check_clicked()
QStringList headerString; QStringList headerString;
QList<double> widthScale; QList<double> widthScale;
headerString<<QString::fromLocal8Bit("订单编号")<<QString::fromLocal8Bit("订单金额")<<QString::fromLocal8Bit("订单时间")<<QString::fromLocal8Bit("支付状态"); headerString<<QString::fromLocal8Bit("订单编号")<<QString::fromLocal8Bit("订单金额")<<QString::fromLocal8Bit("订单时间")<<QString::fromLocal8Bit("支付状态");
if(_posType == SIMPHONY) { //NOTE 显示支付渠道
headerString << QString::fromLocal8Bit("支付渠道"); // if(_posType == SIMPHONY) {
} // headerString << QString::fromLocal8Bit("支付渠道");
// }
if(_posType != SPCC) { if(_posType != SPCC) {
headerString << QString::fromLocal8Bit("操作"); headerString << QString::fromLocal8Bit("操作");
} }
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
#define _VERSION_H_ #define _VERSION_H_
#define VER_MAJOR 0 #define VER_MAJOR 0
#define VER_MINOR 1 #define VER_MINOR 2
#define VER_REVISION 1 #define VER_REVISION 0
#define VER_BUILD 2 #define VER_BUILD 0
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment