Merge branch 'master' into dev

app/index/controller/Buy.php

@@ -70,6 +70,12 @@ class Buy extends Common
             {
                 MyViewAssign('msg', '商品信息为空');
                 return MyView('public/tips_error');
+            } else {
+                // 规格数据避免被转义
+                if(!empty($data['spec']))
+                {
+                    $data['spec'] = htmlspecialchars_decode($data['spec']);
+                }
             }
 
             // 参数

app/service/BuyService.php

@@ -673,12 +673,12 @@ class BuyService
             {
                 // 正常购买
                 case 'goods' :
-                    $ret = BuyService::BuyGoods($params);
+                    $ret = self::BuyGoods($params);
                     break;
 
                 // 购物车
                 case 'cart' :
-                    $ret = BuyService::BuyCart($params);
+                    $ret = self::BuyCart($params);
                     break;
 
                 // 默认