1.更改四处提示文本的内容。2.修改gitignore

.gitignore

@@ -13,4 +13,4 @@
 *.a
 
 /build*
-/test
+/FMVipTest
\ No newline at end of file

FMVip/fmviporder.cpp

@@ -34,10 +34,10 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
     initCouponItems();
     connect(ui->coupon_page, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(onItemClicked(QListWidgetItem*)));
 
-    ui->pay_chk->setText(QString("使用积分最多抵扣 %1 元").arg(orderInfo->getScoreAmount()));
+    ui->pay_chk->setText(QString("使用积分最多可抵用 %1 元").arg(orderInfo->getScoreAmount()));
 
     if(standard_amount > 0) {
-        ui->standard_label->setText(QString("满 %1 元可享受储值金满额支付优惠").arg(standard_amount));
+        ui->standard_label->setText(QString("满 %1 元可享受储值金满额优惠").arg(standard_amount));
     }
     ui->pay_edit->setText(orderInfo->getNeedPayStr());
     ui->pay_edit->setFocus();

FMVip/forms/fmviporder.ui

@@ -177,6 +177,11 @@
   color: rgb(50,50,50);
 }
 
+#standard_label
+{
+  min-height: 50px;
+}
+
 #pay_chk {
   color: rgb(60,60,60);
   font-size: 26px;
@@ -701,7 +706,7 @@
             </size>
            </property>
            <property name="text">
-            <string>满 0 元可享受储值金满额支付优惠</string>
+            <string>满 0 元可享受储值金满额优惠</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
@@ -714,7 +719,7 @@
             <cursorShape>PointingHandCursor</cursorShape>
            </property>
            <property name="text">
-            <string>满 100 元可享受储值金满额支付优惠</string>
+            <string>使用积分最多可抵用 0 元</string>
            </property>
           </widget>
          </item>