Skip to content

F
FMVip_LXJ
Commit 53e90ed7 by NitefullWind
Options

合并分支。

parents f06483a1 b8ce864c
Showing with 42 additions and 64 deletions
FMVip_LXJ/res/FMVip.qrc
......@@ -6,12 +6,14 @@
<file>btn_close.png</file>
<file>chk_checked.png</file>
<file>chk_unchecked.png</file>
<file>img_logo.png</file>
<file>img_logo_lxj.png</file>
<file>loading.gif</file>
<file>alert_bg.png</file>
<file>tip_warning.png</file>
<file>coupon_select.png</file>
<file>coupon_separator.png</file>
<file>account.png</file>
<file>num_del.png</file>
<file>img_logo.png</file>
</qresource>
</RCC>
FMVip_LXJ/windows/fmvipfund.cpp
......@@ -74,20 +74,20 @@ void FMVipFund::onDigitChecked(QAbstractButton *btn)
ui->amount_edit->setText(digit);
}
void FMVipFund::on_fund_key_clicked()
{
if(numpad == NULL)
{
numpad = new FMNumPad();
connect(numpad, &FMNumPad::finished, this, &FMVipFund::on_clean_numpad);
connect(numpad, &FMNumPad::digit_click, this, &FMVipFund::on_edit_change);
connect(numpad, &FMNumPad::digit_delete, this, &FMVipFund::on_delete_clicked);
connect(numpad, &FMNumPad::digit_clear, this, &FMVipFund::on_clear_clicked);
connect(numpad, &FMNumPad::digit_confirm, this, &FMVipFund::on_confirm_clicked);
}
numpad->show();
numpad->setGeometry(x() + width(), numpad->y(), numpad->width(), numpad->height());
}
//void FMVipFund::on_fund_key_clicked()
//{
// if(numpad == NULL)
// {
// numpad = new FMNumPad();
// connect(numpad, &FMNumPad::finished, this, &FMVipFund::on_clean_numpad);
// connect(numpad, &FMNumPad::digit_click, this, &FMVipFund::on_edit_change);
// connect(numpad, &FMNumPad::digit_delete, this, &FMVipFund::on_delete_clicked);
// connect(numpad, &FMNumPad::digit_clear, this, &FMVipFund::on_clear_clicked);
// connect(numpad, &FMNumPad::digit_confirm, this, &FMVipFund::on_confirm_clicked);
// }
// numpad->show();
// numpad->setGeometry(x() + width(), numpad->y(), numpad->width(), numpad->height());
//}
void FMVipFund::on_edit_change(QString numkey)
{
......
FMVip_LXJ/windows/fmvipfund.h
......@@ -33,8 +33,8 @@ public slots:
void on_clear_clicked();
void on_confirm_clicked();
private slots:
void on_fund_key_clicked();
//private slots:
// void on_fund_key_clicked();
private:
Ui::FMVipFund *ui;
......
FMVip_LXJ/windows/forms/fmnumpad.ui
......@@ -28,15 +28,15 @@
*/
#title {
background: rgb(154,200,50);
background: #3f783c;
min-height: 32px; max-height: 32px;
border: 1 solid silver;
border-bottom: 0 solid silver;
}
#title_label {
margin-left: 4px;
font: normal 14px &quot;Microsoft YaHei&quot;;
color: white;
font: normal 15px &quot;Microsoft YaHei&quot;;
color: black;
}
#close_btn {
min-width: 32px; min-height: 32px;
......@@ -61,7 +61,7 @@ QPushButton {
}
QPushButton:hover {
background: rgb(154,200,50);
background: #7aad65;
color: white;
padding: 2 0 0 2;
}
......@@ -255,8 +255,11 @@ QPushButton:hover {
</item>
<item row="0" column="3">
<widget class="QPushButton" name="backspace_btn">
<property name="styleSheet">
<string notr="true">background-image: url(:/num_del.png);</string>
</property>
<property name="text">
<string>删除</string>
<string/>
</property>
</widget>
</item>
......
FMVip_LXJ/windows/forms/fmvipfund.ui
......@@ -43,14 +43,14 @@
*/
#title {
background: rgb(133, 194, 38);
background: #3f783c;
min-height: 62px; max-height: 62px;
border: 1 solid silver;
border-bottom: 0 solid silver;
}
#logo_label {
min-width: 153px; min-height: 69px;
border-image: url(&quot;:/img_logo.png&quot;);
border-image: url(&quot;:/img_logo_lxj.png&quot;);
}
#close_btn {
min-width: 53px; min-height: 53px;
......@@ -89,7 +89,8 @@
}
#amount QPushButton:checked {
background: rgb(47,165,253);
/*background: rgb(47,165,253);*/
background : #7aad65;
border: 0;
color: white;
}
......@@ -104,7 +105,7 @@
}
#amount_edit {
border: 1 solid silver;
border-width: 1 0 1 0;
border-width: 1 1 1 0;
background: white;
/*
min-height: 72px; max-height: 72px;
......@@ -116,6 +117,7 @@
QPushButton#fund_btn {
background: rgb(222,88,51);
background: #24b1f1;
color: white;
min-height: 72px; max-height: 72px;
border: 0;
......@@ -635,38 +637,6 @@ QPushButton#fund_btn:hover {
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="fund_key">
<property name="minimumSize">
<size>
<width>45</width>
<height>74</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>45</width>
<height>74</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">#fund_key {
border: 1 solid silver;
border-left: 0px;
color: rgb(130,130,130);
background-color: rgb(255, 255, 255);
font: 13px &quot;微软雅黑&quot;;
}
#fund_key:hover {
color: rgb(37, 176, 246);
}</string>
</property>
<property name="text">
<string>键盘</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
......
FMVip_LXJ/windows/forms/fmviplogin.ui
......@@ -39,14 +39,15 @@
*/
#title {
background: rgb(133, 194, 38);
/*background: rgb(133, 194, 38);*/
background: #3f783c;
min-height: 48px; max-height: 48px;
border: 1 solid silver;
border-bottom: 0 solid silver;
}
#logo_label {
min-width: 110px; min-height: 48px;
border-image: url(&quot;:/img_logo.png&quot;);
border-image: url(&quot;:/img_logo_lxj.png&quot;);
margin-left: 12px;
}
#close_btn {
......@@ -84,7 +85,7 @@
#login_btn {
min-height: 56px;
background: rgb(37,176,241);
background: rgb(122,172,101);
font: 400 23px &quot;Microsoft YaHei&quot;;
color: white;
border: 1 solid white;
......
FMVip_LXJ/windows/forms/fmviporder.ui
......@@ -39,14 +39,15 @@
*/
#title {
background: rgb(133, 194, 38);
/*background: rgb(133, 194, 38);*/
background: rgb(64,119,61);
min-height: 62px; max-height: 62px;
border: 1 solid silver;
border-bottom: 0 solid silver;
}
#logo_label {
min-width: 153px; min-height: 69px;
border-image: url(&quot;:/img_logo.png&quot;);
border-image: url(&quot;:/img_logo_lxj.png&quot;);
}
#close_btn {
min-width: 53px; min-height: 53px;
......
FMVip_LXJ/windows/forms/fmvippanel.ui
......@@ -44,13 +44,14 @@
#title {
background: rgb(133, 194, 38);
background: #3f783c;
min-height: 62px; max-height: 62px;
border: 1 solid silver;
border-bottom: 0 solid silver;
}
#logo_label {
min-width: 153px; min-height: 69px;
border-image: url(&quot;:/img_logo.png&quot;);
border-image: url(&quot;:/img_logo_lxj.png&quot;);
}
#close_btn {
min-width: 53px; min-height: 53px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment