From 63bb409fc1971df103a4fe4d59b22b5014656ebf Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 25 Mar 2019 09:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Goods.php | 8 --------
 application/service/GoodsService.php | 4 ++--
 application/tags.php                 | 8 --------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php
index 457de1990..6c327428a 100755
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@@ -117,10 +117,6 @@ class Goods extends Common
     {
         // 开始处理
         $params = $this->data_post;
-        if(isset($_POST['spec']))
-        {
-            $params['spec'] = $_POST['spec'];
-        }
         return GoodsService::GoodsSpecType($params);
     }
 
@@ -136,10 +132,6 @@ class Goods extends Common
     {
         // 开始处理
         $params = $this->data_post;
-        if(isset($_POST['spec']))
-        {
-            $params['spec'] = $_POST['spec'];
-        }
         return GoodsService::GoodsSpecDetail($params);
     }
 
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index 18e1d6c2e..e2d81e8cf 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -1789,7 +1789,7 @@ class GoodsService
             // 规格不为数组则为json字符串
             if(!is_array($params['spec']))
             {
-                $params['spec'] = json_decode($params['spec'], true);
+                $params['spec'] = json_decode(htmlspecialchars_decode($params['spec']), true);
             }
             foreach($params['spec'] as $v)
             {
@@ -1903,7 +1903,7 @@ class GoodsService
         // 规格不为数组则为json字符串
         if(!is_array($params['spec']))
         {
-            $params['spec'] = json_decode($params['spec'], true);
+            $params['spec'] = json_decode(htmlspecialchars_decode($params['spec']), true);
         }
         foreach($params['spec'] as $v)
         {
diff --git a/application/tags.php b/application/tags.php
index 5454c299d..ec41fab98 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -62,14 +62,6 @@ return array (
     1 => 'app\\plugins\\commononlineservice\\Hook',
     2 => 'app\\plugins\\expressforkdn\\Hook',
   ),
-  'plugins_service_goods_handle_end' => 
-  array (
-    0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
-  ),
-  'plugins_service_goods_spec_base' => 
-  array (
-    0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
-  ),
   'plugins_service_navigation_header_handle' => 
   array (
     0 => 'app\\plugins\\answers\\Hook',