diff --git a/CitySunlight.v12.suo b/CitySunlight.v12.suo
index 070edc1..083ccd6 100644
Binary files a/CitySunlight.v12.suo and b/CitySunlight.v12.suo differ
diff --git a/CitySunlight/Admin.aspx.cs b/CitySunlight/Admin.aspx.cs
index 5a42102..f0d84fa 100644
--- a/CitySunlight/Admin.aspx.cs
+++ b/CitySunlight/Admin.aspx.cs
@@ -13,7 +13,7 @@ namespace CitySunlight
     {
         int pages = HttpUtils.getQueryString("pages").ToInt();
         public String user;
-        const int peritems = 5;
+        const decimal peritems = 5;
         protected void Page_Load(object sender, EventArgs e)
         {
             if (Session["username"] == null)
@@ -26,7 +26,7 @@ namespace CitySunlight
         public String GetProductInfo()
         {
             String html = "";
-            DataTable items = ProductManager.SearchProduct(user, "", "", "", "", pages, peritems);
+            DataTable items = ProductManager.SearchProduct(user, "", "", "", "", pages, peritems.ToString().ToInt());
             if (items.Rows.Count == 0)
                 return "<tr><td>数据库中未找到产品</td></tr>";
             else
@@ -45,8 +45,8 @@ namespace CitySunlight
                 String delete = "<a href=\"/Product/ProductEdit.aspx?id=" + id + "&type=delete\" >删除</a>";
                 html += HttpUtils.addTds(ProductManager.NameToUrl(id, name), picurl, price, amount, classname, edit, delete);
             }
-            decimal total = ProductManager.SearchProduct(user, "", "", "", "").Rows.Count / peritems;
-            int totalpages = (int)(Math.Ceiling(total));
+            decimal allproduct = ProductManager.SearchProduct(user, "", "", "", "").Rows.Count;
+            decimal totalpages = Math.Ceiling(allproduct / peritems);
             String allpage = "<ul class=\"pagination\">";
             for (int i = 1; i <= totalpages; i++)
             {
diff --git a/CitySunlight/Basic.Master b/CitySunlight/Basic.Master
index 64a78ef..68b18e5 100644
--- a/CitySunlight/Basic.Master
+++ b/CitySunlight/Basic.Master
@@ -55,6 +55,79 @@
         </div>
     </div>
     <!-- /container -->
+
+
+
+
+    <!-- 模态框（Modal） -->
+    <div class="modal fade" id="loginModal" tabindex="-1" role="dialog"
+        aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close"
+                        data-dismiss="modal" aria-hidden="true">
+                        &times;
+                    </button>
+                    <h4 class="modal-title" id="myModalLabel">都市阳光登录
+                    </h4>
+                </div>
+                <div class="modal-body">
+                    在这里添加一些文本
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default"
+                        data-dismiss="modal">
+                        关闭
+                    </button>
+                    <button type="button" class="btn btn-primary">
+                        登录
+                    </button>
+                </div>
+            </div>
+            <!-- /.modal-content -->
+        </div>
+        <!-- /.modal -->
+    </div>
+
+    <%--    <!-- 模态框（Modal） -->
+    <div class="modal fade" id="loginModal" tabindex="-1" role="dialog"
+        aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close"
+                        data-dismiss="modal" aria-hidden="true">
+                        &times;
+                    </button>
+                    <h4 class="modal-title" id="myModalLabel">都市阳光登录
+                    </h4>
+                </div>
+                <div class="modal-body">
+                    <div class="form-control">
+                        <%= getAlert(msg) %>
+                        <label for="UserNameTx" class="col-sm-3"><a class="glyphicon glyphicon-user">用户名</a></label>
+                        <input type="text" id="UserNameTx" name="UserNameTx" class="form-control col-sm-7" placeholder="请输入账号" />
+                        <label for="PassWordTx" class="col-sm-3"><a class="glyphicon glyphicon-th">密  码</a></label>
+                        <input type="password" id="PassWordTx" name="PassWordTx" class="form-control col-sm-7" placeholder="请输入密码" />
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default"
+                    data-dismiss="modal">
+                    关闭
+                </button>
+                <button type="button" class="btn btn-primary">
+                    提交更改
+                </button>
+            </div>
+        </div>
+    <!-- /.modal-content -->
+    </div>
+    <!-- /.modal -->--%>
+
+
     <script src="http://cdn.bootcss.com/jquery/1.11.2/jquery.js"></script>
     <script src="http://cdn.bootcss.com/bootstrap/3.3.5/js/bootstrap.js"></script>
 </body>
diff --git a/CitySunlight/Basic.Master.cs b/CitySunlight/Basic.Master.cs
index b2bf8c6..d036395 100644
--- a/CitySunlight/Basic.Master.cs
+++ b/CitySunlight/Basic.Master.cs
@@ -9,6 +9,7 @@ namespace CitySunlight
 {
     public partial class Basic : System.Web.UI.MasterPage
     {
+        public String msg;
         protected void Page_Load(object sender, EventArgs e)
         {
 
@@ -17,6 +18,7 @@ namespace CitySunlight
         {
             String html = "";
             if (Session["username"] == null)
+                //html = "<li><a href=\"#\" data-toggle=\"modal\"  data-target=\"#loginModal\" >登录</a></li>";
                 html = "<li><a href=\"/Account/Login.aspx\" >登录</a></li>";
             else
             {
@@ -27,5 +29,12 @@ namespace CitySunlight
             }
             return html;
         }
+        public String getAlert(String msg)
+        {
+            String html = "<div class=\"alert alert-{0} alert-dismissable\">";
+            html += "<button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-hidden=\"true\">&times;</button>";
+            html += "{1}</div>";
+            return (msg == null || msg == "") ? "" : String.Format(html, "danger", msg);
+        }
     }
 }
\ No newline at end of file
diff --git a/CitySunlight/HttpUtils.cs b/CitySunlight/HttpUtils.cs
index 25a2603..9091660 100644
--- a/CitySunlight/HttpUtils.cs
+++ b/CitySunlight/HttpUtils.cs
@@ -132,5 +132,19 @@ namespace CitySunlight
             }
             return i;
         }
+        /// <summary>
+        /// String尝试转换为double(扩展方法)
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        public static double Todouble(this string s)
+        {
+            double i;
+            if (!double.TryParse(s, out i))
+            {
+                i = 0;
+            }
+            return i;
+        }
     }
 }
\ No newline at end of file
diff --git a/CitySunlight/Main.aspx.cs b/CitySunlight/Main.aspx.cs
index 35da343..9b3a283 100644
--- a/CitySunlight/Main.aspx.cs
+++ b/CitySunlight/Main.aspx.cs
@@ -15,7 +15,7 @@ namespace CitySunlight
         public String classid = HttpUtils.getQueryString("classid");
         public String search = HttpUtils.getQueryString("search");
         public String classoption;
-        const int peritems = 5;
+        const decimal peritems = 5;
         protected void Page_Load(object sender, EventArgs e)
         {
             classoption = ProductClassManager.getOptionString("classid", classid);
@@ -23,7 +23,7 @@ namespace CitySunlight
         public String GetProductInfo()
         {
             String html = "";
-            DataTable items = ProductManager.SearchProduct("", search, classid, "", "", pages, peritems);
+            DataTable items = ProductManager.SearchProduct("", search, classid, "", "", pages, peritems.ToString().ToInt());
             if (items.Rows.Count == 0)
                 return "<tr><td style=\"color:red\" colspan=\"8\" align=\"center\">数据库中未找到产品</td></tr>";
             else
@@ -42,8 +42,8 @@ namespace CitySunlight
 
                 html += HttpUtils.addTds(ProductManager.NameToUrl(id, name), picurl, price, amount, classname, user);
             }
-            decimal total = ProductManager.SearchProduct("", search, classid, "", "").Rows.Count / peritems;
-            int totalpages = (int)(Math.Ceiling(total));
+            decimal allproduct = ProductManager.SearchProduct("", search, classid, "", "").Rows.Count;
+            decimal totalpages = Math.Ceiling(allproduct / peritems);
             String allpage = "<ul class=\"pagination\">";
             for (int i = 1; i <= totalpages; i++)
             {