1.调整悬浮窗展示无订单状态下点击次才能进入主界面;

takeout/view/floatForm.cpp

@@ -69,9 +69,9 @@ void FloatForm::InitWidget(int flag)
     {
         if(m_is_login)
         {
-            ui->widget_base->hide();
+            ui->widget_base->show();
             ui->widget_login->hide();
-            ui->widget_synshow->show();
+            ui->widget_synshow->hide();
         }
         else
         {
@@ -117,6 +117,8 @@ bool FloatForm::event(QEvent *e)
                 refundstatus != ApplicationRefundOrder && refundstatus != ApplicationPartialRefundOrder && refundstatus != RefusingRefundOrder)
         {
             m_play_flag = false;
+            if(ui->widget_synshow->isHidden())
+                ui->widget_synshow->show();
             onStartRemind(0);
             return true;
         }
@@ -124,6 +126,8 @@ bool FloatForm::event(QEvent *e)
         if((refundstatus == ApplicationRefundOrder || refundstatus == ApplicationPartialRefundOrder))
         {
             m_play_flag = false;
+            if(ui->widget_synshow->isHidden())
+                ui->widget_synshow->show();
             onStartRemind(1);
             return true;
         }
@@ -150,6 +154,8 @@ bool FloatForm::event(QEvent *e)
             else
             {
                 m_play_flag = true;
+                if(ui->widget_synshow->isHidden())
+                    ui->widget_synshow->show();
                 onStartRemind(2);
             }
         }
@@ -234,13 +240,23 @@ void FloatForm::mouseReleaseEvent(QMouseEvent *event)
     int y = m_absMove.y();
     if(!m_bMouseMove || (((x>-10)&&(x<10))&&((y>-10)&&(y<10))))
     {
-        hide();
-        m_raiseTimer.stop();
-        if(m_bReminding)
+        if(ui->widget_synshow->isHidden() && m_is_login)
         {
-            this->onStopRemind();
+            ui->widget_synshow->show();
+            if(!ui->widget_base->isHidden())
+                ui->widget_base->hide();
+        }
+        else
+        {
+            hide();
+            m_raiseTimer.stop();
+
+            if(m_bReminding)
+            {
+                this->onStopRemind();
+            }
+            DEFAULTPOSTEVENT(PosEvent::s_show_login, "");
         }
-        DEFAULTPOSTEVENT(PosEvent::s_show_login, "");
     }
 
     m_bMouseMove = false;

takeout/view/floatForm.h

@@ -56,6 +56,7 @@ private:
     bool m_is_login;
     //停止标识
     bool m_play_flag;
+    //
     /* 功能:初始化
      * 参数:NULL
      * 返回:NULL