新建分支

handle/httprequest.cpp

@@ -81,10 +81,10 @@ void HttpRequest::finishRequest(QNetworkReply * reply)
 
 void HttpRequest::initRequest(QNetworkRequest & req, bool post)
 {
-    if(!_aid.isEmpty()){
-        req.setRawHeader("Auid",_aid.toUtf8());
-        req.setRawHeader("Access-Token",_token.toUtf8());
-    }
+//    if(!_aid.isEmpty()){
+        req.setRawHeader("Auid",QString::number(GlobalInfo::this_()->user().accountId).toUtf8());
+        req.setRawHeader("Access-Token",GlobalInfo::this_()->user().acessToken.toUtf8());
+//    }
 //    if(post)
 //    {
 //        req.setHeader(QNetworkRequest::ContentTypeHeader,"multipart/form-data");

handle/httprequest.h

@@ -7,6 +7,7 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QHttpMultiPart>
+#include "globalinfo.h"
 
 class HttpRequest : public QObject
 {

handle/remotepackconfig.cpp

@@ -39,8 +39,8 @@ RemotePackConfig::RemotePackConfig(QObject *parent) : QObject(parent)
        this->_config.chengZhongJingDuMode = jingdu.second;
    });
 
-   parsefUNS.insert("A2000213",[this](const QJsonObject & obj){this->_config.buDingZhongTongShuFanWei = this->getConfigpAIR(obj);});
-   parsefUNS.insert("A2000214",[this](const QJsonObject & obj){this->_config.dingZhongTongShuFanwei = this->getConfigpAIR(obj);});
+//   parsefUNS.insert("A2000213",[this](const QJsonObject & obj){this->_config.buDingZhongTongShuFanWei = this->getConfigpAIR(obj);});
+//   parsefUNS.insert("A2000214",[this](const QJsonObject & obj){this->_config.dingZhongTongShuFanwei = this->getConfigpAIR(obj);});
 
   //TODO:http://doc.vanlai.net:3001/web/#/1?page_id=57 补全剩下
 //http://erp.itwsw.cn/#/packageCon

mainwindow.cpp

@@ -6,6 +6,12 @@ MainWindow::MainWindow(QWidget *parent)
     , ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
+    connect(ui->widgetLogin,&LoginForm::loginFinish,this,&MainWindow::backMenu);
+    connect(ui->pageSelectValue,&SelectValueForm::back,this,&MainWindow::backMenu);
+    connect(ui->pageAutoPack,&AutoPackForm::back,this,&MainWindow::backMenu);
+
+    connect(ui->pageSelectValue,&SelectValueForm::selectProject,this,&MainWindow::pageStatusChange);
+    ui->stackedWidget->setCurrentWidget(ui->pageLogin);
 }
 
 MainWindow::~MainWindow()
@@ -13,3 +19,22 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::on_pushAuto_clicked()
+{
+    ui->stackedWidget->setCurrentWidget(ui->pageSelectValue);
+    ui->pageSelectValue->getInfo(1,20);
+    ui->pageSelectValue->setStatus(1);
+}
+
+void MainWindow::pageStatusChange(const ProjectInfo & info, int status)
+{
+    switch (status) {
+    case 1:
+        ui->stackedWidget->setCurrentWidget(ui->pageAutoPack);
+    }
+}
+
+void MainWindow::backMenu()
+{
+    ui->stackedWidget->setCurrentWidget(ui->pageMain);
+}

mainwindow.h

@@ -2,6 +2,8 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include <widget/selectvalueform.h>
+#include "QObject"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -15,6 +17,13 @@ public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
+private slots:
+    void on_pushAuto_clicked();
+
+private:
+    void backMenu();
+    void pageStatusChange(const ProjectInfo & info, int status);
+
 private:
     Ui::MainWindow *ui;
 };

mainwindow.ui

@@ -17,6 +17,9 @@
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
      <widget class="QStackedWidget" name="stackedWidget">
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
       <widget class="QWidget" name="pageMain">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
@@ -235,7 +238,7 @@ color: rgb(255, 255, 255);</string>
            </spacer>
           </item>
           <item>
-           <widget class="QWidget" name="widgetLogin" native="true">
+           <widget class="LoginForm" name="widgetLogin" native="true">
             <property name="minimumSize">
              <size>
               <width>350</width>
@@ -280,6 +283,8 @@ color: rgb(255, 255, 255);</string>
         </item>
        </layout>
       </widget>
+      <widget class="AutoPackForm" name="pageAutoPack"/>
+      <widget class="SelectValueForm" name="pageSelectValue"/>
      </widget>
     </item>
    </layout>
@@ -290,12 +295,32 @@ color: rgb(255, 255, 255);</string>
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>33</height>
+     <height>26</height>
     </rect>
    </property>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LoginForm</class>
+   <extends>QWidget</extends>
+   <header>widget/loginform.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>AutoPackForm</class>
+   <extends>QWidget</extends>
+   <header>widget/autopackform.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>SelectValueForm</class>
+   <extends>QWidget</extends>
+   <header>widget/selectvalueform.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>

widget/loginform.cpp

@@ -35,7 +35,7 @@ void LoginForm::on_pushLogin_clicked()
 
 void  LoginForm::clear(){
     if(_request){
-        delete  _request;
+        _request->deleteLater();
         _request = nullptr;
     }
 }
@@ -56,13 +56,20 @@ void LoginForm::result(int code, const QJsonObject & body)
     ui->status->setVisible(false);
     this->setEnabled(true);
     QString message = body["message"].toString();
+
     if(body.value("code").toInt(404) != 200){
-        QMessageBox msg(QMessageBox::Information, "错误", "用户名或密码错误", QMessageBox::Ok, this);
-        msg.show();
+        QMessageBox msg(QMessageBox::Information, "错误", " 网络异常", QMessageBox::Ok, this);
+        msg.exec();
 //        ui->username->clear();
 //        ui->password->clear();
         return;
     }
+
+    if(message == "未找到用户"){
+        QMessageBox msg(QMessageBox::Information, "错误", "用户名或密码错误", QMessageBox::Ok, this);
+        msg.exec();
+        return;
+    }
     auto data  = body.value("data").toObject();
     UserInfo user;
     user.accountId = data["account_id"].toInt();

widget/selectvalueform.cpp

@@ -29,6 +29,7 @@ void SelectValueForm::getInfo(int page, int pageListNum)
 
 void SelectValueForm::result(int code, const QJsonObject & body)
 {
+    qDebug()<<body;
     if(body.value("code").toInt(404) != 200){
         nowPage = 0;
         pageListNum = 20;