Add goods_attr to protocol goods_common

data/model/goods.model.php

@@ -1219,6 +1219,31 @@ class goodsModel extends Model
         return dcache($key, 'goods_image');
     }
 
+    private function _formatGoodsAttr($goods_attr){
+
+        $result_attr = array();
+        foreach ($goods_attr as $key => $val) {
+
+            $attr_item['goods_attr_id'] = $key;
+            $attr_item['goods_attr_name'] = $val['name'];
+
+            $goods_attr_value = array();
+            foreach ($val as $id => $name) {
+
+                if ($id !== 'name') {
+                    $val_item['id'] = $id;
+                    $val_item['name'] = $name;
+                    array_push($goods_attr_value, $val_item);
+                }
+            }
+
+            $attr_item['goods_attr_value'] = $goods_attr_value;
+            array_push($result_attr,$attr_item);
+        }
+
+        return $result_attr;
+    }
+
     public function getGoodsSku($goods_id)
     {
         if ($goods_id <= 0) {
@@ -1238,6 +1263,8 @@ class goodsModel extends Model
 
         $goods_common_info['goods_body'] = base64_encode($goods_common_info['goods_body']);
 
+        $goods_common_info['goods_attr'] = $this->_formatGoodsAttr(unserialize($goods_common_info['goods_attr']));
+
         // sku
         $goods_spec_list = $this->getGoodsSpecListByCommonId($goods_info['goods_commonid']);
         foreach ($goods_spec_list as $key => &$value) {

mobile/control/goods.php

@@ -149,7 +149,6 @@ class goodsControl extends mobileHomeControl
     public function goods_commonOp()
     {
         $goods_id = intval($_GET ['goods_id']);
-        $from = $_GET['from'];
 
         // 商品详细信息
         $model_goods = Model('goods');
@@ -212,7 +211,7 @@ class goodsControl extends mobileHomeControl
         unset($goods_detail['goods_info']['spec_value']);
         unset($goods_detail['goods_info']['spec_name']);
         unset($goods_detail['goods_info']['goods_spec']);
-        unset($goods_detail['goods_info']['goods_attr']);
+//        unset($goods_detail['goods_info']['goods_attr']);
 
         unset($goods_detail['groupbuy_info']);
         unset($goods_detail['xianshi_info']);
@@ -353,7 +352,7 @@ class goodsControl extends mobileHomeControl
         unset($goods_detail['goods_info']['cart']);
         unset($goods_detail['goods_info']['buynow_text']);
         unset($goods_detail['groupbuy_info']);
-        unset($goods_detail['xianshi_info']);
+//        unset($goods_detail['xianshi_info']);
 
         return $goods_detail;
     }