diff --git a/application/plugins/membershiplevel/Hook.php b/application/plugins/membershiplevel/Hook.php index 6e6fd51ea98dcd8e60d2f2b64e39093f43865201..28a3c013598e7b860d382f774994ad386efac4fd 100755 --- a/application/plugins/membershiplevel/Hook.php +++ b/application/plugins/membershiplevel/Hook.php @@ -58,7 +58,10 @@ class Hook extends Controller // 商品数据处理后 case 'plugins_service_goods_handle_end' : - $this->GoodsHandleEnd($params['goods']); + if($module_name != 'admin') + { + $this->GoodsHandleEnd($params['goods']); + } break; // 商品规格基础数据 @@ -156,12 +159,7 @@ class Hook extends Controller // 无价格字段则不处理 if(isset($goods['price'])) { - if(empty($goods['original_price'])) - { - $goods['original_price'] = $goods['price']; - } - - // 价格处理 + $goods['original_price'] = $goods['price']; $goods['price'] = Service::PriceCalculate($goods['price'], $level['discount_rate'], 0); $price_title = empty($level['name']) ? '会员价' : $level['name']; $goods['show_field_price_text'] = ''.$price_title.''; diff --git a/application/plugins/membershiplevel/service/Service.php b/application/plugins/membershiplevel/service/Service.php index cbd4bb4b98e14502c7eca490bacb17163634d9c8..05fa5f84b0a552574bd1c65ab2bfad6123d89295 100755 --- a/application/plugins/membershiplevel/service/Service.php +++ b/application/plugins/membershiplevel/service/Service.php @@ -395,9 +395,12 @@ class Service $base = PluginsService::PluginsData('membershiplevel', Service::$base_config_attachment_field); if(!empty($base['data']['level_list'])) { + // 规则 + $level_rules = isset($base['data']['level_rules']) ? $base['data']['level_rules'] : 0; + // 匹配类型 $value = 0; - switch($base['data']['level_rules']) + switch($level_rules) { // 积分(可用积分) case 0 : diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index 330f6346da678fce27ce51a0606781358237c698..b2e1be21bddb324cba5424be38d67115742a7774 100755 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -1001,9 +1001,6 @@ php; } } - // 去除包名 - $file = substr($file, strpos($file, '/')+1); - // 排除临时文件和临时目录 if(strpos($file, '/.') === false && strpos($file, '__') === false) { @@ -1013,7 +1010,7 @@ php; { if(strpos($file, $dir_key) !== false) { - $file = str_replace($dir_key.'/', '', $dir_value.$file); + $file = str_replace($plugins_name.'/'.$dir_key.'/', '', $dir_value.$file); $is_has_find = true; break; } @@ -1027,7 +1024,7 @@ php; // 截取文件路径 $file_path = substr($file, 0, strrpos($file, '/')); - + // 路径不存在则创建 \base\FileUtil::CreateDir($file_path);