1. 修复商品券、代金券描述超过一行时的展示问题。

FMVip/fmcouponwidget.cpp

@@ -7,8 +7,8 @@ FMCouponWidget::FMCouponWidget(Coupon coupon, QWidget *parent) :
     ui(new Ui::FMCouponWidget)
 {
     ui->setupUi(this);
-    ui->desc_lab->setText(coupon.desc);
-    ui->code_lab->setText(coupon.limitTime);
+    ui->coupon_desc_lab->setText(coupon.desc);
+    ui->coupon_limitTime_lab->setText(coupon.limitTime);
 }
 
 FMCouponWidget::~FMCouponWidget()

FMVip/fmviplogin.cpp

@@ -37,11 +37,12 @@ FMVipLogin::~FMVipLogin()
 
 QString FMVipLogin::getVersionInfo()
 {
-    QByteArray versionInfo;
+    QString versionInfo;
     QFile versionFile(qApp->applicationDirPath() + "/version.dat");
     bool isOk = versionFile.open(QIODevice::ReadOnly);
     if(isOk) {
-        versionInfo = versionFile.readAll();
+        QTextStream in(&versionFile);
+        versionInfo = in.readLine();
     } else {
         versionInfo = "未知";
     }

FMVip/forms/fmcouponwidget.ui

@@ -22,7 +22,7 @@
   background-color: rgb(255, 255, 255);
 }
 
-#code_lab
+#coupon_limitTime_lab
 {
   max-height: 15;
   min-height: 15;
@@ -31,7 +31,7 @@
   font: 12px "Microsoft YaHei";
 }
 
-#desc_lab
+#coupon_desc_lab
 {
   font: bold 15px "Microsoft YaHei";
   margin-left: 4px;
@@ -78,7 +78,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="desc_lab">
+      <widget class="QLabel" name="coupon_desc_lab">
        <property name="maximumSize">
         <size>
          <width>16777215</width>
@@ -112,7 +112,7 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="code_lab">
+    <widget class="QLabel" name="coupon_limitTime_lab">
      <property name="text">
       <string>20170508~20170907</string>
      </property>

FMVip/forms/fmvipcouponlist.ui

@@ -173,7 +173,7 @@
   background-color: rgb(255, 255, 255);
 }
 
-#code_lab
+#coupon_limitTime_lab
 {
   max-height: 15;
   min-height: 15;
@@ -181,23 +181,9 @@
   color: rgb(127,127,127);
   font: 12px "Microsoft YaHei";
 }
-#amount_lab, #currency
-{
-  color: rgb(229, 11, 72);
-  font: bold 30px "Microsoft YaHei";
-}
-#currency
-{
-  font: bold 15px;
-  margin-top: 11px;
-}
 
-#desc_lab
+#coupon_desc_lab
 {
-  max-height: 21;
-  min-height: 21;
-  color: rgb(252,255,255);
-  background-color: rgb(229, 11, 72);
   font: bold 15px "Microsoft YaHei";
   margin-left: 4px;
   margin-bottom: 3px;

FMVip/forms/fmviporder.ui

@@ -235,7 +235,6 @@
 
 /*======Coupon======*/
 
-
 #FMCouponWidget
 {
   border: 0 solid white;
@@ -243,7 +242,7 @@
   background-color: rgb(255, 255, 255);
 }
 
-#code_lab
+#coupon_limitTime_lab
 {
   max-height: 15;
   min-height: 15;
@@ -251,23 +250,9 @@
   color: rgb(127,127,127);
   font: 12px "Microsoft YaHei";
 }
-#amount_lab, #currency
-{
-  color: rgb(229, 11, 72);
-  font: bold 30px "Microsoft YaHei";
-}
-#currency
-{
-  font: bold 15px;
-  margin-top: 11px;
-}
 
-#desc_lab
+#coupon_desc_lab
 {
-  max-height: 21;
-  min-height: 21;
-  color: rgb(252,255,255);
-  background-color: rgb(229, 11, 72);
   font: bold 15px "Microsoft YaHei";
   margin-left: 4px;
   margin-bottom: 3px;