1. 修复只向服务器传余额支付金额，没传代金券和积分金额的Bug. 2. 优化网络错误的提示信息。

FMVip/fmvipforward.cpp

@@ -7,6 +7,8 @@
 #include <QDateTime>
 #include <QEventLoop>
 #include <QTimer>
+#include <QSettings>
+#include <QApplication>
 #include "backup/fmbackup.h"
 
 #include <QDebug>
@@ -143,7 +145,18 @@ void FMVipForward::onServerFinished(QNetworkReply *reply, bool isTimeOut)
             posObj["print2"] = "";
         } else {
             posObj["statusCode"] = 404;
-            posObj["msg"] = reply->errorString();
+            QString errCode = QString::number(int(reply->error()));
+            QString errMsg = "网络连接错误(%1): %2";
+            // 获取错误提示
+            QSettings setting(qApp->applicationDirPath()+"/config.ini", QSettings::IniFormat);
+            setting.setIniCodec("GBK");
+            setting.beginGroup("NetworkError");
+            QString errInfo = setting.value(errCode).toString();
+            if (errInfo == "") {
+                errInfo = setting.value("default").toString();
+            }
+            posObj["msg"] = errMsg.arg(errCode).arg(errInfo);
+            setting.endGroup();
             if (isTimeOut) {
                 posObj["msg"] = "向非码服务器请求超时";
             }

FMVip/fmviporder.h

@@ -75,7 +75,7 @@ private:
 
         QString getPayAmountStr(QString amountStr)
         {
-            double payAmount = amountStr.toDouble() * 100;
+            double payAmount = MIN(_needPay, (amountStr.toDouble() + _couponAmount + _useScore)) * 100;
             return QString::number(payAmount);
         }