Skip to content

F
FMVip_Today
Commit a605691c by NitefllWind
Options

1.重新实现代金券勾选功能。2.修复代金券有时显示不全的bug。3.美化代金券、登陆界面、弹框界面。4.新增程序启动后消息提示。

parent e2aad1ef
Showing with 150 additions and 208 deletions
FMVip/fmmsgwnd.cpp
......@@ -6,6 +6,7 @@ FMMsgWnd::FMMsgWnd(FMVipWnd *parent) :
ui(new Ui::FMMsgWnd)
{
ui->setupUi(this);
setAttribute(Qt::WA_TranslucentBackground);
}
FMMsgWnd::~FMMsgWnd()
......@@ -38,7 +39,6 @@ void FMMsgWnd::show(InfoType type, const QString &info)
ui->alertIconLab->setText(iconUrl);
}else{
QPixmap icon(iconUrl);
icon = icon.scaled(QSize(50,50), Qt::KeepAspectRatio);
ui->alertIconLab->setPixmap(icon);
}
......
FMVip/fmvipdispatcher.cpp
......@@ -28,17 +28,25 @@ FMVipDispatcher::FMVipDispatcher(QObject *parent)
_sysIcon->setIcon(icon);
_sysIcon->setToolTip("FMVIP");
QMenu *menu = new QMenu();
QAction *action = new QAction("退出", this);
auto menu = new QMenu();
auto action = new QAction("退出", this);
connect(action, SIGNAL(triggered(bool)), this, SLOT(onQuit()));
menu->addAction(action);
// menu->addAction(addAction("退出", [=](){
// this->_ParseRequest("{\"fm_cmd\":\"-1\"}");
// });)
_sysIcon->setContextMenu(menu);
connect(_sysIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(onActiveSysTrayIcon(QSystemTrayIcon::ActivationReason)));
_sysIcon->show();
_sysIcon->showMessage("非码VIP提醒", "非码VIP程序已启动");
}
FMVipDispatcher::~FMVipDispatcher()
{
if(_sysIcon != NULL)
{
delete _sysIcon;
_sysIcon = NULL;
}
}
void FMVipDispatcher::onQuit()
......@@ -204,6 +212,7 @@ void FMVipDispatcher::onServerResponsed(const QJsonObject &rspObj)
FMMsgWnd::FailureWnd("请使用支付码付款");
return;
}
isPayLogin = false;
}
_vindow->deleteLater();
}
......@@ -263,8 +272,6 @@ void FMVipDispatcher::pay()
FMVipForward::instance()->addSessionData("needPay", QString::number(needPay));
FMVipForward::instance()->addSessionData("standard_amount", QString::number(standard_amount));
// int canPay = FMVipForward::instance()->sessionDataInt("canPay");
if (!_vindow) {
FMVipOrder *order = new FMVipOrder;
connect(order, SIGNAL(destroyed(QObject*)), SLOT(onFinished()));
......@@ -277,8 +284,6 @@ void FMVipDispatcher::pay()
void FMVipDispatcher::fund()
{
// _posReqObj["fm_cmd"] = Type_Fund;
FMVipForward::instance()->addSessionData("charge_amount", QString::number(_posReqObj["charge_amount"].toInt()));
if (!_vindow) {
......
FMVip/fmvipdispatcher.h
......@@ -20,6 +20,7 @@ class FMVipDispatcher : public QObject, public FMApiRelay
Q_OBJECT
public:
explicit FMVipDispatcher(QObject *parent = 0);
~FMVipDispatcher();
private:
void login();
......
FMVip/fmviplogin.cpp
......@@ -25,9 +25,9 @@ FMVipLogin::FMVipLogin(bool isMustPayCode, QDialog *parent) :
if(isMustPayCode)
{
ui->login_edit->setPlaceholderText("支付码");
ui->login_edit->setPlaceholderText("输入支付码");
}else{
ui->login_edit->setPlaceholderText("手机号/账号/支付码");
ui->login_edit->setPlaceholderText("输入手机号/账号/支付码");
}
}
......
FMVip/fmviporder.cpp
......@@ -29,25 +29,23 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
ui->price_label->setText(orderInfo->getNeedPayStr());
ui->name_label->setText(name);
// ui->coupon_page->setViewMode(QListView::IconMode);
// ui->coupon_page->setResizeMode(QListView::Adjust);
// ui->coupon_page->setMovement(QListView::Static);
couponMap = FMVipForward::instance()->sessionCouponMap();
for(Coupon coupon : couponMap.values())
orderInfo->couponMap = FMVipForward::instance()->sessionCouponMap();
for(Coupon coupon : orderInfo->couponMap.values())
{
auto item = new QListWidgetItem();
item->setData(Coupon_Code, coupon.code);
item->setData(Qt::UserRole, coupon.code);
ui->coupon_page->addItem(item);
FMCouponWidget *itemWidget = new FMCouponWidget(coupon, ui->coupon_page);
// itemWidget->show();
ui->coupon_page->update();
FMCouponWidget *itemWidget = new FMCouponWidget(coupon);
ui->coupon_page->setItemWidget(item, itemWidget);
qDebug() << ui->coupon_page->itemWidget(item) << "=======";
//item大小
item->setSizeHint (QSize(itemWidget->rect().width(), itemWidget->rect().height()));
item->setSizeHint (itemWidget->size());
}
connect(ui->coupon_page, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(on_item_clicked(QListWidgetItem*)));
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));
......@@ -69,23 +67,7 @@ FMVipOrder::~FMVipOrder()
void FMVipOrder::on_pay_btn_clicked()
{
int count = ui->coupon_page->count();
QStringList checkedCode;
for(int i=0; i<count; ++i)
{
auto item = ui->coupon_page->item(i);
if(item->checkState() == Qt::Checked) {
checkedCode << item->data(Coupon_Code).toString();
}
}
for(QString key : couponMap.keys())
{
if(checkedCode.indexOf(key) == -1)
{
couponMap.remove(key);
}
}
FMVipForward::instance()->setSessionCouponMap(couponMap);
FMVipForward::instance()->setSessionCouponMap(orderInfo->selectCouponMap);
QString codeAmountStr = orderInfo->getPayAmountStr(ui->pay_edit->text());
FMVipForward::instance()->addSessionData("codeAmount", codeAmountStr);
......@@ -103,33 +85,22 @@ void FMVipOrder::on_pay_chk_clicked(bool checked)
FMVipForward::instance()->addSessionData("isUseScore", QString::number(is));
}
void FMVipOrder::on_item_clicked(QListWidgetItem *item)
void FMVipOrder::onItemClicked(QListWidgetItem *item)
{
qDebug() << item->data(Coupon_Code);
QString code = item->data(Qt::UserRole).toString();
// 选中代金券
if (item->isSelected()) {
ui->coupon_page->itemWidget(item)->setStyleSheet("#FMCouponWidget{background-color: rgb(255, 255, 255); border: none; border-image: url(:/coupon_select.png);}");
orderInfo->selectCouponMap[code] = orderInfo->couponMap[code];
if(orderInfo->enoughCoupon())
{
FMMsgWnd::WarningWnd("请注意代金券总额已超过待付金额！");
}
}
// 取消代金券
else {
ui->coupon_page->itemWidget(item)->setStyleSheet("#FMCouponWidget{background-color: rgb(255, 255, 255); border: none; border-left: 5 solid rgb(255, 170, 37);");
ui->coupon_page->itemWidget(item)->setStyleSheet("#FMCouponWidget{background-color: rgb(255, 255, 255); border: none; border-left: 5 solid rgb(255, 170, 37);}");
orderInfo->selectCouponMap.remove(code);
}
// if(item != NULL)
// {
// Qt::CheckState state = item->checkState();
// double amount = item->data(Coupon_Amount).toDouble();
// bool isAddCoupon = false;
// switch (state) {
// case Qt::Checked:
// item->setCheckState(Qt::Unchecked);
// break;
// case Qt::Unchecked:
// item->setCheckState(Qt::Checked);
// isAddCoupon = true;
// default:
// break;
// }
// bool isOK = orderInfo->setCouponAmount(isAddCoupon, amount);
// if(!isOK){
// FMMsgWnd::WarningWnd("请注意代金券总额已超过待付金额！");
// }
// }
}
FMVip/fmviporder.h
......@@ -23,7 +23,7 @@ public slots:
void on_pay_btn_clicked();
void on_pay_chk_clicked(bool checked);
void on_item_clicked(QListWidgetItem*);
void onItemClicked(QListWidgetItem*);
private:
enum DataIndex
......@@ -38,7 +38,7 @@ private:
OrderInfo()
{
_amountStr = _scoreStr = _needPayStr = "";
_amount = _score = _needPay = _couponAmount = 0.0;
_amount = _score = _needPay;
}
OrderInfo(QString amountStr, QString scoreStr, QString needPayStr)
{
......@@ -50,7 +50,6 @@ private:
_score = _scoreStr.toInt() / 100.0;
_needPay = _needPayStr.toInt() / 100.0;
_couponAmount = 0.0;
}
QString getAmountStr()
......@@ -74,30 +73,30 @@ private:
return QString::number(payAmount);
}
// 可以正常加时返回true，否则返回false
bool setCouponAmount(bool isAdd, double amount)
// 代金券总额超过待付时范围true
bool enoughCoupon()
{
bool isOK = true;
if(isAdd) {
_couponAmount += amount;
isOK = (_couponAmount <= _needPay);
}else{
_couponAmount -= amount;
double coupon_amount = 0.0;
for(auto coupon : selectCouponMap)
{
coupon_amount += coupon.disAmount;
}
return isOK;
bool isEnough = (coupon_amount > _needPay);
return isEnough;
}
public:
QMap<QString, Coupon> couponMap;
QMap<QString, Coupon> selectCouponMap;
private:
QString _amountStr, _scoreStr, _needPayStr;
double _amount, _score, _needPay;
double _couponAmount;
};
private:
Ui::FMVipOrder *ui;
FMVipOrder::OrderInfo *orderInfo;
QMap<QString, Coupon> couponMap;
};
#endif // FMVIPORDER_H
FMVip/forms/fmcouponwidget.ui
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>234</width>
<height>120</height>
<width>220</width>
<height>116</height>
</rect>
</property>
<property name="windowTitle">
......@@ -24,54 +24,42 @@
#code_lab
{
max-height: 22;
min-height: 22;
max-height: 15;
min-height: 15;
padding-bottom: 3px;
color: rgb(127,127,127);
font: 15px &quot;Microsoft YaHei&quot;;
font: 12px &quot;Microsoft YaHei&quot;;
}
#amount_lab, #currency
{
color: rgb(229, 11, 72);
font: bold 36px &quot;Microsoft YaHei&quot;;
font: bold 30px &quot;Microsoft YaHei&quot;;
}
#currency
{
font: bold 15px;
margin-top: 11px;
}
#desc_lab
{
max-height: 36;
min-height: 36;
max-height: 21;
min-height: 21;
color: rgb(252,255,255);
background-color: rgb(229, 11, 72);
font: bold 18px &quot;Microsoft YaHei&quot;;
font: bold 15px &quot;Microsoft YaHei&quot;;
margin-left: 4px;
padding: 0 16 0 16;
margin-bottom: 3px;
padding: 0 10 0 10;
}
#coupon_separator
{
max-height: 1px;
background-image: url(:/coupon_separator.png);
background-repeat: none;
background-position: center;
margin-bottom: 5px;
border-image: url(:/coupon_separator.png);
margin: 0 6 10 6;
}</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
......@@ -111,6 +99,9 @@
<property name="text">
<string>￥</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
......@@ -151,7 +142,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>10</height>
</size>
</property>
</spacer>
......@@ -161,7 +152,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>36</height>
<height>24</height>
</size>
</property>
<property name="text">
......@@ -171,7 +162,7 @@
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>
......@@ -183,7 +174,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>10</height>
</size>
</property>
</spacer>
......@@ -201,8 +192,6 @@
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
......
FMVip/forms/fmmsgwnd.ui
......@@ -6,28 +6,10 @@
<rect>
<x>0</x>
<y>0</y>
<width>300</width>
<height>181</height>
<width>425</width>
<height>290</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>181</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>181</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="mouseTracking">
<bool>false</bool>
</property>
......@@ -36,35 +18,42 @@
</property>
<property name="styleSheet">
<string notr="true">
#FMMsgWnd{
min-width: 425px; min-height: 290;
border-image:url(&quot;:/alert_bg.png&quot;);
background: transparent;
}
#alertIconLab
{
image:url(&quot;:/tip_error.png&quot;);
}
#close_btn {
min-width: 30px; min-height: 30px;
max-width: 30px; max-height: 30px;
margin-left: 260;
border-image: url(&quot;:/btn_alert_close.png&quot;);
}
<!-- #close_btn:hover{
min-width: 51px; min-height: 51px;
border-image: url(&quot;:/btn_alert_close.png&quot;);
} -->
#alertLabMsg
{
color: rgb(129, 129, 129);
font: normal 19px &quot;Microsoft YaHei&quot;
}
#alertBtnOk
{
max-width: 180px; max-height: 45px;
color: rgb(255, 255, 255);
background-color: rgb(25, 162, 25);
background-color: rgb(221, 88, 51);
border-radius: 3px;
font: normal 22px &quot;Microsoft YaHei&quot;
}
#alertBtnOk:pressed
{
color: rgb(161, 161, 161);
background-color: rgb(25, 162, 25);
background-color: rgb(221, 88, 51);
border-radius: 3px;
}
</string>
......@@ -83,37 +72,18 @@
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>20</number>
</property>
<item>
<widget class="QPushButton" name="close_btn">
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>10</number>
<number>0</number>
</property>
<item>
<widget class="QLabel" name="alertIconLab">
<property name="minimumSize">
<size>
<width>50</width>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>50</height>
</size>
</property>
<property name="text">
<string>Icon</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
......@@ -144,20 +114,8 @@
</property>
<item>
<widget class="QPushButton" name="alertBtnOk">
<property name="minimumSize">
<size>
<width>50</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>确定</string>
<string>关闭</string>
</property>
</widget>
</item>
......
FMVip/forms/fmviplogin.ui
......@@ -40,17 +40,19 @@
#title {
background: rgb(154,200,50);
min-height: 62px; max-height: 62px;
min-height: 48px; max-height: 48px;
border: 1 solid silver;
border-bottom: 0 solid silver;
}
#logo_label {
min-width: 153px; min-height: 69px;
min-width: 110px; min-height: 48px;
border-image: url(&quot;:/img_logo.png&quot;);
margin-left: 12px;
}
#close_btn {
min-width: 53px; min-height: 53px;
min-width: 50px; min-height: 50px;
border-image: url(&quot;:/btn_close.png&quot;);
margin-right: 12px;
}
#close_btn:hover{
......@@ -64,31 +66,29 @@
#mobile_label {
color: rgb(169,169,169);
image: url(&quot;:/account.png&quot;);
background: white;
border: 1 solid silver;
border-right: 0;
padding-left: 20;
min-width: 64; max-width: 64;
min-width: 49; max-width: 49;
}
#login_edit {
min-height: 60px;
border: 1 solid silver;
font: 100 30px &quot;Microsoft YaHei&quot;;
min-height: 49px;
font: 100 19px &quot;Microsoft YaHei&quot;;
color: rgb(50,50,50);
background: white;
border: 1 solid silver;
border-left: 0;
<!-- margin-left: -82; -->
}
#login_btn {
min-height: 70px;
min-height: 56px;
background: rgb(37,176,241);
font: 400 28px &quot;Microsoft YaHei&quot;;
font: 400 23px &quot;Microsoft YaHei&quot;;
color: white;
border: 0 solid white;
border-right: 1 solid silver;
border: 1 solid white;
border-right: 0 solid silver;
}
#pay_btn:hover {
padding: 2 0 0 2;
......@@ -100,11 +100,11 @@
#tip, #tip QLabel {
background: rgb(100,100,100);
color: rgb(252,252,252);
font-size: 18px;
font-size: 14px;
border-bottom: 1 solid silver;
}
#tip {
min-height: 40px;
min-height: 30px;
border: 1 solid silver;
border-top: 0;
}
......@@ -191,7 +191,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>130</height>
</size>
</property>
</spacer>
......@@ -200,7 +200,7 @@
<widget class="QWidget" name="user" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>60</number>
<number>44</number>
</property>
<property name="leftMargin">
<number>124</number>
......@@ -221,9 +221,6 @@
</property>
<item>
<widget class="QLabel" name="mobile_label">
<property name="text">
<string>账号</string>
</property>
<property name="margin">
<number>0</number>
</property>
......
FMVip/forms/fmviporder.ui
......@@ -216,6 +216,7 @@
/*======Coupon======*/
#FMCouponWidget
{
border: 0 solid white;
......@@ -225,35 +226,40 @@
#code_lab
{
max-height: 22;
min-height: 22;
max-height: 15;
min-height: 15;
padding-bottom: 3px;
color: rgb(127,127,127);
font: 15px &quot;Microsoft YaHei&quot;;
font: 12px &quot;Microsoft YaHei&quot;;
}
#amount_lab, #currency
{
color: rgb(229, 11, 72);
font: bold 36px &quot;Microsoft YaHei&quot;;
font: bold 30px &quot;Microsoft YaHei&quot;;
}
#currency
{
font: bold 15px;
margin-top: 11px;
}
#desc_lab
{
max-height: 36;
min-height: 36;
max-height: 21;
min-height: 21;
color: rgb(252,255,255);
background-color: rgb(229, 11, 72);
font: bold 18px &quot;Microsoft YaHei&quot;;
font: bold 15px &quot;Microsoft YaHei&quot;;
margin-left: 4px;
padding: 0 16 0 16;
margin-bottom: 3px;
padding: 0 10 0 10;
}
#coupon_separator
{
max-height: 1px;
background-image: url(:/coupon_separator.png);
background-repeat: none;
background-position: center;
margin-bottom: 5px;
border-image: url(:/coupon_separator.png);
margin: 0 6 10 6;
}</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
......@@ -507,7 +513,7 @@
<item>
<widget class="QLabel" name="coupon_desc_label">
<property name="text">
<string>代金券</string>
<string>代 金 券</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
......@@ -536,12 +542,27 @@
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="movement">
<enum>QListView::Static</enum>
</property>
<property name="spacing">
<number>10</number>
</property>
<property name="gridSize">
<size>
<width>230</width>
<height>124</height>
</size>
</property>
<property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
<property name="modelColumn">
<number>0</number>
</property>
<property name="uniformItemSizes">
<bool>true</bool>
</property>
<property name="widgetResizable" stdset="0">
<bool>true</bool>
</property>
......
FMVip/res/FMVip.qrc
......@@ -16,5 +16,6 @@
<file>tip_warning.png</file>
<file>coupon_select.png</file>
<file>coupon_separator.png</file>
<file>account.png</file>
</qresource>
</RCC>
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