Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

data/model/goods.model.php

@@ -1226,16 +1226,22 @@ class goodsModel extends Model
 
             $attr_item['goods_attr_id'] = intval($key);
             $attr_item['goods_attr_name'] = $val['name'];
-            $goods_attr_value = array();
-            foreach ($val as $id => $name) {
-                if ($id !== 'name') {
-                    $val_item['id'] = intval($id);
-                    $val_item['name'] = $name;
-                    array_push($goods_attr_value, $val_item);
+
+            if ($attr_item['goods_attr_name'] === '功效' ||
+                $attr_item['goods_attr_name'] === '品牌' ||
+                $attr_item['goods_attr_name'] === '保质期') {
+
+                $goods_attr_value = array();
+                foreach ($val as $id => $name) {
+                    if ($id !== 'name') {
+                        $val_item['id'] = intval($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);
             }
-            $attr_item['goods_attr_value'] = $goods_attr_value;
-            array_push($result_attr,$attr_item);
         }
 
         return $result_attr;

mobile/control/goods.php

@@ -18,10 +18,8 @@ class goodsControl extends mobileHomeControl
         parent::__construct();
     }
 
-
     public function _initpage()
     {
-
         if (!empty($_GET['page'])) {
             pagecmd('seteachnum', $_GET['page']);
         } else {
@@ -54,7 +52,7 @@ class goodsControl extends mobileHomeControl
 
         // 关键字git
         if (!empty($_GET['keyword'])) {
-            $condition['goods_name|goods_jingle'] = array('like', '%' . $_GET['keyword'] . '%');
+            $condition['goods_name|goods_jingle'] = array('like', '%' . urldecode($_GET['keyword']) . '%');
         }
 
         // 品牌查询
@@ -68,12 +66,12 @@ class goodsControl extends mobileHomeControl
         }
 
         // 彩妆护肤查询
-        if (!empty($_GET['attr_value_id']) && !empty($_GET['type_id'])) {
+        if (!empty($_GET['gc_id']) && !empty($_GET['type_id'])) {
 
             $type_id = intval($_GET['type_id']);
-            $attr_value_id = intval($_GET['attr_value_id']);
+            $gc_id = intval($_GET['gc_id']);
 
-            $goods_id_list = Model()->table('goods_attr_index')->field('distinct goods_id as goods_id')->where(array('type_id' => $type_id, 'attr_value_id' => $attr_value_id))->select();
+            $goods_id_list = Model()->table('goods_attr_index')->field('distinct goods_id as goods_id')->where(array('type_id' => $type_id, 'gc_id' => $gc_id))->select();
 
             $array_list = array();
             foreach ($goods_id_list as $value) {
@@ -105,9 +103,10 @@ class goodsControl extends mobileHomeControl
 //            pagecmd('setEachNum', $this->page);
 //            pagecmd('setTotalNum', $indexer_count);
 //        } else {
-        $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page);
+//          $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page);
 //        }
 
+        $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page);
         $page_count = $model_goods->gettotalpage();
 
         //处理商品列表(抢购、限时折扣、商品图片)