From 0d3b0fb37a05408d8baf84ae23ea3214d644b2a5 Mon Sep 17 00:00:00 2001 From: zxt@theyeasy.com Date: Tue, 26 Dec 2017 15:38:05 +0800 Subject: [PATCH] update --- .gitignore | 1 + build/classes/com/w1hd/zzhnc/controller/pc/ActivityController.class | Bin 5277 -> 0 bytes build/classes/com/w1hd/zzhnc/controller/pc/GoodsController.class | Bin 754 -> 0 bytes build/classes/com/w1hd/zzhnc/controller/pc/PrizeController.class | Bin 754 -> 0 bytes build/classes/com/w1hd/zzhnc/controller/pc/ReportController.class | Bin 3406 -> 0 bytes build/classes/com/w1hd/zzhnc/controller/pc/SellerController.class | Bin 760 -> 0 bytes src/com/w1hd/zzhnc/controller/pc/ActivityController.java | 2 +- src/com/w1hd/zzhnc/controller/pc/GoodsController.java | 2 +- src/com/w1hd/zzhnc/controller/pc/PrizeController.java | 2 +- src/com/w1hd/zzhnc/controller/pc/ReportController.java | 5 +++++ src/com/w1hd/zzhnc/controller/pc/SellerController.java | 2 +- 11 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/ActivityController.class delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/GoodsController.class delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/PrizeController.class delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/ReportController.class delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/SellerController.class diff --git a/.gitignore b/.gitignore index 2af7cef..0c03fe9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ target/ .project .settings .springBeans +.class ### IntelliJ IDEA ### .idea diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/ActivityController.class b/build/classes/com/w1hd/zzhnc/controller/pc/ActivityController.class deleted file mode 100644 index cf2095f..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/ActivityController.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/GoodsController.class b/build/classes/com/w1hd/zzhnc/controller/pc/GoodsController.class deleted file mode 100644 index 9fbf6ee..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/GoodsController.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/PrizeController.class b/build/classes/com/w1hd/zzhnc/controller/pc/PrizeController.class deleted file mode 100644 index 1a88b94..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/PrizeController.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/ReportController.class b/build/classes/com/w1hd/zzhnc/controller/pc/ReportController.class deleted file mode 100644 index 62810b7..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/ReportController.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/SellerController.class b/build/classes/com/w1hd/zzhnc/controller/pc/SellerController.class deleted file mode 100644 index 3dfd265..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/SellerController.class and /dev/null differ diff --git a/src/com/w1hd/zzhnc/controller/pc/ActivityController.java b/src/com/w1hd/zzhnc/controller/pc/ActivityController.java index c7e5a83..ceefe87 100644 --- a/src/com/w1hd/zzhnc/controller/pc/ActivityController.java +++ b/src/com/w1hd/zzhnc/controller/pc/ActivityController.java @@ -27,7 +27,7 @@ public class ActivityController extends BaseController { @RequestMapping("/activityList") public ModelAndView activityList() { - ModelAndView mv = new ModelAndView("/pc/activity/activityindex"); + ModelAndView mv = new ModelAndView("/pc/activity/activityList"); return mv; } diff --git a/src/com/w1hd/zzhnc/controller/pc/GoodsController.java b/src/com/w1hd/zzhnc/controller/pc/GoodsController.java index e7a03b9..24be8bf 100644 --- a/src/com/w1hd/zzhnc/controller/pc/GoodsController.java +++ b/src/com/w1hd/zzhnc/controller/pc/GoodsController.java @@ -10,6 +10,6 @@ public class GoodsController { @RequestMapping("/goodsList") public ModelAndView goodsList() { - return new ModelAndView(""); + return new ModelAndView("/pc/goods/goodsList"); } } diff --git a/src/com/w1hd/zzhnc/controller/pc/PrizeController.java b/src/com/w1hd/zzhnc/controller/pc/PrizeController.java index 21ae612..20c77c1 100644 --- a/src/com/w1hd/zzhnc/controller/pc/PrizeController.java +++ b/src/com/w1hd/zzhnc/controller/pc/PrizeController.java @@ -10,7 +10,7 @@ public class PrizeController { @RequestMapping("/prizeList") public ModelAndView prizeList() { - return new ModelAndView(""); + return new ModelAndView("/pc/prize/prizeList"); } } diff --git a/src/com/w1hd/zzhnc/controller/pc/ReportController.java b/src/com/w1hd/zzhnc/controller/pc/ReportController.java index d387610..5c8c45e 100644 --- a/src/com/w1hd/zzhnc/controller/pc/ReportController.java +++ b/src/com/w1hd/zzhnc/controller/pc/ReportController.java @@ -25,6 +25,11 @@ public class ReportController extends BaseController { ModelAndView mv = new ModelAndView("/pc/report/goods"); return mv; } + @RequestMapping("/prize") + public ModelAndView prize() { + ModelAndView mv = new ModelAndView("/pc/report/prize"); + return mv; + } @RequestMapping("/chatrecord") public ModelAndView chatrecord() { diff --git a/src/com/w1hd/zzhnc/controller/pc/SellerController.java b/src/com/w1hd/zzhnc/controller/pc/SellerController.java index cb98bc5..7098846 100644 --- a/src/com/w1hd/zzhnc/controller/pc/SellerController.java +++ b/src/com/w1hd/zzhnc/controller/pc/SellerController.java @@ -10,6 +10,6 @@ public class SellerController { @RequestMapping("/sellerList") public ModelAndView sellerList() { - return new ModelAndView(""); + return new ModelAndView("/pc/seller/sellerList"); } } -- libgit2 0.24.0