diff --git a/GPW_Admin/Default.aspx.cs b/GPW_Admin/Default.aspx.cs index 4639889..61c557d 100644 --- a/GPW_Admin/Default.aspx.cs +++ b/GPW_Admin/Default.aspx.cs @@ -12,7 +12,7 @@ namespace GPW.AdminArea { protected void Page_Load(object sender, EventArgs e) { - memLayer.ML.setSessionVal("preUrlString", "GPW-Admin", true); + memLayer.ML.setSessionVal("preUrlString", "", true); memLayer.ML.setSessionVal("nextPage", "menu.aspx"); Response.Redirect("login.aspx"); } diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index e2ba17c..555df79 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -203,6 +203,9 @@ + + + @@ -212,6 +215,7 @@ + @@ -219,6 +223,12 @@ + + + + + + @@ -233,6 +243,12 @@ + + + + + + diff --git a/GPW_Admin/images/EmptyImg.png b/GPW_Admin/images/EmptyImg.png new file mode 100644 index 0000000..a157ed2 Binary files /dev/null and b/GPW_Admin/images/EmptyImg.png differ diff --git a/GPW_Admin/images/cancel_l.png b/GPW_Admin/images/cancel_l.png new file mode 100644 index 0000000..2d5e260 Binary files /dev/null and b/GPW_Admin/images/cancel_l.png differ diff --git a/GPW_Admin/images/cancel_m.png b/GPW_Admin/images/cancel_m.png new file mode 100644 index 0000000..816e06a Binary files /dev/null and b/GPW_Admin/images/cancel_m.png differ diff --git a/GPW_Admin/images/cancel_s.png b/GPW_Admin/images/cancel_s.png new file mode 100644 index 0000000..d933394 Binary files /dev/null and b/GPW_Admin/images/cancel_s.png differ diff --git a/GPW_Admin/images/moneyDis_l.png b/GPW_Admin/images/moneyDis_l.png new file mode 100644 index 0000000..21ca071 Binary files /dev/null and b/GPW_Admin/images/moneyDis_l.png differ diff --git a/GPW_Admin/images/moneyDis_m.png b/GPW_Admin/images/moneyDis_m.png new file mode 100644 index 0000000..25f9939 Binary files /dev/null and b/GPW_Admin/images/moneyDis_m.png differ diff --git a/GPW_Admin/images/moneyDis_s.png b/GPW_Admin/images/moneyDis_s.png new file mode 100644 index 0000000..d984c58 Binary files /dev/null and b/GPW_Admin/images/moneyDis_s.png differ diff --git a/GPW_Admin/images/money_l.png b/GPW_Admin/images/money_l.png new file mode 100644 index 0000000..8865aa4 Binary files /dev/null and b/GPW_Admin/images/money_l.png differ diff --git a/GPW_Admin/images/money_m.png b/GPW_Admin/images/money_m.png new file mode 100644 index 0000000..5854b42 Binary files /dev/null and b/GPW_Admin/images/money_m.png differ diff --git a/GPW_Admin/images/money_s.png b/GPW_Admin/images/money_s.png new file mode 100644 index 0000000..b4234ec Binary files /dev/null and b/GPW_Admin/images/money_s.png differ diff --git a/GPW_Admin/images/timeDis_l.png b/GPW_Admin/images/timeDis_l.png new file mode 100644 index 0000000..6204f59 Binary files /dev/null and b/GPW_Admin/images/timeDis_l.png differ diff --git a/GPW_Admin/images/timeDis_m.png b/GPW_Admin/images/timeDis_m.png new file mode 100644 index 0000000..4ac8b8d Binary files /dev/null and b/GPW_Admin/images/timeDis_m.png differ diff --git a/GPW_Admin/images/timeDis_s.png b/GPW_Admin/images/timeDis_s.png new file mode 100644 index 0000000..84b9dd1 Binary files /dev/null and b/GPW_Admin/images/timeDis_s.png differ diff --git a/GPW_Admin/images/time_l.png b/GPW_Admin/images/time_l.png new file mode 100644 index 0000000..fc8c40a Binary files /dev/null and b/GPW_Admin/images/time_l.png differ diff --git a/GPW_Admin/images/time_m.png b/GPW_Admin/images/time_m.png new file mode 100644 index 0000000..55ab711 Binary files /dev/null and b/GPW_Admin/images/time_m.png differ diff --git a/GPW_Admin/images/time_s.png b/GPW_Admin/images/time_s.png new file mode 100644 index 0000000..54e3a99 Binary files /dev/null and b/GPW_Admin/images/time_s.png differ diff --git a/GPW_Barcode/images/favicon.png b/GPW_Barcode/images/favicon.png new file mode 100644 index 0000000..ae6349b Binary files /dev/null and b/GPW_Barcode/images/favicon.png differ diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index 33448a4..f081c3a 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -446,6 +446,7 @@ +