显示优化完成

bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -85,7 +85,7 @@
 						<Control bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="310,10,331,34" mouse="false"></Control>
 						<Label text="现金支付" width="110" height="35" font="3" float="true" pos="290,35,400,70" textcolor="#FFFFFFFF" mouse="false"></Label>
 						
-						<Button name="btn_diandan_gengduozhifu_pay" text="" heiht="75" width="110" padding="15,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+						<Button name="btn_diandan_gengduozhifu_pay" text="" heiht="75" width="114" padding="15,0,0,15" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
 						<Control bkimage="gengduozhifu_icon.png" width="21" height="21" float="true" pos="435,10,321,31" mouse="false"></Control>
 						<Label text="更多支付" width="110" height="35" font="3" float="true" pos="415,35,525,70" mouse="false"></Label>
 					</HorizontalLayout>
@@ -116,7 +116,7 @@
 				</HorizontalLayout>
 			</VerticalLayout>
 			
-			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false" hscrollbar="true">
+			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFFFFFFF" visible="false">
 				<VerticalLayout width="420">
 					<Label text="选择优惠" width="100" height="58" padding="20,0,0,0" font="diandan_1"></Label>
 					
@@ -187,7 +187,7 @@
 				
 				<Control width="1" bkcolor="#FFEBE8E8"></Control>
 				
-				<VerticalLayout minwidth="620" maxwidth="870">
+				<VerticalLayout vscrollbar="true">
 					<Label text="账单明细" height="58" padding="20,0,0,0" font="diandan_1"></Label>
 					
 					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
@@ -207,41 +207,41 @@
 					
 					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
 					
-					<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout" height="300">
-						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="180" hegiht="80" float="true" pos="20,20,200,100">
-							<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" heiht="80" width="180" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
-							<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="80,10,104,32" mouse="false"></Control>
-							<Label name="zhifu_name" text="微信支付/支付宝" width="180" height="35" font="2" float="true" pos="35,35,215,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+					<HorizontalLayout name="diandan_jiesuan_zhifufangshi_layout">
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_weixinzhifu" width="120" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_weixinzhifu_btn" text="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF4242"></Button>
+							<Control name="zhifu_icon" bkimage="weixinzhifu_icon.png" width="24" height="22" float="true" pos="53,10,77,32" mouse="false"></Control>
+							<Label name="zhifu_name" text="微信支付/支付宝" width="180" height="35" font="3" float="true" pos="10,35,190,70" textcolor="#FFFFFFFF" mouse="false"></Label>
 						</HorizontalLayout>
 						
-						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="180" hegiht="80" float="true" pos="220,20,400,100">
-							<Button name="diandan_jiesuan_zhifufangshi_huiyuan_btn" text="" heiht="80" width="180" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
-							<Control name="zhifu_icon" bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="80,10,106,30" mouse="false"></Control>
-							<Label name="zhifu_name" text="会员支付" width="180" height="35" font="2" float="true" pos="65,35,245,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_huiyuan" width="120" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_huiyuan_btn" text="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFFF8910"></Button>
+							<Control name="zhifu_icon" bkimage="huiyuanzhifu_icon.png" width="26" height="20" float="true" pos="50,10,76,30" mouse="false"></Control>
+							<Label name="zhifu_name" text="会员支付" width="180" height="35" font="3" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
 						</HorizontalLayout>
 						
-						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_xianjin" width="180" hegiht="80" float="true" pos="420,20,600,100">
-							<Button name="diandan_jiesuan_zhifufangshi_xianjin_btn" text="" heiht="80" width="180" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
-							<Control name="zhifu_icon" bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="85,10,106,34" mouse="false"></Control>
-							<Label name="zhifu_name" text="现金支付" width="180" height="35" font="2" float="true" pos="65,35,245,70" textcolor="#FFFFFFFF" mouse="false"></Label>
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_xianjin" width="120" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_xianjin_btn" text="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF52CB4B"></Button>
+							<Control name="zhifu_icon" bkimage="xianjinzhifu_icon.png" width="21" height="24" float="true" pos="50,10,71,34" mouse="false"></Control>
+							<Label name="zhifu_name" text="现金支付" width="180" height="35" font="3" float="true" pos="30,35,210,70" textcolor="#FFFFFFFF" mouse="false"></Label>
 						</HorizontalLayout>
 						
-						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_gouwuka" width="182" hegiht="82" float="true" pos="20,120,200,200">
-							<Button name="diandan_jiesuan_zhifufangshi_gouwuka_btn" text="" heiht="80" width="180" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-							<Control name="zhifu_icon" bkimage="gouwuka_icon.png" width="34" height="28" float="true" pos="73,10,107,38" mouse="false"></Control>
-							<Label name="zhifu_name" text="购物卡" width="180" height="35" font="2" float="true" pos="65,35,245,70" mouse="false"></Label>
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_gouwuka" width="122" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_gouwuka_btn" text="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<Control name="zhifu_icon" bkimage="gouwuka_icon.png" width="34" height="28" float="true" pos="45,10,79,38" mouse="false"></Control>
+							<Label name="zhifu_name" text="购物卡" width="180" height="35" font="3" float="true" pos="38,35,218,70" mouse="false"></Label>
 						</HorizontalLayout>
 						
-						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_meishicheng" width="182" hegiht="82" float="true" pos="220,120,400,200">
-							<Button name="diandan_jiesuan_zhifufangshi_meishicheng_btn" text="" heiht="80" width="180" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-							<Control name="zhifu_icon" bkimage="meishicheng_icon.png" width="37" height="27" float="true" pos="73,10,110,37" mouse="false"></Control>
-							<Label name="zhifu_name" text="美食城临时卡" width="180" height="35" font="2" float="true" pos="45,35,225,70" mouse="false"></Label>
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_meishicheng" width="122" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_meishicheng_btn" text="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<Control name="zhifu_icon" bkimage="meishicheng_icon.png" width="37" height="27" float="true" pos="48,10,85,37" mouse="false"></Control>
+							<Label name="zhifu_name" text="美食城临时卡" width="180" height="35" font="3" float="true" pos="25,35,205,70" mouse="false"></Label>
 						</HorizontalLayout>
 						
-						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_fulika" width="182" hegiht="82" float="true" pos="420,120,600,200">
-							<Button name="diandan_jiesuan_zhifufangshi_fulika_btn" text="" heiht="80" width="180" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
-							<Control name="zhifu_icon" bkimage="fulika_icon.png" width="30" height="30" float="true" pos="73,10,103,40" mouse="false"></Control>
-							<Label name="zhifu_name" text="福利卡" width="180" height="35" font="2" float="true" pos="65,35,245,70" mouse="false"></Label>
+						<HorizontalLayout name="diandan_jiesuan_zhifufangshi_fulika" width="122" hegiht="80" float="true">
+							<Button name="diandan_jiesuan_zhifufangshi_fulika_btn" text="" heiht="80" width="120" padding="0,0,0,0" textcolor="#FF999999" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFC1C1C1" bkcolor="#FFF7F7F7"></Button>
+							<Control name="zhifu_icon" bkimage="fulika_icon.png" width="30" height="30" float="true" pos="48,10,78,40" mouse="false"></Control>
+							<Label name="zhifu_name" text="福利卡" width="180" height="35" font="3" float="true" pos="40,35,220,70" mouse="false"></Label>
 						</HorizontalLayout>
 					</HorizontalLayout>
 				</VerticalLayout>

bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_shoukuan_wnd.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="800,740" caption="0,0,0,44" roundcorner="4,4" >
+<Window size="800,720" caption="0,0,0,44" roundcorner="4,4" >
 	<Font id="0" name="微软雅黑" size="24" />
 	<Font id="1" name="微软雅黑" size="40" />
 	<Font id="2" name="微软雅黑" size="18" />
@@ -10,7 +10,7 @@
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
-		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" padding="0,20,0,0">			
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" padding="0,15,0,0">			
 			<HorizontalLayout name="shoukuan_money_show_layout" height="50" padding="0,15,0,15">
 				<Label text="¥" font="0" textcolor="0xFF3CB371" float="true" pos="320,24,335,50"/>
 				<Label name="shoukuan_money_show_money" font="1" textcolor="0xFF3CB371" float="true" pos="345,12,620,48"/>

bin/Win32/Debug/zhipuzi_pos_windows/skin/main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="960,680" sizebox="4,4,6,6" caption="0,0,0,90" mininfo="960,680" roundcorner="5,5" showdirty="false" >
+<Window size="1366,738" sizebox="4,4,6,6" caption="0,0,0,90" mininfo="1366,738" roundcorner="5,5" showdirty="false" >
 	<Font shared="true" id="0" name="微软雅黑" size="16" default="true" />
 	<Font id="1" name="宋体" size="18" bold="false" />
 	<Font id="10" name="微软雅黑" size="28" />

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -53,6 +53,9 @@ void CDiandanPageUI::InitShow()
 
 	//展示选购页面
 	this->ShowXuangouPage();
+
+	//初始化结算页面的支付方式
+	this->InitJiesuanZhifu();
 }
 
 void CDiandanPageUI::RefreshShow()
@@ -329,9 +332,11 @@ void CDiandanPageUI::InitJiesuanShow()
 	m_moling_type = 0;
 	CCheckBoxUI* pMolingCheck = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("diandan_jiesuan_moling_bumoling")));
 	pMolingCheck->Selected(true, false);
+}
 
-	//添加支付方式
-	CHorizontalLayoutUI* pZhifufangshiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_zhifufangshi_layout")));
+void CDiandanPageUI::InitJiesuanZhifu()
+{
+	CShopinfo shopinfo = CShopinfo::m_shopinfo;
 
 	int num = 0;
 
@@ -341,18 +346,6 @@ void CDiandanPageUI::InitJiesuanShow()
 		//展示微信支付，并且调整位置
 		pWeixinLayout->SetVisible(true);
 
-		int curRow = num / 3 + 1;
-		int curCol = num % 3 + 1;
-
-		RECT rect;
-		rect.left = (curCol - 1) * 200 + 20;
-		rect.right = rect.left + 180;
-		rect.top = (curRow - 1) * 100 + 20;
-		rect.bottom = rect.top + 80;
-
-		pWeixinLayout->SetFloat(true);
-		pWeixinLayout->SetPos(rect);
-
 		num++;
 	}
 	else
@@ -366,18 +359,6 @@ void CDiandanPageUI::InitJiesuanShow()
 	{
 		pHuiyuanLayout->SetVisible(true);
 
-		int curRow = num / 3 + 1;
-		int curCol = num % 3 + 1;
-
-		RECT rect;
-		rect.left = (curCol - 1) * 200 + 20;
-		rect.right = rect.left + 180;
-		rect.top = (curRow - 1) * 100 + 20;
-		rect.bottom = rect.top + 80;
-
-		pHuiyuanLayout->SetFloat(true);
-		pHuiyuanLayout->SetPos(rect);
-
 		num++;
 	}
 	else
@@ -391,18 +372,6 @@ void CDiandanPageUI::InitJiesuanShow()
 	{
 		pXianjinLayout->SetVisible(true);
 
-		int curRow = num / 3 + 1;
-		int curCol = num % 3 + 1;
-
-		RECT rect;
-		rect.left = (curCol - 1) * 200 + 20;
-		rect.right = rect.left + 180;
-		rect.top = (curRow - 1) * 100 + 20;
-		rect.bottom = rect.top + 80;
-
-		pXianjinLayout->SetFloat(true);
-		pXianjinLayout->SetPos(rect);
-
 		num++;
 	}
 	else
@@ -416,18 +385,6 @@ void CDiandanPageUI::InitJiesuanShow()
 	{
 		pGouwukaLayout->SetVisible(true);
 
-		int curRow = num / 3 + 1;
-		int curCol = num % 3 + 1;
-
-		RECT rect;
-		rect.left = (curCol - 1) * 200 + 20;
-		rect.right = rect.left + 180;
-		rect.top = (curRow - 1) * 100 + 20;
-		rect.bottom = rect.top + 80;
-
-		pGouwukaLayout->SetFloat(true);
-		pGouwukaLayout->SetPos(rect);
-
 		num++;
 	}
 	else
@@ -441,18 +398,6 @@ void CDiandanPageUI::InitJiesuanShow()
 	{
 		pMeishichengLayout->SetVisible(true);
 
-		int curRow = num / 3 + 1;
-		int curCol = num % 3 + 1;
-
-		RECT rect;
-		rect.left = (curCol - 1) * 200 + 20;
-		rect.right = rect.left + 180;
-		rect.top = (curRow - 1) * 100 + 20;
-		rect.bottom = rect.top + 80;
-
-		pMeishichengLayout->SetFloat(true);
-		pMeishichengLayout->SetPos(rect);
-
 		num++;
 	}
 	else
@@ -466,18 +411,6 @@ void CDiandanPageUI::InitJiesuanShow()
 	{
 		pFulikaLayout->SetVisible(true);
 
-		int curRow = num / 3 + 1;
-		int curCol = num % 3 + 1;
-
-		RECT rect;
-		rect.left = (curCol - 1) * 200 + 20;
-		rect.right = rect.left + 180;
-		rect.top = (curRow - 1) * 100 + 20;
-		rect.bottom = rect.top + 80;
-
-		pFulikaLayout->SetFloat(true);
-		pFulikaLayout->SetPos(rect);
-
 		num++;
 	}
 	else
@@ -485,6 +418,8 @@ void CDiandanPageUI::InitJiesuanShow()
 		pFulikaLayout->SetVisible(false);
 	}
 
+	CHorizontalLayoutUI* pZhifufangshiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_zhifufangshi_layout")));
+
 	//接着添加自定义支付的
 	for (std::vector<SelfPay>::iterator it = shopinfo.m_self_pay.begin(); it != shopinfo.m_self_pay.end(); it++)
 	{
@@ -494,7 +429,7 @@ void CDiandanPageUI::InitJiesuanShow()
 		{
 			CButtonUI* newButton = new CButtonUI();
 
-			newButton->SetFixedWidth(180);
+			newButton->SetFixedWidth(120);
 			newButton->SetFixedHeight(80);
 			newButton->SetText(CLewaimaiString::UTF8ToUnicode(selfpay.name).c_str());
 
@@ -509,24 +444,51 @@ void CDiandanPageUI::InitJiesuanShow()
 			//必须先Add，才能调用下面的SetPos，否则无效
 			pZhifufangshiLayout->Add(newButton);
 
-			int curRow = num / 3 + 1;
-			int curCol = num % 3 + 1;
+			num++;
+		}
+	}
 
-			RECT rect;
-			rect.left = (curCol - 1) * 200 + 20;
-			rect.right = rect.left + 180;
-			rect.top = (curRow - 1) * 100 + 20;
-			rect.bottom = rect.top + 80;
+	m_nZhiufuNum = num;
+}
 
-			newButton->SetFloat(true);
-			newButton->SetPos(rect);
+void CDiandanPageUI::UpdateJiesuanZhifuPos()
+{
+	CShopinfo shopinfo = CShopinfo::m_shopinfo;
 
-			num++;
-		}
+	//添加支付方式
+	int nWidth = m_nPageWidth;
+	if (nWidth == 0)
+	{
+		return;
+	}
+
+	//根据宽度计算每行显示的数量
+	int nMeihangNum = (nWidth - 521 - 421) / 144;
+
+	int num = 0;
+
+	CHorizontalLayoutUI* pZhifufangshiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_zhifufangshi_layout")));
+	for (int i = 0; i < m_nZhiufuNum; i++)
+	{
+		CButtonUI* curItem = static_cast<CButtonUI*>(pZhifufangshiLayout->GetItemAt(i));
+
+		int curRow = num / nMeihangNum + 1;
+		int curCol = num % nMeihangNum + 1;
+
+		RECT rect;
+		rect.left = (curCol - 1) * 140 + 20;
+		rect.right = rect.left + 120;
+		rect.top = (curRow - 1) * 100 + 20;
+		rect.bottom = rect.top + 80;
+
+		curItem->SetFloat(true);
+		curItem->SetPos(rect);
+
+		num++;
 	}
 
 	//调整区域高度
-	int lastRow = (num - 1) / 3 + 1;
+	int lastRow = (num - 1) / nMeihangNum + 1;
 	pZhifufangshiLayout->SetFixedHeight(lastRow * 105);
 }
 
@@ -548,6 +510,9 @@ void CDiandanPageUI::ShowJiesuanPage()
 	//展示继续加菜的按钮
 	CButtonUI* pJiacaiBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_jixujiacai")));
 	pJiacaiBtn->SetVisible(true);
+
+	//更新结算按钮位置
+	UpdateJiesuanZhifuPos();
 }
 
 //展示选购页面，隐藏结算页面
@@ -3180,4 +3145,14 @@ CDiandanOrder CDiandanPageUI::GetPrintOrderinfo(std::string take_food_code, std:
 	}
 
 	return m_cur_diandan_order;
+}
+
+void CDiandanPageUI::SetPos(RECT rc, bool bNeedInvalidate)
+{
+	m_nPageWidth = rc.right - rc.left;
+
+	//拖动窗口的时候，更新位置
+	UpdateJiesuanZhifuPos();
+
+	CContainerUI::SetPos(rc, bNeedInvalidate);
 }

zhipuzi_pos_windows/page/CDiandanPageUI.h

@@ -18,10 +18,10 @@ public:
 	CDiandanPageUI();
 	~CDiandanPageUI();
 
-	//初始化当前页面的展示，处理默认展示效果，在页面被加载的时候调用
+	//初始化当前页面的展示，处理默认展示效果，在页面被加载的时候调用（仅加载时候会调用1次）
 	void InitShow();
 
-	//收款一个订单成功，准备开始收款第2个订单的时候调用
+	//收款一个订单成功，准备开始收款第2个订单的时候调用（会多次调度用）
 	void RefreshShow();
 
 	//初始化商品分类的显示
@@ -33,6 +33,12 @@ public:
 	//仅仅初始化结算相关的显示（比如折扣、优惠、价格等）
 	void InitJiesuanShow();
 
+	//初始化结算页面的支付方式展示(仅需要在页面初始化的时候调用一次，这里只添加支付方式，不设置位置）
+	void InitJiesuanZhifu();
+
+	//这个只更新结算页面支付方式的位置，不处理控件添加
+	void UpdateJiesuanZhifuPos();
+
 	//展示结算页面，隐藏选购页面
 	void ShowJiesuanPage();
 
@@ -168,6 +174,8 @@ public:
 	//执行付款成功后的所有操作逻辑
 	void StartWorkAfterShoukuan(std::string kucunstring, std::string take_food_code, std::string show_trade_no, std::string shoukuan_type);
 
+	void SetPos(RECT rc, bool bNeedInvalidate = true);
+
 private:
 	//获取用于提交订单的参数结构
 	std::map<string, string> GetSendorderParams();
@@ -286,4 +294,10 @@ private:
 	//模态对话框有关的
 	bool m_is_show_modal_wnd = false;
 	CModalWnd* m_curModalWnd;
+
+	//结算页面总的支付方式数量
+	int m_nZhiufuNum;
+
+	//当前控件的实际宽度
+	int m_nPageWidth;
 };