Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/Business/Goods/EvaluationService.php

@@ -74,6 +74,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
             //$images = $this->_upload($v['images']);
             $images = $v['images'];
             if(!is_array($images)) $images = json_decode($images, true);
+            if(empty($images)) $images = null;
             $images ? $data['goods'][$k]['haveImg'] = 1 : $data['goods'][$k]['haveImg'] = 0;
             if($data['goods'][$k]['haveImg'] == 1) {
                 foreach ($images as &$image) {

application/models/DAO/GoodsCommon.php

@@ -183,9 +183,9 @@ class GoodsCommonModel extends \DAO\AbstractModel {
     public function getCount($where,$attrStr=''){
         $this->setDb($this->dbName);
         if($attrStr){
-            return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->fetchNum();
+            return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->where(array('goods_state'=>1,'goods_verify'=>1))->fetchNum();
         }
-        return $this->db->from($this->_tableName)->where($where)->fetchNum();
+        return $this->db->from($this->_tableName)->where(array('goods_state'=>1,'goods_verify'=>1))->where($where)->fetchNum();
     }
     /**
      * 获取分享信息