diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index de1eb2b2d677219997f16a14489e4b9e64ab3b9a..cff6272066a134e9b06e101ab525da4e7f10d4c6 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -156,8 +156,7 @@ class Admin extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = AdminService::AdminSave($params); - return json($ret); + return AdminService::AdminSave($params); } /** @@ -184,8 +183,7 @@ class Admin extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = AdminService::AdminDelete($params); - return json($ret); + return AdminService::AdminDelete($params); } /** @@ -223,8 +221,7 @@ class Admin extends Common // 开始操作 $params = input('post.'); - $ret = AdminService::Login($params); - return json($ret); + return AdminService::Login($params); } /** diff --git a/application/admin/controller/Answer.php b/application/admin/controller/Answer.php index 0dd8ae3123983113bbbd09702f15df8a4abfebe2..5433a9b70804e8f07950d5a7978cbdf5bdf1de52 100755 --- a/application/admin/controller/Answer.php +++ b/application/admin/controller/Answer.php @@ -98,8 +98,7 @@ class Answer extends Common // 开始处理 $params = input(); $params['user_type'] = 'admin'; - $ret = AnswerService::AnswerDelete($params); - return json($ret); + return AnswerService::AnswerDelete($params); } /** @@ -119,8 +118,7 @@ class Answer extends Common // 开始处理 $params = input(); - $ret = AnswerService::AnswerReply($params); - return json($ret); + return AnswerService::AnswerReply($params); } /** @@ -140,8 +138,7 @@ class Answer extends Common // 开始处理 $params = input(); - $ret = AnswerService::AnswerStatusUpdate($params); - return json($ret); + return AnswerService::AnswerStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Apphomenav.php b/application/admin/controller/Apphomenav.php index 980cadac565811188357e9c41d286e0e42cba2ee..e422847ed26231658943c8406c39f8010e00798e 100755 --- a/application/admin/controller/Apphomenav.php +++ b/application/admin/controller/Apphomenav.php @@ -145,8 +145,7 @@ class AppHomeNav extends Common // 开始处理 $params = input(); - $ret = AppNavService::AppHomeNavSave($params); - return json($ret); + return AppNavService::AppHomeNavSave($params); } /** @@ -167,8 +166,7 @@ class AppHomeNav extends Common // 开始处理 $params = input(); $params['user_type'] = 'admin'; - $ret = AppNavService::AppHomeNavDelete($params); - return json($ret); + return AppNavService::AppHomeNavDelete($params); } /** @@ -188,8 +186,7 @@ class AppHomeNav extends Common // 开始处理 $params = input(); - $ret = AppNavService::AppHomeNavStatusUpdate($params); - return json($ret); + return AppNavService::AppHomeNavStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Appminialipaylist.php b/application/admin/controller/Appminialipaylist.php index 9d9d43e49eba39643955fb365944a71895f75203..503b4bc053248bec0f30429afdf31aac4e831e61 100755 --- a/application/admin/controller/Appminialipaylist.php +++ b/application/admin/controller/Appminialipaylist.php @@ -68,8 +68,7 @@ class AppMiniAlipayList extends Common } // 开始操作 - $ret = AppMiniService::Created($this->params); - return json($ret); + return AppMiniService::Created($this->params); } /** @@ -88,8 +87,7 @@ class AppMiniAlipayList extends Common } // 开始操作 - $ret = AppMiniService::Delete($this->params); - return json($ret); + return AppMiniService::Delete($this->params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index e39f78a768f5bf43602ad19ef231eae90ef30f30..33eab693752ea5c1c1fd9f1baec99264a9cae876 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -147,8 +147,7 @@ class Article extends Common // 开始处理 $params = input(); - $ret = ArticleService::ArticleSave($params); - return json($ret); + return ArticleService::ArticleSave($params); } /** @@ -169,8 +168,7 @@ class Article extends Common // 开始处理 $params = input(); $params['admin'] = $this->admin; - $ret = ArticleService::ArticleDelete($params); - return json($ret); + return ArticleService::ArticleDelete($params); } /** @@ -192,8 +190,7 @@ class Article extends Common $params = input(); $params['admin'] = $this->admin; $params['field'] = 'is_enable'; - $ret = ArticleService::ArticleStatusUpdate($params); - return json($ret); + return ArticleService::ArticleStatusUpdate($params); } /** @@ -215,8 +212,7 @@ class Article extends Common $params = input(); $params['admin'] = $this->admin; $params['field'] = 'is_home_recommended'; - $ret = ArticleService::ArticleStatusUpdate($params); - return json($ret); + return ArticleService::ArticleStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Articlecategory.php b/application/admin/controller/Articlecategory.php index 2fbd96295106490ba56be5e199e52ca05aca207b..4419dee3cb2ecb062a0faf53e40179fae20b04f7 100755 --- a/application/admin/controller/Articlecategory.php +++ b/application/admin/controller/Articlecategory.php @@ -62,8 +62,7 @@ class ArticleCategory extends Common } // 开始操作 - $ret = ArticleService::ArticleCategoryNodeSon(input()); - return json($ret); + return ArticleService::ArticleCategoryNodeSon(input()); } /** @@ -82,8 +81,7 @@ class ArticleCategory extends Common } // 开始操作 - $ret = ArticleService::ArticleCategorySave(input()); - return json($ret); + return ArticleService::ArticleCategorySave(input()); } /** @@ -104,8 +102,7 @@ class ArticleCategory extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = ArticleService::ArticleCategoryDelete($params); - return json($ret); + return ArticleService::ArticleCategoryDelete($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index 4c0310539d8cbc10d4412aebee43a8ab431f85f7..d516bbf9ed57b763eea621f674babbdd71f6bb3c 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -144,8 +144,7 @@ class Brand extends Common // 开始处理 $params = input(); - $ret = BrandService::BrandSave($params); - return json($ret); + return BrandService::BrandSave($params); } /** @@ -166,8 +165,7 @@ class Brand extends Common // 开始处理 $params = input(); $params['user_type'] = 'admin'; - $ret = BrandService::BrandDelete($params); - return json($ret); + return BrandService::BrandDelete($params); } /** @@ -187,8 +185,7 @@ class Brand extends Common // 开始处理 $params = input(); - $ret = BrandService::BrandStatusUpdate($params); - return json($ret); + return BrandService::BrandStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Brandcategory.php b/application/admin/controller/Brandcategory.php index dd1e6757a7a3e0889e54e76cac7807e4f2c834ef..6d20eb53938d99865f88a653ff899cc139a7c03f 100755 --- a/application/admin/controller/Brandcategory.php +++ b/application/admin/controller/Brandcategory.php @@ -62,8 +62,7 @@ class BrandCategory extends Common } // 开始操作 - $ret = BrandService::BrandCategoryNodeSon(input()); - return json($ret); + return BrandService::BrandCategoryNodeSon(input()); } /** @@ -82,8 +81,7 @@ class BrandCategory extends Common } // 开始操作 - $ret = BrandService::BrandCategorySave(input()); - return json($ret); + return BrandService::BrandCategorySave(input()); } /** @@ -104,8 +102,7 @@ class BrandCategory extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = BrandService::BrandCategoryDelete($params); - return json($ret); + return BrandService::BrandCategoryDelete($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php index 7f1e6d606e738e9b6fcad474f278cc6aabd7c296..d0016354cb613ac8b40b8161ad124d2ab64b6421 100755 --- a/application/admin/controller/Customview.php +++ b/application/admin/controller/Customview.php @@ -148,8 +148,7 @@ class CustomView extends Common // 开始处理 $params = input(); - $ret = CustomViewService::CustomViewSave($params); - return json($ret); + return CustomViewService::CustomViewSave($params); } /** @@ -170,8 +169,7 @@ class CustomView extends Common // 开始处理 $params = input(); $params['user_type'] = 'admin'; - $ret = CustomViewService::CustomViewDelete($params); - return json($ret); + return CustomViewService::CustomViewDelete($params); } /** @@ -191,8 +189,7 @@ class CustomView extends Common // 开始处理 $params = input(); - $ret = CustomViewService::CustomViewStatusUpdate($params); - return json($ret); + return CustomViewService::CustomViewStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Email.php b/application/admin/controller/Email.php index ee0708814c3cbe6ee509f11aebc95fd039a3b793..9155954db01340b1f57a2d1825bc11a28c51dd3c 100755 --- a/application/admin/controller/Email.php +++ b/application/admin/controller/Email.php @@ -90,10 +90,9 @@ class Email extends Common // 发送 if($obj->SendHtml($email_param)) { - return json(DataReturn('发送成功')); - } else { - return json(DataReturn('发送失败'.'['.$obj->error.']', -100)); + return DataReturn('发送成功'); } + return DataReturn('发送失败'.'['.$obj->error.']', -100); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Error.php b/application/admin/controller/Error.php index f9dd4768b853755ed7a8c73159b02c7597c863ba..6c41c1c35066b79185bf0c9b21e5bf35c90ce72e 100755 --- a/application/admin/controller/Error.php +++ b/application/admin/controller/Error.php @@ -22,7 +22,7 @@ class Error extends Common * @desc description * @param Request $request [参数] */ - public function index(Request $request) + public function Index(Request $request) { if(IS_AJAX) { diff --git a/application/admin/controller/Express.php b/application/admin/controller/Express.php index b6f7be75d56df2631ad2df16df3e6312384b31a9..d9c4e21659d1027ae2c536a757d80b390afdc6ee 100755 --- a/application/admin/controller/Express.php +++ b/application/admin/controller/Express.php @@ -65,8 +65,7 @@ class Express extends Common } // 开始操作 - $ret = ExpressService::ExpressNodeSon(input()); - return json($ret); + return ExpressService::ExpressNodeSon(input()); } /** @@ -85,8 +84,7 @@ class Express extends Common } // 开始操作 - $ret = ExpressService::ExpressSave(input()); - return json($ret); + return ExpressService::ExpressSave(input()); } /** @@ -107,8 +105,7 @@ class Express extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = ExpressService::ExpressDelete($params); - return json($ret); + return ExpressService::ExpressDelete($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index a9e2634e585d8453cc8eee8ae0d160bd3e5e5eb5..0f0a9a4e7ae1ff5cbb9ab3c3f0fc7c70b28049e5 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -155,8 +155,7 @@ class Goods extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = GoodsService::GoodsSave($params); - return json($ret); + return GoodsService::GoodsSave($params); } /** @@ -177,8 +176,7 @@ class Goods extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = GoodsService::GoodsDelete($params); - return json($ret); + return GoodsService::GoodsDelete($params); } /** @@ -200,8 +198,7 @@ class Goods extends Common $params = input('post.'); $params['admin'] = $this->admin; $params['field'] = 'is_shelves'; - $ret = GoodsService::GoodsStatusUpdate($params); - return json($ret); + return GoodsService::GoodsStatusUpdate($params); } /** @@ -223,8 +220,7 @@ class Goods extends Common $params = input('post.'); $params['admin'] = $this->admin; $params['field'] = 'is_home_recommended'; - $ret = GoodsService::GoodsStatusUpdate($params); - return json($ret); + return GoodsService::GoodsStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Goodscategory.php b/application/admin/controller/Goodscategory.php index 6c26ac11980b4ce6c778272b22ad674264c2f1be..1b55ca2486fcd4f9ab900352036876fc5e0b5517 100755 --- a/application/admin/controller/Goodscategory.php +++ b/application/admin/controller/Goodscategory.php @@ -68,8 +68,7 @@ class GoodsCategory extends Common } // 开始操作 - $ret = GoodsService::GoodsCategoryNodeSon(input()); - return json($ret); + return GoodsService::GoodsCategoryNodeSon(input()); } @@ -89,8 +88,7 @@ class GoodsCategory extends Common } // 开始操作 - $ret = GoodsService::GoodsCategorySave(input()); - return json($ret); + return GoodsService::GoodsCategorySave(input()); } /** @@ -111,8 +109,7 @@ class GoodsCategory extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = GoodsService::GoodsCategoryDelete($params); - return json($ret); + return GoodsService::GoodsCategoryDelete($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php index 00cb2acb33f6e693d77b9d150f9ddfebd6d3745b..780d8a2d527b6ed648acbc5aa972b72e83e1e4ea 100755 --- a/application/admin/controller/Link.php +++ b/application/admin/controller/Link.php @@ -70,8 +70,7 @@ class Link extends Common // 开始处理 $params = input(); - $ret = LinkService::LinkSave($params); - return json($ret); + return LinkService::LinkSave($params); } /** @@ -92,8 +91,7 @@ class Link extends Common // 开始处理 $params = input(); $params['user_type'] = 'admin'; - $ret = LinkService::LinkDelete($params); - return json($ret); + return LinkService::LinkDelete($params); } /** @@ -113,8 +111,7 @@ class Link extends Common // 开始处理 $params = input(); - $ret = LinkService::LinkStatusUpdate($params); - return json($ret); + return LinkService::LinkStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Message.php b/application/admin/controller/Message.php index 32d3f9a12215b64cb9b14024276a9b9f49f32b50..df111a9583014c7637493fb2633b15ef890410f0 100755 --- a/application/admin/controller/Message.php +++ b/application/admin/controller/Message.php @@ -106,8 +106,7 @@ class Message extends Common // 开始处理 $params = input(); $params['admin'] = $this->admin; - $ret = MessageService::MessageDelete($params); - return json($ret); + return MessageService::MessageDelete($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Navigation.php b/application/admin/controller/Navigation.php index addfa204429e87e6efa86a3d6e5ac9efb5f5f30d..cc94678da2bb43e07741f6bf4368923c95f6e1e2 100755 --- a/application/admin/controller/Navigation.php +++ b/application/admin/controller/Navigation.php @@ -91,8 +91,7 @@ class Navigation extends Common // 开始处理 $params = input(); $params['nav_type'] = $this->nav_type; - $ret = NavigationService::NavSave($params); - return json($ret); + return NavigationService::NavSave($params); } @@ -114,8 +113,7 @@ class Navigation extends Common // 开始处理 $params = input(); - $ret = NavigationService::NavDelete($params); - return json($ret); + return NavigationService::NavDelete($params); } /** @@ -135,8 +133,7 @@ class Navigation extends Common // 开始处理 $params = input(); - $ret = NavigationService::NavStatusUpdate($params); - return json($ret); + return NavigationService::NavStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 3ccc0bbf3d82cad45015d8abac3c16f9717f4bb2..75b5662561b3f1af4c5eb7beeaa12349eb6d73e0 100755 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -123,8 +123,7 @@ class Order extends Common $params['creator'] = $this->admin['id']; $params['creator_name'] = $this->admin['username']; $params['user_type'] = 'admin'; - $ret = OrderService::OrderDelete($params); - return json($ret); + return OrderService::OrderDelete($params); } /** @@ -147,8 +146,7 @@ class Order extends Common $params['user_id'] = $params['value']; $params['creator'] = $this->admin['id']; $params['creator_name'] = $this->admin['username']; - $ret = OrderService::OrderCancel($params); - return json($ret); + return OrderService::OrderCancel($params); } /** @@ -170,8 +168,7 @@ class Order extends Common $params = input(); $params['creator'] = $this->admin['id']; $params['creator_name'] = $this->admin['username']; - $ret = OrderService::OrderDelivery($params); - return json($ret); + return OrderService::OrderDelivery($params); } /** @@ -194,8 +191,7 @@ class Order extends Common $params['user_id'] = $params['value']; $params['creator'] = $this->admin['id']; $params['creator_name'] = $this->admin['username']; - $ret = OrderService::OrderCollect($params); - return json($ret); + return OrderService::OrderCollect($params); } /** @@ -218,8 +214,7 @@ class Order extends Common $params['user_id'] = $params['value']; $params['creator'] = $this->admin['id']; $params['creator_name'] = $this->admin['username']; - $ret = OrderService::OrderConfirm($params); - return json($ret); + return OrderService::OrderConfirm($params); } /** @@ -235,8 +230,7 @@ class Order extends Common $params = input(); $params['user'] = $this->admin; $params['user']['user_name_view'] = '管理员'.'-'.$this->admin['username']; - $ret = OrderService::AdminPay($params); - return json($ret); + return OrderService::AdminPay($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Payment.php b/application/admin/controller/Payment.php index 38020184197347534c9f415b6797eb5f9334b62b..3d571b10b939149d57d8a8ee3453b79f88ac8e1f 100755 --- a/application/admin/controller/Payment.php +++ b/application/admin/controller/Payment.php @@ -105,8 +105,7 @@ class Payment extends Common } // 开始操作 - $ret = PaymentService::PaymentUpdate(input()); - return json($ret); + return PaymentService::PaymentUpdate(input()); } /** @@ -125,8 +124,7 @@ class Payment extends Common } // 开始操作 - $ret = PaymentService::PaymentStatusUpdate(input()); - return json($ret); + return PaymentService::PaymentStatusUpdate(input()); } /** @@ -146,8 +144,7 @@ class Payment extends Common } // 开始操作 - $ret = PaymentService::Install(input()); - return json($ret); + return PaymentService::Install(input()); } /** @@ -167,8 +164,7 @@ class Payment extends Common } // 开始操作 - $ret = PaymentService::Uninstall(input()); - return json($ret); + return PaymentService::Uninstall(input()); } /** @@ -188,8 +184,7 @@ class Payment extends Common } // 开始操作 - $ret = PaymentService::Delete(input()); - return json($ret); + return PaymentService::Delete(input()); } /** @@ -209,8 +204,7 @@ class Payment extends Common } // 开始操作 - $ret = PaymentService::Upload(input()); - return json($ret); + return PaymentService::Upload(input()); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index a8c008101dbb2a348c815b920164c6082c20fa7a..5cda865de6b80ced2446bdb1a9ca659cb07ad16f 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -70,8 +70,7 @@ class Power extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = AdminPowerService::PowerSave($params); - return json($ret); + return AdminPowerService::PowerSave($params); } /** @@ -92,8 +91,7 @@ class Power extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = AdminPowerService::PowerDelete($params); - return json($ret); + return AdminPowerService::PowerDelete($params); } /** @@ -166,8 +164,7 @@ class Power extends Common } // 开始操作 - $ret = AdminPowerService::RoleSave(input('post.')); - return json($ret); + return AdminPowerService::RoleSave(input('post.')); } /** @@ -186,8 +183,7 @@ class Power extends Common } // 开始操作 - $ret = AdminPowerService::RoleDelete(input('post.')); - return json($ret); + return AdminPowerService::RoleDelete(input('post.')); } /** @@ -208,8 +204,7 @@ class Power extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = AdminPowerService::RoleStatusUpdate($params); - return json($ret); + return AdminPowerService::RoleStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Region.php b/application/admin/controller/Region.php index 21481e7e072ba3693981967efa593c808b75ca40..bc84dd8e59a08da8757d8631bdb2d4f939ae4f81 100755 --- a/application/admin/controller/Region.php +++ b/application/admin/controller/Region.php @@ -62,8 +62,7 @@ class Region extends Common } // 开始操作 - $ret = RegionService::RegionNodeSon(input()); - return json($ret); + return RegionService::RegionNodeSon(input()); } /** @@ -82,8 +81,7 @@ class Region extends Common } // 开始操作 - $ret = RegionService::RegionSave(input()); - return json($ret); + return RegionService::RegionSave(input()); } /** @@ -104,8 +102,7 @@ class Region extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = RegionService::RegionDelete($params); - return json($ret); + return RegionService::RegionDelete($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Screeningprice.php b/application/admin/controller/Screeningprice.php index 9dda4dc95b48653c4574b60c3783b2802489c0a0..ed6f6197234bb99a50b70d20e65cf76cd8211bb0 100755 --- a/application/admin/controller/Screeningprice.php +++ b/application/admin/controller/Screeningprice.php @@ -62,14 +62,7 @@ class ScreeningPrice extends Common } // 开始操作 - $ret = ScreeningPriceService::ScreeningPriceNodeSon(input()); - return json($ret); - - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error('非法访问'); - } + return ScreeningPriceService::ScreeningPriceNodeSon(input()); } /** @@ -88,8 +81,7 @@ class ScreeningPrice extends Common } // 开始操作 - $ret = ScreeningPriceService::ScreeningPriceSave(input()); - return json($ret); + return ScreeningPriceService::ScreeningPriceSave(input()); } /** @@ -110,8 +102,7 @@ class ScreeningPrice extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = ScreeningPriceService::ScreeningPriceDelete($params); - return json($ret); + return ScreeningPriceService::ScreeningPriceDelete($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php index 9a45147cd758123af7bc394801ccf1fccb206399..6240a735bb41068ccacf64bb667076bb9c50c994 100755 --- a/application/admin/controller/Slide.php +++ b/application/admin/controller/Slide.php @@ -145,8 +145,7 @@ class Slide extends Common // 开始处理 $params = input(); - $ret = SlideService::SlideSave($params); - return json($ret); + return SlideService::SlideSave($params); } /** @@ -166,8 +165,7 @@ class Slide extends Common // 开始处理 $params = input(); - $ret = SlideService::SlideDelete($params); - return json($ret); + return SlideService::SlideDelete($params); } /** @@ -187,8 +185,7 @@ class Slide extends Common // 开始处理 $params = input(); - $ret = SlideService::SlideStatusUpdate($params); - return json($ret); + return SlideService::SlideStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Theme.php b/application/admin/controller/Theme.php index bd5c8f00619e56eaae66b60c78502cda9419b32f..67c92fc2a36a2a5845285f4a8dec201d8feae39f 100755 --- a/application/admin/controller/Theme.php +++ b/application/admin/controller/Theme.php @@ -90,8 +90,7 @@ class Theme extends Common // 开始处理 $params = input(); - $ret = ThemeService::ThemeDelete($params); - return json($ret); + return ThemeService::ThemeDelete($params); } /** @@ -111,8 +110,7 @@ class Theme extends Common // 开始处理 $params = input(); - $ret = ThemeService::ThemeUpload($params); - return json($ret); + return ThemeService::ThemeUpload($params); } } ?> \ No newline at end of file diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 28faaa6b6d15ab7965c68a5fd5db8f3af5c2112b..08953733b7c34d1279dc2cc8e8e537f20d5ae1f9 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -163,8 +163,7 @@ class User extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = UserService::UserSave($params); - return json($ret); + return UserService::UserSave($params); } /** @@ -185,8 +184,7 @@ class User extends Common // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; - $ret = UserService::UserDelete($params); - return json($ret); + return UserService::UserDelete($params); } } ?> \ No newline at end of file diff --git a/application/api/controller/Answer.php b/application/api/controller/Answer.php index 62e0dcb7c304e777f24f5a6ef21e111284c0e0f7..4a76b8c0adab18764dd8af72fd4a32b6145c1b4b 100755 --- a/application/api/controller/Answer.php +++ b/application/api/controller/Answer.php @@ -67,7 +67,7 @@ class Answer extends Common 'page_total' => $page_total, 'data' => $data['data'], ]; - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } /** @@ -85,8 +85,7 @@ class Answer extends Common $params = $this->data_post; $params['user'] = $this->user; - $ret = AnswerService::Add($params); - return json($ret); + return AnswerService::Add($params); } } ?> \ No newline at end of file diff --git a/application/api/controller/Banner.php b/application/api/controller/Banner.php index 39d2d44791d161ec263ad3170ae4f20062819241..220ad5d49f1ed568e212907fb607aee088b28f6c 100644 --- a/application/api/controller/Banner.php +++ b/application/api/controller/Banner.php @@ -38,7 +38,7 @@ class Banner extends Common $data = BannerService::Banner(); // 返回数据 - return json(DataReturn('success', 0, $data)); + return DataReturn('success', 0, $data); } } ?> \ No newline at end of file diff --git a/application/api/controller/Buy.php b/application/api/controller/Buy.php index e80182333d0efbef449eafab5f408234ec2fb0ba..d5f4ed31d3020af17dfed2c822ff4b4c1f1b1ec8 100644 --- a/application/api/controller/Buy.php +++ b/application/api/controller/Buy.php @@ -75,10 +75,9 @@ class Buy extends Common 'extension_list' => $extension_list, 'common_order_is_booking' => (int) MyC('common_order_is_booking', 0), ]; - return json(DataReturn('success', 0, $result)); - } else { - return json($ret); + return DataReturn('success', 0, $result); } + return $ret; } /** @@ -93,8 +92,7 @@ class Buy extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = BuyService::OrderAdd($params); - return json($ret); + return BuyService::OrderAdd($params); } } ?> \ No newline at end of file diff --git a/application/api/controller/Cart.php b/application/api/controller/Cart.php index 9a6e9249ef74d4aa8d28fd9c30fa25d9db5ebbc6..f625be52c074921bdd9ff71297c856f3ab8a2cd6 100644 --- a/application/api/controller/Cart.php +++ b/application/api/controller/Cart.php @@ -37,8 +37,7 @@ class Cart extends Common */ public function Index() { - $ret = BuyService::CartList(['user'=>$this->user]); - return json($ret); + return BuyService::CartList(['user'=>$this->user]); } /** @@ -53,8 +52,7 @@ class Cart extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = BuyService::CartAdd($params); - return json($ret); + return BuyService::CartAdd($params); } /** @@ -69,8 +67,7 @@ class Cart extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = BuyService::CartDelete($params); - return json($ret); + return BuyService::CartDelete($params); } /** @@ -85,8 +82,7 @@ class Cart extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = BuyService::CartStock($params); - return json($ret); + return BuyService::CartStock($params); } } ?> \ No newline at end of file diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index 33179cd38c881ab846e056a9bf989717ca4c8ec2..d32cfac7b3529553e9a51cd16a55cf2233570bea 100644 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -38,7 +38,7 @@ class Goods extends Common // 参数 if(empty($this->data_post['goods_id'])) { - return json(DataReturn('参数有误', -1)); + return DataReturn('参数有误', -1); } // 获取商品 @@ -55,7 +55,7 @@ class Goods extends Common $goods = GoodsService::GoodsList($params); if(empty($goods[0]) || $goods[0]['is_delete_time'] != 0) { - return json(DataReturn('商品不存在或已删除', -1)); + return DataReturn('商品不存在或已删除', -1); } unset($goods[0]['content_web']); @@ -74,7 +74,7 @@ class Goods extends Common 'goods' => $goods[0], 'common_order_is_booking' => (int) MyC('common_order_is_booking', 0), ]; - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } /** @@ -93,8 +93,7 @@ class Goods extends Common // 开始操作 $params = $this->data_post; $params['user'] = $this->user; - $ret = GoodsService::GoodsFavor($params); - return json($ret); + return GoodsService::GoodsFavor($params); } /** @@ -109,8 +108,7 @@ class Goods extends Common { // 开始处理 $params = $this->data_post; - $ret = GoodsService::GoodsSpecType($params); - return json($ret); + return GoodsService::GoodsSpecType($params); } /** @@ -125,8 +123,7 @@ class Goods extends Common { // 开始处理 $params = $this->data_post; - $ret = GoodsService::GoodsSpecDetail($params); - return json($ret); + return GoodsService::GoodsSpecDetail($params); } /** @@ -142,7 +139,7 @@ class Goods extends Common // 开始处理 $params = $this->data_post; $data = GoodsService::GoodsCategory($params); - return json(DataReturn('success', 0, $data)); + return DataReturn('success', 0, $data); } } ?> \ No newline at end of file diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index e92a99bd60adfdbf5f4397863d0f675a926b553c..57dcaa8a8a1c5e2cfca83d16de5a404ab1d42ad4 100755 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -42,7 +42,7 @@ class Index extends Common ]; // 返回数据 - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Message.php b/application/api/controller/Message.php index 7ba7d42088b87538f12c20834ef908da2a9e29e1..639d0e50c2df16c6ea70e53e7d2a03889fe43554 100755 --- a/application/api/controller/Message.php +++ b/application/api/controller/Message.php @@ -70,7 +70,7 @@ class Message extends Common 'page_total' => $page_total, 'data' => $data['data'], ]; - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Navigation.php b/application/api/controller/Navigation.php index 6dc0c405399223c2b35157f2f3c40334333427fb..f1c37e34e673b2ceeeb550adfd30b5b5f1181e69 100644 --- a/application/api/controller/Navigation.php +++ b/application/api/controller/Navigation.php @@ -38,7 +38,7 @@ class Navigation extends Common $data = AppNavService::AppHomeNav(); // 返回数据 - return json(DataReturn('success', 0, $data)); + return DataReturn('success', 0, $data); } } ?> \ No newline at end of file diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php index 6e721b7e06807a2ed38bb78e35b171fd6f26b560..5cc6c1382cf4ba8c2cc7dd1f9da37547ff6d4efc 100644 --- a/application/api/controller/Order.php +++ b/application/api/controller/Order.php @@ -72,7 +72,7 @@ class Order extends Common 'data' => $data['data'], 'payment_list' => $payment_list, ]; - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } /** @@ -100,9 +100,9 @@ class Order extends Common $data = OrderService::OrderList($data_params); if(!empty($data['data'][0])) { - return json(DataReturn('success', 0, $data['data'][0])); + return DataReturn('success', 0, $data['data'][0]); } - return json(DataReturn('数据不存在或已删除', -100)); + return DataReturn('数据不存在或已删除', -100); } /** @@ -117,8 +117,7 @@ class Order extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = OrderService::Pay($params); - return json($ret); + return OrderService::Pay($params); } @@ -135,8 +134,7 @@ class Order extends Common $params['user_id'] = $this->user['id']; $params['creator'] = $this->user['id']; $params['creator_name'] = $this->user['user_name_view']; - $ret = OrderService::OrderCancel($params); - return json($ret); + return OrderService::OrderCancel($params); } /** @@ -152,8 +150,7 @@ class Order extends Common $params['user_id'] = $this->user['id']; $params['creator'] = $this->user['id']; $params['creator_name'] = $this->user['user_name_view']; - $ret = OrderService::OrderCollect($params); - return json($ret); + return OrderService::OrderCollect($params); } /** @@ -171,8 +168,7 @@ class Order extends Common $params['creator'] = $this->user['id']; $params['creator_name'] = $this->user['user_name_view']; $params['user_type'] = 'user'; - $ret = OrderService::OrderDelete($params); - return json($ret); + return OrderService::OrderDelete($params); } } diff --git a/application/api/controller/Region.php b/application/api/controller/Region.php index ed36fde14bb4d7ab02aa0bc307e055856ca1b8c1..b78e9ef9866d89b4cc1ec6bcd9956b2c25611cea 100644 --- a/application/api/controller/Region.php +++ b/application/api/controller/Region.php @@ -41,7 +41,7 @@ class Region extends Common ], ]; $data = RegionService::RegionNode($params); - return json(DataReturn('success', 0, $data)); + return DataReturn('success', 0, $data); } } ?> \ No newline at end of file diff --git a/application/api/controller/Search.php b/application/api/controller/Search.php index e8e52391f13488d18497c6619c575dbc347b97f5..9ae2fb948a0d049f2ad9104a3856cc6e6e139c56 100644 --- a/application/api/controller/Search.php +++ b/application/api/controller/Search.php @@ -51,7 +51,7 @@ class Search extends Common $result['category'] = []; } - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } } ?> \ No newline at end of file diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 595a921276758cd3523f679f430b1bde581d608f..076cd4b73ae50c025876ee137055c9cd1645dec8 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -44,8 +44,7 @@ class User extends Common } // 调用服务层 - $ret = UserService::AppReg(input('post.')); - return json($ret); + return UserService::AppReg(input('post.')); } /** @@ -64,8 +63,7 @@ class User extends Common } // 调用服务层 - $ret = UserService::AppUserBindVerifySend(input('post.')); - return json($ret); + return UserService::AppUserBindVerifySend(input('post.')); } /** @@ -80,19 +78,18 @@ class User extends Common // 参数 if(empty($this->data_post['authcode'])) { - return json(DataReturn('授权码不能为空', -1)); + return DataReturn('授权码不能为空', -1); } // 授权 $result = (new \base\AlipayAuth())->GetAlipayUserInfo($this->data_post['authcode'], MyC('common_app_mini_alipay_appid')); if($result === false) { - return json(DataReturn('获取授权信息失败', -10)); + return DataReturn('获取授权信息失败', -10); } else { $result['openid'] = $result['user_id']; $result['referrer']= isset($this->data_post['referrer']) ? intval($this->data_post['referrer']) : 0; - $ret = UserService::AuthUserProgram($result, 'alipay_openid'); - return json($ret); + return UserService::AuthUserProgram($result, 'alipay_openid'); } } @@ -106,17 +103,15 @@ class User extends Common */ public function BaiduUserAuth() { - return json(DataReturn('暂未开放', -1)); + return DataReturn('暂未开放', -1); $_POST['config'] = MyC('baidu_mini_program_config'); $result = (new \Library\BaiduAuth())->GetAuthUserInfo($_POST); if($result['status'] == 0) { - $ret = UserService::AuthUserProgram($result, 'alipay_openid'); - return json($ret); - } else { - return json(DataReturn($result['msg'], -10)); + return UserService::AuthUserProgram($result, 'alipay_openid'); } + return DataReturn($result['msg'], -10); } /** @@ -168,7 +163,7 @@ class User extends Common ); // 返回数据 - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } } ?> \ No newline at end of file diff --git a/application/api/controller/Useraddress.php b/application/api/controller/Useraddress.php index d6e5159fa8848c1f49a4e86fa432daa124585e4a..58dd87f822578ff25f4f7f0ff4cc799a6aa7a60a 100644 --- a/application/api/controller/Useraddress.php +++ b/application/api/controller/Useraddress.php @@ -40,8 +40,7 @@ class UserAddress extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = UserService::UserAddressRow($params); - return json($ret); + return UserService::UserAddressRow($params); } /** @@ -54,8 +53,7 @@ class UserAddress extends Common */ public function Index() { - $ret = UserService::UserAddressList(['user'=>$this->user]); - return json($ret); + return UserService::UserAddressList(['user'=>$this->user]); } @@ -71,8 +69,7 @@ class UserAddress extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = UserService::UserAddressSave($params); - return json($ret); + return UserService::UserAddressSave($params); } /** @@ -87,8 +84,7 @@ class UserAddress extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = UserService::UserAddressDelete($params); - return json($ret); + return UserService::UserAddressDelete($params); } /** @@ -103,8 +99,7 @@ class UserAddress extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = UserService::UserAddressDefault($params); - return json($ret); + return UserService::UserAddressDefault($params); } } diff --git a/application/api/controller/Usergoodsbrowse.php b/application/api/controller/Usergoodsbrowse.php index eb9f4b256b92d52d7f89e819ce5712ae6637a6dd..2597ad897f72aa4e42ec432cb6f80943448b849d 100755 --- a/application/api/controller/Usergoodsbrowse.php +++ b/application/api/controller/Usergoodsbrowse.php @@ -68,7 +68,7 @@ class UserGoodsBrowse extends Common 'page_total' => $page_total, 'data' => $data['data'], ]; - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } /** @@ -83,8 +83,7 @@ class UserGoodsBrowse extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = GoodsService::GoodsBrowseDelete($params); - return json($ret); + return GoodsService::GoodsBrowseDelete($params); } } ?> \ No newline at end of file diff --git a/application/api/controller/Usergoodsfavor.php b/application/api/controller/Usergoodsfavor.php index b3e94ff2b6d6b3094efc29363c5a9be354c5ef6b..d237901a2c2ac113e0256d6efcaf30da36ff0712 100755 --- a/application/api/controller/Usergoodsfavor.php +++ b/application/api/controller/Usergoodsfavor.php @@ -67,7 +67,7 @@ class UserGoodsFavor extends Common 'page_total' => $page_total, 'data' => $data['data'], ]; - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } /** @@ -82,8 +82,7 @@ class UserGoodsFavor extends Common { $params = $this->data_post; $params['user'] = $this->user; - $ret = GoodsService::GoodsFavor($params); - return json($ret); + return GoodsService::GoodsFavor($params); } } ?> \ No newline at end of file diff --git a/application/api/controller/Userintegral.php b/application/api/controller/Userintegral.php index f3fa0377be59e48deef04d74341355fa2305027e..f73a9e0cf00f4d208453547c9a4faa977643cb6d 100755 --- a/application/api/controller/Userintegral.php +++ b/application/api/controller/Userintegral.php @@ -68,7 +68,7 @@ class UserIntegral extends Common 'page_total' => $page_total, 'data' => $data['data'], ]; - return json(DataReturn('success', 0, $result)); + return DataReturn('success', 0, $result); } } diff --git a/application/index/controller/Buy.php b/application/index/controller/Buy.php index 2619aec3e800c8590f947b01a964bcf668dde722..2a56f6b02176f77453464bebd5a8e9e6d6381c1e 100755 --- a/application/index/controller/Buy.php +++ b/application/index/controller/Buy.php @@ -91,8 +91,7 @@ class Buy extends Common { $params = $_POST; $params['user'] = $this->user; - $ret = BuyService::OrderAdd($params); - return json($ret); + return BuyService::OrderAdd($params); } else { $this->assign('msg', '非法访问'); return $this->fetch('public/tips_error'); diff --git a/application/index/controller/Cart.php b/application/index/controller/Cart.php index a9f973c368693843051e6127451962120aa92e0b..5f28f5ef67f44fa4c6254ee527cefcbdf3d61470 100755 --- a/application/index/controller/Cart.php +++ b/application/index/controller/Cart.php @@ -67,8 +67,7 @@ class Cart extends Common $params = $_POST; $params['user'] = $this->user; - $ret = BuyService::CartAdd($params); - return json($ret); + return BuyService::CartAdd($params); } /** @@ -89,8 +88,7 @@ class Cart extends Common $params = $_POST; $params['user'] = $this->user; - $ret = BuyService::CartDelete($params); - return json($ret); + return BuyService::CartDelete($params); } /** @@ -111,8 +109,7 @@ class Cart extends Common $params = $_POST; $params['user'] = $this->user; - $ret = BuyService::CartStock($params); - return json($ret); + return BuyService::CartStock($params); } } ?> \ No newline at end of file diff --git a/application/index/controller/Error.php b/application/index/controller/Error.php index bdf03fde6be3f0c40f963f831792e0654078a231..b494083b0aa72f79f138bfa73cce10c5c6ff407e 100755 --- a/application/index/controller/Error.php +++ b/application/index/controller/Error.php @@ -22,7 +22,7 @@ class Error extends Common * @desc description * @param Request $request [参数] */ - public function index(Request $request) + public function Index(Request $request) { if(IS_AJAX) { diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php index eb63081a66472a8b1387a16c1fba62ec0681d4d8..d5024e063fde70f833ecd1577c94624232793ed4 100755 --- a/application/index/controller/Goods.php +++ b/application/index/controller/Goods.php @@ -113,8 +113,7 @@ class Goods extends Common // 开始处理 $params = input('post.'); $params['user'] = $this->user; - $ret = GoodsService::GoodsFavor($params); - return json($ret); + return GoodsService::GoodsFavor($params); } /** @@ -129,8 +128,7 @@ class Goods extends Common { // 开始处理 $params = input('post.'); - $ret = GoodsService::GoodsSpecType($params); - return json($ret); + return GoodsService::GoodsSpecType($params); } /** @@ -145,7 +143,6 @@ class Goods extends Common { // 开始处理 $params = input('post.'); - $ret = GoodsService::GoodsSpecDetail($params); - return json($ret); + return GoodsService::GoodsSpecDetail($params); } } diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index 58a19b09fafd93cce2fb774dfa81e4d0cb9bb4de..566293c786f50abed204985debd794dfedcef3c9 100755 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -37,19 +37,6 @@ class Index extends Common */ public function Index() { - // // 服务层 - // echo Goods::Test(); - // //echo \Page::Test(); - - // // 基础类库 统一放到base下去 - // echo \base\Page::Test(); - - // // 支付类库 - // echo \payment\Alipay::Test(); - - // return 'shopxo'; - - // 首页轮播 $this->assign('banner_list', BannerService::Banner()); @@ -71,11 +58,5 @@ class Index extends Common $this->assign('user_order_status', $user_order_status['data']); return $this->fetch(); } - - // 视图 - public function view() - { - return $this->fetch(); - } } ?> \ No newline at end of file diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index 706a729a53c96a3c6cf706e6f73487953dacba2c..395eebb59d903d4467dab81e0064041a5d97ae3c 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -181,8 +181,7 @@ class Order extends Common { $params = input('post.'); $params['user'] = $this->user; - $ret = OrderService::Comments($params); - return json($ret); + return OrderService::Comments($params); } else { $this->assign('msg', '非法访问'); return $this->fetch('public/tips_error'); @@ -250,8 +249,7 @@ class Order extends Common $params['user_id'] = $this->user['id']; $params['creator'] = $this->user['id']; $params['creator_name'] = $this->user['user_name_view']; - $ret = OrderService::OrderCancel($params); - return json($ret); + return OrderService::OrderCancel($params); } else { $this->assign('msg', '非法访问'); return $this->fetch('public/tips_error'); @@ -274,8 +272,7 @@ class Order extends Common $params['user_id'] = $this->user['id']; $params['creator'] = $this->user['id']; $params['creator_name'] = $this->user['user_name_view']; - $ret = OrderService::OrderCollect($params); - return json($ret); + return OrderService::OrderCollect($params); } else { $this->assign('msg', '非法访问'); return $this->fetch('public/tips_error'); @@ -299,8 +296,7 @@ class Order extends Common $params['creator'] = $this->user['id']; $params['creator_name'] = $this->user['user_name_view']; $params['user_type'] = 'user'; - $ret = OrderService::OrderDelete($params); - return json($ret); + return OrderService::OrderDelete($params); } else { $this->assign('msg', '非法访问'); return $this->fetch('public/tips_error'); diff --git a/application/index/controller/Personal.php b/application/index/controller/Personal.php index e19ed336dc37f69acb2d1757b3bf083db2413bf3..44f40c01217010a005126a0dde42a27d8a4db09c 100755 --- a/application/index/controller/Personal.php +++ b/application/index/controller/Personal.php @@ -77,8 +77,7 @@ class Personal extends Common // 开始操作 $params = input('post.'); $params['user'] = $this->user; - $ret = UserService::PersonalSave($params); - return json($ret); + return UserService::PersonalSave($params); } } ?> \ No newline at end of file diff --git a/application/index/controller/Region.php b/application/index/controller/Region.php index 4e25e292b92dfc283f7ef959370ef20b37915aeb..422e0e9c4a651f88e4f308e5a04ee6ac10d4fc13 100755 --- a/application/index/controller/Region.php +++ b/application/index/controller/Region.php @@ -48,7 +48,7 @@ class Region extends Common ], ]; $data = RegionService::RegionNode($params); - return json(DataReturn('操作成功', 0, $data)); + return DataReturn('操作成功', 0, $data); } } ?> \ No newline at end of file diff --git a/application/index/controller/Safety.php b/application/index/controller/Safety.php index 3fefe3e8fba498608f01d893ed8ecf08a41d7079..dd0929226bb3aa80474e357c7788a4c9e1e439e5 100755 --- a/application/index/controller/Safety.php +++ b/application/index/controller/Safety.php @@ -161,8 +161,7 @@ class Safety extends Common // 开始处理 $params = input('post.'); $params['user'] = $this->user; - $ret = SafetyService::LoginPwdUpdate($params); - return json($ret); + return SafetyService::LoginPwdUpdate($params); } /** @@ -183,8 +182,7 @@ class Safety extends Common // 开始处理 $params = input('post.'); $params['user'] = $this->user; - $ret = SafetyService::VerifySend($params); - return json($ret); + return SafetyService::VerifySend($params); } @@ -206,8 +204,7 @@ class Safety extends Common // 开始处理 $params = input('post.'); $params['user'] = $this->user; - $ret = SafetyService::VerifyCheck($params); - return json($ret); + return SafetyService::VerifyCheck($params); } /** @@ -228,8 +225,7 @@ class Safety extends Common // 开始处理 $params = input('post.'); $params['user'] = $this->user; - $ret = SafetyService::AccountsUpdate($params); - return json($ret); + return SafetyService::AccountsUpdate($params); } } ?> \ No newline at end of file diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php index 68cc5b33759e2d65b273a202e14b827017f65dd7..8d8fcaeadd43c3c0685e90fb44216ae64a646641 100755 --- a/application/index/controller/Search.php +++ b/application/index/controller/Search.php @@ -101,7 +101,7 @@ class Search extends Common SearchService::SearchAdd($this->params); // 返回 - return json(DataReturn($msg, $code, $data)); + return DataReturn($msg, $code, $data); } } ?> \ No newline at end of file diff --git a/application/index/controller/User.php b/application/index/controller/User.php index 934a3ee83b38bded624067a305a48fceff72646b..bf83bf1c298b086437c52e71467f027b1a5fc50d 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -295,8 +295,7 @@ class User extends Common } // 调用服务层 - $ret = UserService::Reg(input('post.')); - return json($ret); + return UserService::Reg(input('post.')); } /** @@ -315,8 +314,7 @@ class User extends Common } // 调用服务层 - $ret = UserService::Login(input('post.')); - return json($ret); + return UserService::Login(input('post.')); } /** @@ -353,8 +351,7 @@ class User extends Common } // 调用服务层 - $ret = UserService::RegVerifySend(input('post.')); - return json($ret); + return UserService::RegVerifySend(input('post.')); } /** @@ -373,8 +370,7 @@ class User extends Common } // 调用服务层 - $ret = UserService::ForgetPwdVerifySend(input('post.')); - return json($ret); + return UserService::ForgetPwdVerifySend(input('post.')); } /** @@ -393,8 +389,7 @@ class User extends Common } // 调用服务层 - $ret = UserService::ForgetPwd(input('post.')); - return json($ret); + return UserService::ForgetPwd(input('post.')); } /** @@ -432,8 +427,7 @@ class User extends Common $params = $_POST; $params['user'] = $this->user; $params['img_field'] = 'file'; - $ret = UserService::UserAvatarUpload($params); - return json($ret); + return UserService::UserAvatarUpload($params); } } ?> \ No newline at end of file diff --git a/application/index/controller/Useraddress.php b/application/index/controller/Useraddress.php index a83885270ca9cc1571b3b9f6a010b8c59df2a67f..ed52afa33cee25e4aac4cef2c72e124603c8f46d 100755 --- a/application/index/controller/Useraddress.php +++ b/application/index/controller/Useraddress.php @@ -75,8 +75,7 @@ class UserAddress extends Common { $params = input('post.'); $params['user'] = $this->user; - $ret = UserService::UserAddressSave($params); - return json($ret); + return UserService::UserAddressSave($params); } /** @@ -91,8 +90,7 @@ class UserAddress extends Common { $params = $_POST; $params['user'] = $this->user; - $ret = UserService::UserAddressDelete($params); - return json($ret); + return UserService::UserAddressDelete($params); } /** @@ -107,8 +105,7 @@ class UserAddress extends Common { $params = $_POST; $params['user'] = $this->user; - $ret = UserService::UserAddressDefault($params); - return json($ret); + return UserService::UserAddressDefault($params); } } ?> \ No newline at end of file diff --git a/application/index/controller/Userfavor.php b/application/index/controller/Userfavor.php index 7a49224a2de55bc3b3a4f24077baecab4d7a885b..81d8b0b896249ea324e23cd7360e4e19006168f4 100755 --- a/application/index/controller/Userfavor.php +++ b/application/index/controller/Userfavor.php @@ -95,8 +95,7 @@ class UserFavor extends Common // 开始处理 $params = input('post.'); $params['user'] = $this->user; - $ret = GoodsService::GoodsFavor($params); - return json($ret); + return GoodsService::GoodsFavor($params); } } ?> \ No newline at end of file diff --git a/application/index/controller/Usergoodsbrowse.php b/application/index/controller/Usergoodsbrowse.php index 259dfd2d9b50a026a660a9694333d351fc68a89b..d530b61d86988635571ef8ccf7df9a1176805c39 100755 --- a/application/index/controller/Usergoodsbrowse.php +++ b/application/index/controller/Usergoodsbrowse.php @@ -96,8 +96,7 @@ class UserGoodsBrowse extends Common // 开始处理 $params = input('post.'); $params['user'] = $this->user; - $ret = GoodsService::GoodsBrowseDelete($params); - return json($ret); + return GoodsService::GoodsBrowseDelete($params); } } ?> \ No newline at end of file diff --git a/application/install/config/template.php b/application/install/config/template.php new file mode 100644 index 0000000000000000000000000000000000000000..7dc5d5d11ce7ce973ad8477a6f57ccb714733861 --- /dev/null +++ b/application/install/config/template.php @@ -0,0 +1,35 @@ + +// +---------------------------------------------------------------------- + +// +---------------------------------------------------------------------- +// | 模板设置 +// +---------------------------------------------------------------------- + +return [ + // 模板引擎类型 支持 php think 支持扩展 + 'type' => 'Think', + // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法 + 'auto_rule' => 1, + // 模板路径 + 'view_path' => APP_PATH.'install'.DS.'view'.DS, + // 模板后缀 + 'view_suffix' => 'html', + // 模板文件名分隔符 + 'view_depr' => DIRECTORY_SEPARATOR, + // 模板引擎普通标签开始标记 + 'tpl_begin' => '{{', + // 模板引擎普通标签结束标记 + 'tpl_end' => '}}', + // 标签库标签开始标记 + 'taglib_begin' => '{{', + // 标签库标签结束标记 + 'taglib_end' => '}}', +]; diff --git a/application/install/controller/Common.php b/application/install/controller/Common.php new file mode 100644 index 0000000000000000000000000000000000000000..1a36f50c038f499a4b04afab7aceb5010bc7046e --- /dev/null +++ b/application/install/controller/Common.php @@ -0,0 +1,49 @@ +assign('action', strtolower(request()->action())); + } + + /** + * [_empty 空方法操作] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2017-02-25T15:47:50+0800 + * @param [string] $name [方法名称] + */ + public function _empty($name) + { + $this->assign('msg', $name.' 非法访问'); + return $this->fetch('public/error'); + } + +}?> \ No newline at end of file diff --git a/application/install/controller/Error.php b/application/install/controller/Error.php new file mode 100644 index 0000000000000000000000000000000000000000..3fb6416ddd2c65e79541e7c1374af302a4708008 --- /dev/null +++ b/application/install/controller/Error.php @@ -0,0 +1,31 @@ +assign('msg', $request->controller().' 控制器不存在'); + return $this->fetch('public/error'); + } +} +?> \ No newline at end of file diff --git a/application/install/controller/Index.php b/application/install/controller/Index.php new file mode 100644 index 0000000000000000000000000000000000000000..ea66b0233c99dea3137cbf3932c9703b1f4ff1ab --- /dev/null +++ b/application/install/controller/Index.php @@ -0,0 +1,434 @@ +fetch(); + } + + /** + * 检查 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + */ + public function Check() + { + return $this->fetch(); + } + + /** + * 创建数据库 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + */ + public function Create() + { + return $this->fetch(); + } + + /** + * 完成 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + */ + public function Successful() + { + return $this->fetch(); + } + + /** + * 安装 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + */ + public function Add() + { + // 参数 + $params = input('post.'); + $ret = $this->ParamsCheck($params); + if($ret['code'] != 0) + { + return $ret; + } + + // 配置文件校验 + if(file_exists(ROOT.'config/database.php')) + { + if(!is_writable(ROOT.'config/database.php')) + { + return DataReturn('配置文件没有权限', -1); + } + } + + // 开始安装 + $db = $this->DbObj($params); + if(!is_object($db)) + { + return DataReturn('数据库连接失败', -1); + } + + // mysql版本 + $ret = $this->IsVersion($db); + if($ret['code'] != 0) + { + return $ret; + } + + // 检查数据表是否存在 + if(!$this->IsDbExist($db, $params['DB_NAME'])) + { + if($this->DbNameCreate($db, $params['DB_NAME'])) + { + $db = $this->DbObj($params, $params['DB_NAME']); + } else { + return DataReturn('数据库创建失败', -1); + } + } else { + $db = $this->DbObj($params, $params['DB_NAME']); + } + if(!is_object($db)) + { + return DataReturn('数据库连接失败', -1); + } + + // 创建数据表 + $ret = $this->CreateTable($db); + if($ret['code'] != 0) + { + return $ret; + } + + // 生成配置文件 + return $this->CreateConfig($params); + } + + /** + * 生成配置文件 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + * @param [array] $params [输入参数] + */ + private function CreateConfig($params = []) + { + // 配置文件信息处理 + $db_str=<< +// +---------------------------------------------------------------------- + +return [ + // 数据库类型 + 'type' => '{$params['DB_TYPE']}', + // 服务器地址 + 'hostname' => '{$params['DB_HOST']}', + // 数据库名 + 'database' => '{$params['DB_NAME']}', + // 用户名 + 'username' => '{$params['DB_USER']}', + // 密码 + 'password' => '{$params['DB_PWD']}', + // 端口 + 'hostport' => '{$params['DB_PORT']}', + // 连接dsn + 'dsn' => '', + // 数据库连接参数 + 'params' => [], + // 数据库编码默认采用utf8 + 'charset' => 'utf8mb4', + // 数据库表前缀 + 'prefix' => '{$params['DB_PREFIX']}', + // 数据库调试模式 + 'debug' => true, + // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器) + 'deploy' => 0, + // 数据库读写是否分离 主从式有效 + 'rw_separate' => false, + // 读写分离后 主服务器数量 + 'master_num' => 1, + // 指定从服务器序号 + 'slave_no' => '', + // 自动读取主库数据 + 'read_master' => false, + // 是否严格检查字段是否存在 + 'fields_strict' => true, + // 数据集返回类型 + 'resultset_type' => 'array', + // 自动写入时间戳字段 + 'auto_timestamp' => false, + // 时间字段取出后的默认时间格式 + 'datetime_format' => 'Y-m-d H:i:s', + // 是否需要进行SQL性能分析 + 'sql_explain' => false, + // Builder类 + 'builder' => '', + // Query类 + 'query' => '\\think\\db\\Query', + // 是否需要断线重连 + 'break_reconnect' => false, + // 断线标识字符串 + 'break_match_str' => [], +]; +?> +php; + if(@file_put_contents(ROOT.'config/database.php', $db_str) === false) + { + return DataReturn('配置文件创建失败', -1); + } + return DataReturn('success', 0); + } + + /** + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + * @param [object] $db [db对象] + */ + private function CreateTable($db) + { + if(!file_exists(ROOT.'public/install/shopxo.sql')) + { + return DataReturn('数据库sql文件不存在', -1); + } + + // 导入sql数据并创建表 + $sql_array = preg_split("/;[\r\n]+/", str_replace('`s_', '`'.$params['DB_PREFIX'], file_get_contents(ROOT.'public/install/shopxo.sql'))); + $success = 0; + $failure = 0; + foreach($sql_array as $v) + { + if (!empty($v)) + { + if($db->query($v)) + { + $success++; + } else { + $failure++; + } + } + } + + $result = [ + 'success' => $success, + 'failure' => $failure, + ]; + if($failure > 0) + { + return DataReturn('sql运行失败['.$failure.']条', -1); + } + + // 创建成功标记文件 + @file_put_contents(ROOT.'public/install/install.lock'); + return DataReturn('success', 0, $result); + } + + /** + * 数据库版本校验 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + * @param [object] $db [db对象] + */ + private function IsVersion($db) + { + $data = $db->query("select version() AS version"); + if(empty($data[0]['version'])) + { + return DataReturn('查询数据库版本失败', -1); + } else { + if($data[0]['version'] < 5.0) + { + return DataReturn('数据库版本过低', -1); + } + } + return DataReturn('success', 0); + } + + /** + * 数据库创建 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + * @param [object] $db [db对象] + * @param [string] $db_name [数据库名称] + */ + private function DbNameCreate($db, $db_name) + { + $sql = "CREATE DATABASE IF NOT EXISTS {$db_name} DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci"; + if($db->query($sql) !== false) + { + return $this->IsDbExist($db, $db_name); + } + return false; + } + + /** + * 检查数据库是否存在 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + * @param [object] $db [db对象] + * @param [string] $db_name [数据库名称] + */ + private function IsDbExist($db, $db_name) + { + $temp = $db->query("show databases like '{$db_name}'"); + return !empty($temp); + } + + /** + * 获取数据库操作对象 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + * @param array $params [输入参数] + * @param string $db_name [数据库名称] + */ + private function DbObj($params = [], $db_name = '') + { + return Db::connect([ + // 数据库类型 + 'type' => $params['DB_TYPE'], + // 数据库连接DSN配置 + 'dsn' => '', + // 服务器地址 + 'hostname' => $params['DB_HOST'], + // 数据库名 + 'database' => $db_name, + // 数据库用户名 + 'username' => $params['DB_USER'], + // 数据库密码 + 'password' => $params['DB_PWD'], + // 数据库连接端口 + 'hostport' => $params['DB_PORT'], + // 数据库连接参数 + 'params' => [], + // 数据库编码默认采用utf8 + 'charset' => 'utf8', + // 数据库表前缀 + 'prefix' => $params['DB_PREFIX'], + ]); + } + + /** + * 参数校验 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-28 + * @desc description + * @param [array] $params [输入参数] + */ + private function ParamsCheck($params = []) + { + // 请求类型 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'DB_TYPE', + 'error_msg' => '请选择数据库类型', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'DB_HOST', + 'error_msg' => '请填写数据库服务器地址', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'DB_PORT', + 'error_msg' => '请填写数据库端口', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'DB_NAME', + 'error_msg' => '请填写数据库名', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'DB_USER', + 'error_msg' => '请填写数据库用户名', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'DB_PWD', + 'error_msg' => '请填写数据库密码', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'DB_PREFIX', + 'error_msg' => '请填写数据表前缀', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + return DataReturn('success', 0); + } +} +?> \ No newline at end of file diff --git a/application/install/view/index/check.html b/application/install/view/index/check.html new file mode 100644 index 0000000000000000000000000000000000000000..6ea4dbcf5ca3295bb79f23bb53cf4a516149b2ed --- /dev/null +++ b/application/install/view/index/check.html @@ -0,0 +1,425 @@ +{{include file="public/header" /}} + + +{{include file="public/header_nav" /}} + + +
+

环境检查

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
坏境程序所需当前服务器是否符合
操作系统无限制√
PHP版本>=5.6 + =7) || ($php_version['0']>=5 && $php_version['1']>=6)): ?> + √ + + × + +
GD库2.0 + 2): ?> + √ + + × + +
+ +

目录/文件权限检查

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
坏境所需状态当前状态是否符合
./可写 + + 可写 + + 不可写 + + + + √ + + × + +
./config可写 + + 可写 + + 不可写 + + + + √ + + × + +
./runtime可写 + + 可写 + + 不可写 + + + + √ + + × + +
./public可写 + + 可写 + + 不可写 + + + + √ + + × + +
./public/install可写 + + 可写 + + 不可写 + + + + √ + + × + +
./public/appmini/new可写 + + 可写 + + 不可写 + + + + √ + + × + +
./extend/payment可写 + + 可写 + + 不可写 + + + + √ + + × + +
./application/index/view可写 + + 可写 + + 不可写 + + + + √ + + × + +
+ +

函数/类

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
坏境所需状态当前状态是否符合
curl_init 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
fsockopen 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
mysqli_connect 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
file_get_contents 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
mb_convert_encoding 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
json_encode 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
json_decode 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
simplexml_load_string 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
mb_substr 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
mb_strlen 函数支持 + + 支持 + + 不支持 + + + + √ + + × + +
ZipArchive 类支持 + + 支持 + + 不支持 + + + + √ + + × + +
+ +
+ 上一步 + +
+
+ + +{{include file="public/footer" /}} \ No newline at end of file diff --git a/application/install/view/index/create.html b/application/install/view/index/create.html new file mode 100644 index 0000000000000000000000000000000000000000..3420677dfd49a901d16331e4b77286309cf62218 --- /dev/null +++ b/application/install/view/index/create.html @@ -0,0 +1,67 @@ +{{include file="public/header" /}} + + +{{include file="public/header_nav" /}} + + +
+

数据库信息

+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ 上一步 + +
+
+
+ + +{{include file="public/footer" /}} \ No newline at end of file diff --git a/application/install/view/index/index.html b/application/install/view/index/index.html new file mode 100644 index 0000000000000000000000000000000000000000..15d7010881b3db95b267134c2ba0701453ea40eb --- /dev/null +++ b/application/install/view/index/index.html @@ -0,0 +1,30 @@ +{{include file="public/header" /}} + + +{{include file="public/header_nav" /}} + + +
+

安装协议

+ + +
+ + 同意 +
+
+ + +{{include file="public/footer" /}} \ No newline at end of file diff --git a/application/install/view/index/successful.html b/application/install/view/index/successful.html new file mode 100644 index 0000000000000000000000000000000000000000..44e2cab47d516007284e82d1a3a6b647794363ec --- /dev/null +++ b/application/install/view/index/successful.html @@ -0,0 +1,19 @@ +{{include file="public/header" /}} + + +{{include file="public/header_nav" /}} + + +
+ +

恭喜您安装成功

+
+ 后台管理
+ 默认账号：admin   默认密码为：shopxo +

+ 访问首页 +
+
+ + +{{include file="public/footer" /}} \ No newline at end of file diff --git a/application/install/view/public/error.html b/application/install/view/public/error.html new file mode 100755 index 0000000000000000000000000000000000000000..31f72778ce84f3d2da49fe59c55aa90ce63d17e1 --- /dev/null +++ b/application/install/view/public/error.html @@ -0,0 +1,16 @@ +{{include file="public/header" /}} + + +{{include file="public/header_nav" /}} + + +
+
+
+
{{$msg}}
+
+
+
+ + +{{include file="public/footer" /}} \ No newline at end of file diff --git a/application/install/view/public/footer.html b/application/install/view/public/footer.html new file mode 100755 index 0000000000000000000000000000000000000000..b7cbd368d02e395cd0e863d47a2e9c721ef3dfc1 --- /dev/null +++ b/application/install/view/public/footer.html @@ -0,0 +1,12 @@ + +{{include file="public/footer_nav" /}} + + + + + + + + + + \ No newline at end of file diff --git a/application/install/view/public/footer_nav.html b/application/install/view/public/footer_nav.html new file mode 100755 index 0000000000000000000000000000000000000000..dd1eefff6e1241a5befdece1217649004c59a18b --- /dev/null +++ b/application/install/view/public/footer_nav.html @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/application/install/view/public/header.html b/application/install/view/public/header.html new file mode 100755 index 0000000000000000000000000000000000000000..046e4469d58be180cf351aaa728f867bddc0fe44 --- /dev/null +++ b/application/install/view/public/header.html @@ -0,0 +1,22 @@ + + + + + ShopXO安装程序 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/install/view/public/header_nav.html b/application/install/view/public/header_nav.html new file mode 100755 index 0000000000000000000000000000000000000000..ad127c089fc294bc2c4de9dcfe9edf34af895c61 --- /dev/null +++ b/application/install/view/public/header_nav.html @@ -0,0 +1,21 @@ +
+
+

ShopXO安装向导

+
    +
  • 1
    • +
  • 使用协议
    • +
+
    +
  • 2
    • +
  • 环境检测
    • +
+
    +
  • 3
    • +
  • 创建数据
    • +
+
    +
  • 4
    • +
  • 安装完成
    • +
+
+
\ No newline at end of file diff --git a/application/install/view/public/index.html b/application/install/view/public/index.html new file mode 100755 index 0000000000000000000000000000000000000000..0519ecba6ea913e21689ec692e81e9e4973fbf73 --- /dev/null +++ b/application/install/view/public/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config/database.php b/config/database.php index c8bf33777919dd0bc287c0407be507806f2de8b6..39831ca6e3668a5e375dad6aeeb00cb40ca5ab27 100755 --- a/config/database.php +++ b/config/database.php @@ -61,3 +61,4 @@ return [ // 断线标识字符串 'break_match_str' => [], ]; +?> \ No newline at end of file diff --git a/public/install/shopxo_tp5.sql b/public/install/shopxo.sql similarity index 100% rename from public/install/shopxo_tp5.sql rename to public/install/shopxo.sql diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index 06b13dc05f8c5a69f0bf3b02bc9932c8be9dd4be..fdefda57a65b4c9e8ea3915eaf7cb30bceeaf864 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -1474,22 +1474,25 @@ $(function() // 颜色选择器 - $('.colorpicker-submit').colorpicker( - { - fillcolor:true, - success:function(o, color) - { - var style = o.context.dataset.colorStyle || 'color'; - $(o.context.dataset.inputTag).css(style, color); - $(o.context.dataset.colorTag).val(color); - }, - reset:function(o) - { - var style = o.context.dataset.colorStyle || 'color'; - $(o.context.dataset.inputTag).css(style, ''); - $(o.context.dataset.colorTag).val(''); - } - }); + if($('.colorpicker-submit').length > 0) + { + $('.colorpicker-submit').colorpicker( + { + fillcolor:true, + success:function(o, color) + { + var style = o.context.dataset.colorStyle || 'color'; + $(o.context.dataset.inputTag).css(style, color); + $(o.context.dataset.colorTag).val(color); + }, + reset:function(o) + { + var style = o.context.dataset.colorStyle || 'color'; + $(o.context.dataset.inputTag).css(style, ''); + $(o.context.dataset.colorTag).val(''); + } + }); + } // 监听多图上传和上传附件组件的插入动作 diff --git a/public/static/install/css/index.css b/public/static/install/css/index.css new file mode 100644 index 0000000000000000000000000000000000000000..65d5d2395edd1712ea521b4b69af30518bdc9c1b --- /dev/null +++ b/public/static/install/css/index.css @@ -0,0 +1,176 @@ +body { + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 14px; + line-height: 1.42857143; + color: #333; + background-color: #fff; +} +ul { + padding: 0; + margin: 0; +} +li { + list-style: none; +} +h2 { + margin: 0 0 5px 0; +} +.inside { + margin: 0 auto; + padding: 10px; +} +.agree { + width: 100%; + height: 60px; + line-height: 60px; + text-align: center; +} +.agree .am-btn-secondary { + margin-right: 20px; +} +.agree .am-btn-success { + margin-left: 20px; +} +.am-footer { + border-top: 1px solid #eee; +} + +/** + * 导航 + */ +.header-nav { + width: 100%; + height: 40px; + background: #333333; + color: #fff; + overflow: hidden; +} +.header-nav .inside { + height: 40px; + padding: 0; +} +.header-nav .inside .logo-name { + width: 160px; + height: 40px; + font-size: 20px; + float: left; + margin-top: 7px; +} +.header-nav .inside .logo-name span { + font-size: 12px; + margin-left: 2px; +} +.header-nav .inside .schedule { + margin-left: 5px; + width: 17%; + height: 30px; + float: left; + margin-top: 8px; +} +.header-nav .inside .active .number { + background: #008CBA !important; +} +.header-nav .inside .active .word { + color: #008CBA !important; +} +.header-nav .inside .schedule .number { + width: 25px; + height: 25px; + line-height: 25px; + text-align: center; + font-size: 12px; + border-radius: 50%; + background: #80AAB7; + float: left; +} +.header-nav .inside .schedule .word { + width: 60px; + height: 25px; + float: left; + line-height: 28px; + text-indent: 5px; + font-size: 12px; +} + +@media only screen and (min-width: 641px) { + .inside { + max-width: 1000px; + } +} + +@media only screen and (max-width: 641px) { + .header-nav .inside .logo-name { + display: none; + } + .header-nav .inside .schedule .word { + width: 53px; + height: 20px; + line-height: 20px; + } + .header-nav .inside .schedule { + width: 23%; + margin-top: 10px; + } + .header-nav .inside .schedule .number { + width: 20px; + height: 20px; + line-height: 20px; + } + .header-nav .inside .schedule .word { + text-indent: 3px; + } +} + + +/** + * 协议 + */ +.agreement { + font-size: 16px; + margin-bottom: 5px; +} +.agreement ul li.title { + font-size: 18px; + font-weight: 500; + margin: 30px 0 10px 0; +} +.agreement ul li:not(.title) { + font-size: 14px; + line-height: 20px; + margin-bottom: 15px; + color: #777; +} + + +/** + * 检查 + */ +.check h2 { + background: #eaeaea; + margin-bottom: 0px; + padding: 5px; +} + + +/** + * 完成 + */ +.success { + text-align: center; + padding: 60px 0 30px 0; +} +.success h2 { + margin-top: 10px; +} +.success .box { + text-align: left; + width: 260px; + margin: 0 auto; +} + +/** + * 错误 + */ +.error { + margin: 50px 0; +} \ No newline at end of file diff --git a/public/static/install/js/index.js b/public/static/install/js/index.js new file mode 100644 index 0000000000000000000000000000000000000000..5af594e7fdb841c4aaec3c85b09b3f4a9c934222 --- /dev/null +++ b/public/static/install/js/index.js @@ -0,0 +1,15 @@ +$(function() +{ + // 环境检查 + $('.check-submit').on('click', function() + { + var count = $('.check table tr').length-3; + if($('.check .yes').length < count) + { + Prompt('您的配置或权限不符合要求'); + } else { + location.href = $(this).data('url'); + } + }); + +}); \ No newline at end of file diff --git a/public/static/upload/index.html b/public/static/upload/index.html new file mode 100755 index 0000000000000000000000000000000000000000..0519ecba6ea913e21689ec692e81e9e4973fbf73 --- /dev/null +++ b/public/static/upload/index.html @@ -0,0 +1 @@ + \ No newline at end of file