修复送达时间显示问题,更改外卖icon

fmTakeaway/Control/flowControl.cpp

@@ -267,7 +267,7 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
 
             QString remark(orderObject->remark), deliveryTime;
             remark = remark.isEmpty()? "" : QString("[备注: %1]").arg(remark);
-            deliveryTime = QString("[期望送达时间: %1]").arg(QDateTime::fromTime_t(orderObject->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
+            deliveryTime = QString("[期望送达时间: %1]").arg(orderObject->delivery_time==0? "立即送出" : QDateTime::fromTime_t(orderObject->delivery_time).toString("yyyy-MM-dd hh:mm:ss"));
             emit showAlert(AlertForm::SUCCESS, QString("接单成功!%1<br/>%2<br/>%3").arg(remark).arg(deliveryTime).arg(orderEntryError));
 
             // 通知主界面移动订单

fmTakeaway/fmTakeaway.rc

-IDI_ICON1   ICON DISCARDABLE"takeaway.ico"
+IDI_ICON1   ICON DISCARDABLE"fm.ico"
\ No newline at end of file