uu

fmTakeaway/detailForm.cpp

@@ -102,10 +102,10 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailBtn2->setText(GetOperNameByStatus(orderObject->status, true));
     ui->detailBtn2->setProperty("operation", GetOperByStatus(orderObject->status, true));
     ui->detailBtn2->setProperty("orderId", orderObject->order_id);
-    if(orderObject->status != 1 && orderObject->status != 20&& orderObject->status != 2&& orderObject->status != 4)
-    {
+//    if(orderObject->status != 1 && orderObject->status != 20&& orderObject->status != 2&& orderObject->status != 4)
+//    {
         ui->detailBtn2->hide();
-    }
+//    }
 
     ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status));
     ui->detailBtn3->setProperty("operation", GetOperByStatus(orderObject->status));

fmTakeaway/mainForm.h

@@ -63,6 +63,9 @@ private:
     // 置顶计数器
     int m_raiseIndex;
 
+    // 自提堂食订单的提示定时器
+    QTimer * m_timerZT;
+
     // 托盘图标
     SysTray m_tray;
     // 订单号长度