diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index 900b94942..bbbc69978 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -74,12 +74,13 @@ class Goods extends Common // 获取数据列表 $data_params = [ - 'where' => $where, - 'm' => $page->GetPageStarNumber(), - 'n' => $number, - 'is_category' => 1, + 'where' => $where, + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'is_category' => 1, + 'is_admin_access' => 1, ]; - $data = GoodsService::GoodsList($data_params); + $ret = GoodsService::GoodsList($data_params); // 是否上下架 $this->assign('common_is_shelves_list', lang('common_is_shelves_list')); @@ -89,7 +90,7 @@ class Goods extends Common $this->assign('params', $params); $this->assign('page_html', $page->GetPageHtml()); - $this->assign('data', $data); + $this->assign('data', $ret['data']); return $this->fetch(); } @@ -116,15 +117,15 @@ class Goods extends Common 'is_content_app' => 1, 'is_category' => 1, ]; - $data = GoodsService::GoodsList($data_params); - if(empty($data[0])) + $ret = GoodsService::GoodsList($data_params); + if(empty($ret['data'][0])) { return $this->error('商品信息不存在', MyUrl('admin/goods/index')); } - $this->assign('data', $data[0]); + $this->assign('data', $ret['data'][0]); // 获取商品编辑规格 - $specifications = GoodsService::GoodsEditSpecifications($data[0]['id']); + $specifications = GoodsService::GoodsEditSpecifications($ret['data'][0]['id']); $this->assign('specifications', $specifications); } diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index 335081f61..18e42e6d9 100755 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -61,16 +61,16 @@ class Goods extends Common 'is_spec' => true, 'is_content_app' => true, ]; - $goods = GoodsService::GoodsList($params); - if(empty($goods[0]) || $goods[0]['is_delete_time'] != 0) + $ret = GoodsService::GoodsList($params); + if(empty($ret['data'][0]) || $ret['data'][0]['is_delete_time'] != 0) { return DataReturn('商品不存在或已删除', -1); } - unset($goods[0]['content_web']); + unset($ret['data'][0]['content_web']); // 当前登录用户是否已收藏 $ret_favor = GoodsService::IsUserGoodsFavor(['goods_id'=>$goods_id, 'user'=>$this->user]); - $goods[0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; + $ret['data'][0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; // 商品访问统计 GoodsService::GoodsAccessCountInc(['goods_id'=>$goods_id]); @@ -80,7 +80,7 @@ class Goods extends Common // 数据返回 $result = [ - 'goods' => $goods[0], + 'goods' => $ret['data'][0], 'common_order_is_booking' => (int) MyC('common_order_is_booking', 0), ]; return DataReturn('success', 0, $result); diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 052f1bff5..1671373b0 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -81,22 +81,22 @@ class Common extends Controller private function CommonPluginsInit() { // css钩子 - $this->assign('plugins_css_data', Hook::listen('plugins_css', ['hook_name'=>'plugins_css', 'is_control'=>false])); + $this->assign('plugins_css_data', Hook::listen('plugins_css', ['hook_name'=>'plugins_css', 'is_backend'=>false])); // js钩子 - $this->assign('plugins_js_data', Hook::listen('plugins_js', ['hook_name'=>'plugins_js', 'is_control'=>false])); + $this->assign('plugins_js_data', Hook::listen('plugins_js', ['hook_name'=>'plugins_js', 'is_backend'=>false])); // 公共header内钩子 - $this->assign('plugins_common_header_data', Hook::listen('plugins_common_header', ['hook_name'=>'plugins_common_header', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_common_header_data', Hook::listen('plugins_common_header', ['hook_name'=>'plugins_common_header', 'is_backend'=>false, 'user'=>$this->user])); // 公共页面底部钩子 - $this->assign('plugins_common_page_bottom_data', Hook::listen('plugins_common_page_bottom', ['hook_name'=>'plugins_common_page_bottom', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_common_page_bottom_data', Hook::listen('plugins_common_page_bottom', ['hook_name'=>'plugins_common_page_bottom', 'is_backend'=>false, 'user'=>$this->user])); // 公共顶部钩子 - $this->assign('plugins_view_common_top_data', Hook::listen('plugins_view_common_top', ['hook_name'=>'plugins_view_common_top', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_common_top_data', Hook::listen('plugins_view_common_top', ['hook_name'=>'plugins_view_common_top', 'is_backend'=>false, 'user'=>$this->user])); // 公共底部钩子 - $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_backend'=>false, 'user'=>$this->user])); } /** diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php index e41161b14..1e68569d1 100755 --- a/application/index/controller/Goods.php +++ b/application/index/controller/Goods.php @@ -52,24 +52,24 @@ class Goods extends Common 'is_photo' => true, 'is_spec' => true, ]; - $goods = GoodsService::GoodsList($params); - if(empty($goods[0]) || $goods[0]['is_delete_time'] != 0) + $ret = GoodsService::GoodsList($params); + if(empty($ret['data'][0]) || $ret['data'][0]['is_delete_time'] != 0) { $this->assign('msg', '资源不存在或已被删除'); return $this->fetch('/public/tips_error'); } else { // 当前登录用户是否已收藏 $ret_favor = GoodsService::IsUserGoodsFavor(['goods_id'=>$id, 'user'=>$this->user]); - $goods[0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; + $ret['data'][0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; // 商品评价总数 - $goods[0]['comments_count'] = GoodsService::GoodsCommentsTotal($id); + $ret['data'][0]['comments_count'] = GoodsService::GoodsCommentsTotal($id); // 商品收藏总数 - $goods[0]['favor_count'] = GoodsService::GoodsFavorTotal(['goods_id'=>$id]); + $ret['data'][0]['favor_count'] = GoodsService::GoodsFavorTotal(['goods_id'=>$id]); - $this->assign('goods', $goods[0]); - $this->assign('home_seo_site_title', $goods[0]['title']); + $this->assign('goods', $ret['data'][0]); + $this->assign('home_seo_site_title', $ret['data'][0]['title']); // 二维码 $this->assign('qrcode_url', MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode(MyUrl('index/goods/index', ['id'=>$id], true, true)))])); @@ -90,7 +90,8 @@ class Goods extends Common 'field' => 'id,title,title_color,price,images', 'n' => 10, ]; - $this->assign('left_goods', GoodsService::GoodsList($params)); + $right_goods = GoodsService::GoodsList($params); + $this->assign('left_goods', $right_goods['data']); // 详情tab商品 猜你喜欢 $params = [ @@ -103,7 +104,8 @@ class Goods extends Common 'field' => 'id,title,title_color,price,images,home_recommended_images', 'n' => 16, ]; - $this->assign('detail_like_goods', GoodsService::GoodsList($params)); + $like_goods = GoodsService::GoodsList($params); + $this->assign('detail_like_goods', $like_goods['data']); return $this->fetch(); } diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php index 160bd33f6..252260bc6 100755 --- a/application/index/controller/Search.php +++ b/application/index/controller/Search.php @@ -97,8 +97,8 @@ class Search extends Common public function GoodsList() { // 获取商品列表 - $data = SearchService::GoodsList($this->params); - if(empty($data['data'])) + $ret = SearchService::GoodsList($this->params); + if(empty($ret['data'])) { $msg = '没有相关数据'; $code = -100; @@ -111,7 +111,7 @@ class Search extends Common SearchService::SearchAdd($this->params); // 返回 - return DataReturn($msg, $code, $data); + return DataReturn($msg, $code, $ret['data']); } } ?> \ No newline at end of file diff --git a/application/index/controller/User.php b/application/index/controller/User.php index 21b511411..768f14ce9 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -137,7 +137,7 @@ class User extends Common $this->assign('goods_browse_list', $data['data']); // 用户中心顶部钩子 - $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_backend'=>false, 'user'=>$this->user])); return $this->fetch(); } diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html index d1af19eed..d474064fa 100755 --- a/application/index/view/default/goods/index.html +++ b/application/index/view/default/goods/index.html @@ -91,7 +91,7 @@ {{/if}}
-
促销价
+
销售价
¥ {{$goods.price}} diff --git a/application/plugins/commongobacktop/Hook.php b/application/plugins/commongobacktop/Hook.php index 7dbe9fce9..4cc87dd7d 100755 --- a/application/plugins/commongobacktop/Hook.php +++ b/application/plugins/commongobacktop/Hook.php @@ -33,9 +33,9 @@ class Hook extends Controller public function run($params = []) { // 是否控制器钩子 - // is_control 当前为控制器业务处理 + // is_backend 当前为后端业务处理 // hook_name 钩子名称 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { // 参数一 描述 // 参数二 0 为处理成功, 负数为失败 diff --git a/application/plugins/commononlineservice/Hook.php b/application/plugins/commononlineservice/Hook.php index 79057e630..f0393374c 100755 --- a/application/plugins/commononlineservice/Hook.php +++ b/application/plugins/commononlineservice/Hook.php @@ -33,9 +33,9 @@ class Hook extends Controller public function run($params = []) { // 是否控制器钩子 - // is_control 当前为控制器业务处理 + // is_backend 当前为后端业务处理 // hook_name 钩子名称 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { // 参数一 描述 // 参数二 0 为处理成功, 负数为失败 diff --git a/application/plugins/commonrightnavigation/Hook.php b/application/plugins/commonrightnavigation/Hook.php index a57c70e13..adc13e26c 100755 --- a/application/plugins/commonrightnavigation/Hook.php +++ b/application/plugins/commonrightnavigation/Hook.php @@ -34,9 +34,9 @@ class Hook extends Controller public function run($params = []) { // 是否控制器钩子 - // is_control 当前为控制器业务处理 + // is_backend 当前为后端业务处理 // hook_name 钩子名称 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { // 参数一 描述 // 参数二 0 为处理成功, 负数为失败 diff --git a/application/plugins/commontopmaxpicture/Hook.php b/application/plugins/commontopmaxpicture/Hook.php index a3a08052a..f602c2cde 100755 --- a/application/plugins/commontopmaxpicture/Hook.php +++ b/application/plugins/commontopmaxpicture/Hook.php @@ -31,8 +31,8 @@ class Hook extends Controller */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { return DataReturn('无需处理', 0); diff --git a/application/plugins/commontopnotice/Hook.php b/application/plugins/commontopnotice/Hook.php index c5f3b834e..6a9a3bec4 100755 --- a/application/plugins/commontopnotice/Hook.php +++ b/application/plugins/commontopnotice/Hook.php @@ -32,8 +32,8 @@ class Hook extends Controller */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { return DataReturn('无需处理', 0); diff --git a/application/plugins/usercentertopnotice/Hook.php b/application/plugins/usercentertopnotice/Hook.php index a23a50867..535a9f3a6 100755 --- a/application/plugins/usercentertopnotice/Hook.php +++ b/application/plugins/usercentertopnotice/Hook.php @@ -32,8 +32,8 @@ class Hook extends Controller */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { return DataReturn('无需处理', 0); diff --git a/application/plugins/userloginrewardintegral/Hook.php b/application/plugins/userloginrewardintegral/Hook.php index 0394faa75..4b3958c70 100755 --- a/application/plugins/userloginrewardintegral/Hook.php +++ b/application/plugins/userloginrewardintegral/Hook.php @@ -34,15 +34,15 @@ class Hook */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { if(!empty($params['user_id'])) { switch($params['hook_name']) { // 用户登录成功后赠送积分 - case 'plugins_control_user_login_end' : + case 'plugins_service_user_login_end' : $ret = $this->LoginGiveIntegral($params); break; diff --git a/application/plugins/userloginrewardintegral/config.json b/application/plugins/userloginrewardintegral/config.json index 42ba38693..cfa30ca39 100755 --- a/application/plugins/userloginrewardintegral/config.json +++ b/application/plugins/userloginrewardintegral/config.json @@ -17,7 +17,7 @@ "is_home":false }, "hook":{ - "plugins_control_user_login_end":[ + "plugins_service_user_login_end":[ "app\\plugins\\userloginrewardintegral\\Hook" ] } diff --git a/application/plugins/usernotloginhidegoodsprice/Admin.php b/application/plugins/usernotloginhidegoodsprice/Admin.php new file mode 100644 index 000000000..04490d04c --- /dev/null +++ b/application/plugins/usernotloginhidegoodsprice/Admin.php @@ -0,0 +1,96 @@ +assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/index'); + } else { + return $ret['msg']; + } + } + + /** + * 编辑页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function saveinfo($params = []) + { + $ret = PluginsService::PluginsData('usernotloginhidegoodsprice'); + if($ret['code'] == 0) + { + // 限制终端 + $ret['data']['limit_terminal'] = empty($ret['data']['limit_terminal']) ? [] : explode(',', $ret['data']['limit_terminal']); + + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/saveinfo'); + } else { + return $ret['msg']; + } + } + + /** + * 数据保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + return PluginsService::PluginsDataSave(['plugins'=>'usernotloginhidegoodsprice', 'data'=>$params]); + } +} +?> \ No newline at end of file diff --git a/application/plugins/usernotloginhidegoodsprice/Hook.php b/application/plugins/usernotloginhidegoodsprice/Hook.php new file mode 100644 index 000000000..bf3ef29b5 --- /dev/null +++ b/application/plugins/usernotloginhidegoodsprice/Hook.php @@ -0,0 +1,116 @@ +PriceHandle($params); + + // 默认返回视图 + } else { + return ''; + } + } + + /** + * 价格处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-14T22:19:08+0800 + * @param [array] $params [参数] + */ + private function PriceHandle($params) + { + // 获取应用数据 + $ret = PluginsService::PluginsData('usernotloginhidegoodsprice'); + if($ret['code'] == 0) + { + // 用户是否已登录 + if(session('user') != null) + { + return DataReturn('无需处理', 0); + } + + // 限制终端 + if(!empty($ret['data']['limit_terminal'])) + { + $limit_terminal_all = explode(',', $ret['data']['limit_terminal']); + $client_type = APPLICATION_CLIENT_TYPE; + if($client_type == 'pc' && IsMobile()) + { + $client_type = 'h5'; + } + if(!in_array($client_type, $limit_terminal_all)) + { + return DataReturn('无需处理', 0); + } + } + + // 原价 + $original_price_placeholder = isset($ret['data']['original_price_placeholder']) ? $ret['data']['original_price_placeholder'] : ''; + + // 销售价 + $price_placeholder = isset($ret['data']['price_placeholder']) ? $ret['data']['price_placeholder'] : ''; + + // 商品原价 + if(isset($params['goods']['original_price'])) + { + $params['goods']['original_price'] = $original_price_placeholder; + } + if(isset($params['goods']['min_original_price'])) + { + $params['goods']['min_original_price'] = $original_price_placeholder; + } + if(isset($params['goods']['max_original_price'])) + { + $params['goods']['max_original_price'] = $original_price_placeholder; + } + + // 销售价 + if(isset($params['goods']['price'])) + { + $params['goods']['price'] = $price_placeholder; + } + if(isset($params['goods']['min_price'])) + { + $params['goods']['min_price'] = $price_placeholder; + } + if(isset($params['goods']['max_price'])) + { + $params['goods']['max_price'] = $price_placeholder; + } + + return DataReturn('处理成功', 0); + } else { + return $ret; + } + } +} +?> \ No newline at end of file diff --git a/application/plugins/usernotloginhidegoodsprice/config.json b/application/plugins/usernotloginhidegoodsprice/config.json new file mode 100644 index 000000000..32a8a9cc2 --- /dev/null +++ b/application/plugins/usernotloginhidegoodsprice/config.json @@ -0,0 +1,28 @@ +{ + "base":{ + "plugins":"usernotloginhidegoodsprice", + "name":"未登录隐藏商品价格", + "logo":"\/static\/upload\/images\/plugins_usernotloginhidegoodsprice\/2019\/02\/26\/1551184745400164.png", + "author":"Devil", + "author_url":"https:\/\/shopxo.net\/", + "version":"1.0.0", + "desc":"用户未登录不展示商品价格", + "apply_terminal":[ + "pc", + "h5", + "app", + "alipay", + "weixin", + "baidu" + ], + "apply_version":[ + "1.4.0" + ], + "is_home":false + }, + "hook":{ + "plugins_service_goods_handle_begin":[ + "app\\plugins\\usernotloginhidegoodsprice\\Hook" + ] + } +} \ No newline at end of file diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/index.html b/application/plugins/view/usernotloginhidegoodsprice/admin/index.html new file mode 100755 index 000000000..5ea710202 --- /dev/null +++ b/application/plugins/view/usernotloginhidegoodsprice/admin/index.html @@ -0,0 +1,51 @@ +{{include file="public/header" /}} + + +
+
+ + 未登录隐藏商品价格 + 返回 + + +
+
+ +
+ {{if !empty($data['original_price_placeholder'])}} + {{$data.original_price_placeholder}} + {{else /}} + 未填写 + {{/if}} +
+
+
+ +
+ {{if !empty($data['price_placeholder'])}} + {{$data.price_placeholder}} + {{else /}} + 未填写 + {{/if}} +
+
+
+ +
+ {{if !empty($data['limit_terminal_text'])}} + {{$data.limit_terminal_text}} + {{else /}} + 全部 + {{/if}} +
+
+ + 编辑 +
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html b/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html new file mode 100755 index 000000000..9656f6595 --- /dev/null +++ b/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html @@ -0,0 +1,43 @@ +{{include file="public/header" /}} + + +
+
+ +
+ + 未登录隐藏商品价格 + 返回 + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 109297b86..98416c658 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -371,32 +371,32 @@ class BuyService ], 'field' => 'id, id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number', ]; - $goods = GoodsService::GoodsList($p); - if(empty($goods[0])) + $ret = GoodsService::GoodsList($p); + if(empty($ret['data'][0])) { return DataReturn('资源不存在或已被删除', -10); } // 规格 - $goods[0]['spec'] = self::GoodsSpecificationsHandle($params); + $ret['data'][0]['spec'] = self::GoodsSpecificationsHandle($params); // 获取商品基础信息 - $goods_base = GoodsService::GoodsSpecDetail(['id'=>$goods[0]['goods_id'], 'spec'=>$goods[0]['spec']]); + $goods_base = GoodsService::GoodsSpecDetail(['id'=>$ret['data'][0]['goods_id'], 'spec'=>$ret['data'][0]['spec']]); if($goods_base['code'] == 0) { - $goods[0]['inventory'] = $goods_base['data']['inventory']; - $goods[0]['price'] = $goods_base['data']['price']; - $goods[0]['original_price'] = $goods_base['data']['original_price']; - $goods[0]['spec_weight'] = $goods_base['data']['weight']; - $goods[0]['spec_coding'] = $goods_base['data']['coding']; - $goods[0]['spec_barcode'] = $goods_base['data']['barcode']; + $ret['data'][0]['inventory'] = $goods_base['data']['inventory']; + $ret['data'][0]['price'] = $goods_base['data']['price']; + $ret['data'][0]['original_price'] = $goods_base['data']['original_price']; + $ret['data'][0]['spec_weight'] = $goods_base['data']['weight']; + $ret['data'][0]['spec_coding'] = $goods_base['data']['coding']; + $ret['data'][0]['spec_barcode'] = $goods_base['data']['barcode']; } else { return $goods_base; } // 数量/小计 - $goods[0]['stock'] = $params['stock']; - $goods[0]['total_price'] = $params['stock']*$goods[0]['price']; + $ret['data'][0]['stock'] = $params['stock']; + $ret['data'][0]['total_price'] = $params['stock']*$ret['data'][0]['price']; return DataReturn('操作成功', 0, $goods); } diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 94913f675..84f835c60 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -11,6 +11,7 @@ namespace app\service; use think\Db; +use think\facade\Hook; use app\service\ResourcesService; use app\service\BrandService; use app\service\RegionService; @@ -153,7 +154,8 @@ class GoodsService foreach($goods_category as &$v) { $category_ids = self::GoodsCategoryItemsIds([$v['id']], 1); - $v['goods'] = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'is_home_recommended'=>1], 'm'=>0, 'n'=>6, 'field'=>'g.id,g.title,g.title_color,g.images,g.home_recommended_images,g.original_price,g.price,g.min_price,g.max_price,g.inventory,g.buy_min_number,g.buy_max_number']); + $goods = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'is_home_recommended'=>1], 'm'=>0, 'n'=>6, 'field'=>'g.id,g.title,g.title_color,g.images,g.home_recommended_images,g.original_price,g.price,g.min_price,g.max_price,g.inventory,g.buy_min_number,g.buy_max_number']); + $v['goods'] = $goods['data']; } } return $goods_category; @@ -246,6 +248,20 @@ class GoodsService // 开始处理数据 foreach($data as &$v) { + // 商品处理前钩子 + $hook_name = 'plugins_service_goods_handle_begin'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'goods' => &$v, + 'goods_id' => $v['id'] + ]); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } + // 商品url地址 if(!empty($v['id'])) { @@ -328,9 +344,23 @@ class GoodsService { $v['content_app'] = self::GoodsContentApp(['goods_id'=>$v['id']]); } + + // 商品处理前钩子 + $hook_name = 'plugins_service_goods_handle_end'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'goods' => &$v, + 'goods_id' => $v['id'] + ]); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } } } - return $data; + return DataReturn('处理成功', 0, $data); } /** diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index f2ad60dc9..1bb49c8ee 100644 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -486,7 +486,9 @@ class PluginsAdminService $admin=<<'plugins_control_user_login_begin', 'is_control'=>true, 'params'=>$params, 'user_id'=>$user['id']]); + $hook_name = 'plugins_service_user_login_begin'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'user_id' => $user['id'] + ]); if(isset($ret['code']) && $ret['code'] != 0) { return $ret; @@ -852,7 +858,13 @@ class UserService if(self::UserLoginRecord($user['id'])) { // 用户登录后钩子 - $ret = Hook::listen('plugins_control_user_login_end', ['hook_name'=>'plugins_control_user_login_end', 'is_control'=>true, 'params'=>$params, 'user_id'=>$user['id']]); + $hook_name = 'plugins_service_user_login_end'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'user_id' => $user['id'] + ]); if(isset($ret['code']) && $ret['code'] != 0) { return $ret; diff --git a/application/tags.php b/application/tags.php index 051a7d96e..634345bd2 100755 --- a/application/tags.php +++ b/application/tags.php @@ -41,7 +41,7 @@ return array ( array ( 0 => 'app\\plugins\\usercentertopnotice\\Hook', ), - 'plugins_control_user_login_end' => + 'plugins_service_user_login_end' => array ( 0 => 'app\\plugins\\userloginrewardintegral\\Hook', ), @@ -60,5 +60,9 @@ return array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', 1 => 'app\\plugins\\commononlineservice\\Hook', ), + 'plugins_service_goods_handle_begin' => + array ( + 0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', + ), ); ?> \ No newline at end of file diff --git a/config/shopxo.php b/config/shopxo.php index 3912d471c..1df505894 100644 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -15,7 +15,7 @@ return [ // 开发模式 - 'is_develop' => false, + 'is_develop' => true, // 默认编码 'default_charset' => 'utf-8', diff --git a/config/shopxo.sql b/config/shopxo.sql index 65bcfc983..30a17439a 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -1,20 +1,18 @@ /* - Navicat Premium Data Transfer + Navicat MySQL Data Transfer Source Server : 本机 - Source Server Type : MySQL - Source Server Version : 50722 + Source Server Version : 50716 Source Host : localhost - Source Database : shopxo_test + Source Database : shopxo_ttt - Target Server Type : MySQL - Target Server Version : 50722 + Target Server Version : 50716 File Encoding : utf-8 - Date: 02/26/2019 17:51:45 PM + Date: 02/26/2019 22:44:32 PM */ -SET NAMES utf8mb4; +SET NAMES utf8; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- @@ -348,7 +346,7 @@ CREATE TABLE `s_goods` ( -- Records of `s_goods` -- ---------------------------- BEGIN; -INSERT INTO `s_goods` VALUES ('1', '1', 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE（4G）/TD-SCD', '', '', '0', '125', '步', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '3200.00', '3200.00', '3200.00', '2100.00', '2100.00', '2100.00', '10', '1', '0', '1', '1', '1', '


', '2', '0', '9', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1711', '步', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6000.00-7600.00', '6000.00', '7600.00', '4500.00-6800.00', '4500.00', '6800.00', '30', '1', '0', '1', '1', '1', '


', '2', '0', '10', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('3', '2', 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '0', '235', '步', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '6866.00', '6866.00', '6866.00', '3888.00', '3888.00', '3888.00', '20', '1', '0', '1', '1', '1', '


', '2', '0', '2', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '537', '步', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '2300.00', '2300.00', '1999.00', '1999.00', '1999.00', '19', '1', '0', '1', '1', '1', '


', '2', '0', '49', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '436', '步', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '3200.00', '3200.00', '2499.00', '2499.00', '2499.00', '56', '1', '0', '1', '1', '1', '


', '2', '0', '18', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '321', '步', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '3200.00', '3200.00', '2998.90', '2998.90', '2998.90', '65', '1', '0', '1', '1', '1', '

 X5L/SL/V/M (5.0寸)  X5max钢化膜(5.5寸)  X5pro钢化膜(5.2寸) 



', '2', '0', '26', '', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '0', '1547453135', '1547453157'), ('7', '1', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '0', '320', '件', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '760.00', '760.00', '168.00', '168.00', '168.00', '11', '1', '0', '1', '1', '1', '


', '2', '0', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('8', '1', 'MARNI Trunk 女士 中号拼色十字纹小牛皮 斜挎风琴包', '', '', '0', '35', '件', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '672.00', '672.00', '672.00', '356.00', '356.00', '356.00', '8', '1', '0', '1', '1', '1', '


', '2', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('9', '2', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '0', '598', '件', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '160.00-216.00', '160.00', '216.00', '120.00-158.00', '120.00', '158.00', '2', '1', '0', '1', '1', '1', '


', '3', '0', '61', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '0', '36', '件', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '568.00', '568.00', '228.00', '228.00', '228.00', '28', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】涤棉拼接蕾丝  后中拉链 有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦


XS码尺寸: 悬挂衣长81CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 悬挂衣长82CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 悬挂衣长83CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 悬挂衣长84CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~

蕾丝花是手工修剪出来的，每件都有不同和不规则的哦，有小线头和节点是正常现象哦~请亲们谅解哦~


', '2', '0', '13', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.00', '258.00', '1', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】网纱绣花钉珠拼接蕾丝 有拉链有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸那考虑撑开因素哦 微弹的哦


XS码尺寸: 衣长82CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 衣长83CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 衣长84CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 衣长85CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型，如果腰粗可以适当考虑大1号哦~

大圆领，每个人的身材曲线不同，领口不会很平的哦，请谅解~

肩膀那有暗扣哦，可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~



', '4', '0', '4', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

\"d-1.jpg\"/

\"d-2.jpg\"/

', '3', '0', '11', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551064315'); +INSERT INTO `s_goods` VALUES ('1', '1', 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE（4G）/TD-SCD', '', '', '0', '125', '步', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '3200.00', '3200.00', '3200.00', '2100.00', '2100.00', '2100.00', '10', '1', '0', '1', '1', '1', '


', '2', '0', '20', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1711', '步', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6000.00-7600.00', '6000.00', '7600.00', '4500.00-6800.00', '4500.00', '6800.00', '30', '1', '0', '1', '1', '1', '


', '2', '0', '10', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('3', '2', 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '0', '235', '步', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '6866.00', '6866.00', '6866.00', '3888.00', '3888.00', '3888.00', '20', '1', '0', '1', '1', '1', '


', '2', '0', '2', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '537', '步', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '2300.00', '2300.00', '1999.00', '1999.00', '1999.00', '19', '1', '0', '1', '1', '1', '


', '2', '0', '49', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '436', '步', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '3200.00', '3200.00', '2499.00', '2499.00', '2499.00', '56', '1', '0', '1', '1', '1', '


', '2', '0', '146', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '321', '步', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '3200.00', '3200.00', '2998.90', '2998.90', '2998.90', '65', '1', '0', '1', '1', '1', '

 X5L/SL/V/M (5.0寸)  X5max钢化膜(5.5寸)  X5pro钢化膜(5.2寸) 



', '2', '0', '42', '', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '0', '1547453135', '1547453157'), ('7', '1', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '0', '320', '件', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '760.00', '760.00', '168.00', '168.00', '168.00', '11', '1', '0', '1', '1', '1', '


', '2', '0', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('8', '1', 'MARNI Trunk 女士 中号拼色十字纹小牛皮 斜挎风琴包', '', '', '0', '35', '件', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '672.00', '672.00', '672.00', '356.00', '356.00', '356.00', '8', '1', '0', '1', '1', '1', '


', '2', '0', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('9', '2', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '0', '598', '件', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '160.00-216.00', '160.00', '216.00', '120.00-158.00', '120.00', '158.00', '2', '1', '0', '1', '1', '1', '


', '3', '0', '62', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '0', '36', '件', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '568.00', '568.00', '228.00', '228.00', '228.00', '28', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】涤棉拼接蕾丝  后中拉链 有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦


XS码尺寸: 悬挂衣长81CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 悬挂衣长82CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 悬挂衣长83CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 悬挂衣长84CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~

蕾丝花是手工修剪出来的，每件都有不同和不规则的哦，有小线头和节点是正常现象哦~请亲们谅解哦~


', '2', '0', '13', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.00', '258.00', '1', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】网纱绣花钉珠拼接蕾丝 有拉链有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸那考虑撑开因素哦 微弹的哦


XS码尺寸: 衣长82CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 衣长83CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 衣长84CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 衣长85CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型，如果腰粗可以适当考虑大1号哦~

大圆领，每个人的身材曲线不同，领口不会很平的哦，请谅解~

肩膀那有暗扣哦，可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~



', '4', '0', '4', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

\"d-1.jpg\"/

\"d-2.jpg\"/

', '3', '0', '11', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551064315'); COMMIT; -- ---------------------------- @@ -588,13 +586,13 @@ CREATE TABLE `s_message` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; -- ---------------------------- -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'); +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551192116'); COMMIT; -- ---------------------------- @@ -825,13 +823,13 @@ CREATE TABLE `s_plugins` ( PRIMARY KEY (`id`), UNIQUE KEY `plugins` (`plugins`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; -- ---------------------------- -- Records of `s_plugins` -- ---------------------------- BEGIN; -INSERT INTO `s_plugins` VALUES ('1', 'commontopmaxpicture', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commontopmaxpicture\\/2019\\/02\\/09\\/1549671733978860.jpg\",\"bg_color\":\"#ce0000\",\"url\":\"https:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopmaxpicture\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550145321', '1550461322'), ('2', 'commontopnotice', '{\"content\":\"\\u6b22\\u8fce\\u6765\\u5230ShopXO\\u4f01\\u4e1a\\u7ea7B2C\\u5f00\\u6e90\\u7535\\u5546\\u7cfb\\u7edf\\u3001\\u6f14\\u793a\\u7ad9\\u70b9\\u8bf7\\u52ff\\u53d1\\u8d77\\u652f\\u4ed8\\u3001\\u4ee5\\u514d\\u7ed9\\u60a8\\u5e26\\u6765\\u4e0d\\u5fc5\\u8981\\u7684\\u8d22\\u4ea7\\u635f\\u5931\\u3002\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550156571', '1550461635'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550157860', '1550461859'), ('14', 'userloginrewardintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userloginrewardintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1550461995'), ('15', 'commongobacktop', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commongobacktop\\/2019\\/02\\/15\\/1550210425433304.png\",\"is_overall\":\"1\",\"pluginsname\":\"commongobacktop\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550200998', '1550468447'), ('16', 'commonrightnavigation', '{\"weixin_mini_qrcode_images\":\"\\/static\\/upload\\/images\\/plugins_commonrightnavigation\\/2019\\/02\\/17\\/1550375588899802.jpeg\",\"is_new_window_open\":\"0\",\"is_overall\":\"1\",\"is_goods_page_show_cart\":\"1\",\"pluginsname\":\"commonrightnavigation\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550222925', '1550464997'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1550544406'); +INSERT INTO `s_plugins` VALUES ('1', 'commontopmaxpicture', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commontopmaxpicture\\/2019\\/02\\/09\\/1549671733978860.jpg\",\"bg_color\":\"#ce0000\",\"url\":\"https:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopmaxpicture\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550145321', '1551191935'), ('2', 'commontopnotice', '{\"content\":\"\\u6b22\\u8fce\\u6765\\u5230ShopXO\\u4f01\\u4e1a\\u7ea7B2C\\u5f00\\u6e90\\u7535\\u5546\\u7cfb\\u7edf\\u3001\\u6f14\\u793a\\u7ad9\\u70b9\\u8bf7\\u52ff\\u53d1\\u8d77\\u652f\\u4ed8\\u3001\\u4ee5\\u514d\\u7ed9\\u60a8\\u5e26\\u6765\\u4e0d\\u5fc5\\u8981\\u7684\\u8d22\\u4ea7\\u635f\\u5931\\u3002\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550156571', '1551191934'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550157860', '1551191932'), ('14', 'userloginrewardintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userloginrewardintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1551191930'), ('15', 'commongobacktop', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commongobacktop\\/2019\\/02\\/15\\/1550210425433304.png\",\"is_overall\":\"1\",\"pluginsname\":\"commongobacktop\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550200998', '1551191928'), ('16', 'commonrightnavigation', '{\"weixin_mini_qrcode_images\":\"\\/static\\/upload\\/images\\/plugins_commonrightnavigation\\/2019\\/02\\/17\\/1550375588899802.jpeg\",\"is_new_window_open\":\"0\",\"is_overall\":\"1\",\"is_goods_page_show_cart\":\"1\",\"pluginsname\":\"commonrightnavigation\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u540e\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1551191908'); COMMIT; -- ---------------------------- @@ -1075,7 +1073,7 @@ CREATE TABLE `s_user` ( -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '430953', '13ee29b2b06000b088a07cf36e7062f7', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '982', '0', '0', '0', '0', '1551173481'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '3', '802141', '1809ca664268370c783732f9146e7d6d', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '5', '0', '0', '0', '1551173897', '1551174462'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '277585', 'c34289bfdf655809f384bcfcd2606b24', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '987', '0', '0', '0', '0', '1551192189'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '3', '802141', '1809ca664268370c783732f9146e7d6d', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '5', '0', '0', '0', '1551173897', '1551174462'); COMMIT; -- ---------------------------- @@ -1118,13 +1116,6 @@ CREATE TABLE `s_user_integral_log` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; - --- ---------------------------- --- Records of `s_user_integral_log` --- ---------------------------- -BEGIN; -INSERT INTO `s_user_integral_log` VALUES ('1', '92', '1', '0', '5', '登录奖励积分', '0', '1551174252'); -COMMIT; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index 71d3f45e1..cb1788567 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -381,7 +381,7 @@ li.am-comment{ width:100%} .tb-detail-price{ background: #fcf1e3 url(../images/goods_meta_bg.png); background-size: cover; -moz-background-size: cover; background-repeat: no-repeat; } .tb-detail-price .items {display: block;margin:0px 10px;} .tb-detail-price .items dt {width: 70px;float:left;text-align: left;} - .sys_item_price{font-size: 24px;font-weight: bold;} + .sys_item_price{font-size: 24px;font-weight: bold; line-height: 16px;} .sys_item_mktprice{font-size:14px ;} diff --git a/public/static/plugins/css/usernotloginhidegoodsprice/admin.css b/public/static/plugins/css/usernotloginhidegoodsprice/admin.css new file mode 100755 index 000000000..051871969 --- /dev/null +++ b/public/static/plugins/css/usernotloginhidegoodsprice/admin.css @@ -0,0 +1,15 @@ +/** + * 首页 + */ +.usernotloginhidegoodsprice-content .items { + margin: 10px 0 20px 0; + border-bottom: 1px dashed #f1f1f1; + padding-bottom: 20px; +} +.usernotloginhidegoodsprice-content .items .empty-text { + color: #ccc; +} + +.usernotloginhidegoodsprice-content .edit-submit { + margin-bottom: 20px; +} \ No newline at end of file diff --git a/public/static/upload/images/plugins_usernotloginhidegoodsprice/2019/02/26/1551184745400164.png b/public/static/upload/images/plugins_usernotloginhidegoodsprice/2019/02/26/1551184745400164.png new file mode 100644 index 000000000..ee6152f1b Binary files /dev/null and b/public/static/upload/images/plugins_usernotloginhidegoodsprice/2019/02/26/1551184745400164.png differ