Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -127,7 +127,7 @@ class ProductLogic extends  BaseLogic
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             foreach ($this->param['ids'] as $k => $id) {
             foreach ($this->param['ids'] as $k => $id) {
-                $info = $this->model->read(['id'=>$id]);
+                $info = $this->model->read(['id'=>$id],['id','status']);
                 if($info['status'] == Product::STATUS_RECYCLE){
                 if($info['status'] == Product::STATUS_RECYCLE){
                     $this->delRoute($id);
                     $this->delRoute($id);
                     //删除当前产品模版
                     //删除当前产品模版

@@ -51,9 +51,11 @@ class Product extends Base
     }
     }
 
 
     public function setGalleryAttribute($value){
     public function setGalleryAttribute($value){
-        foreach ($value as $k => $v){
-            $v['url'] = str_replace_url($v['url']);
-            $value[$k] = $v;
+        if(!empty($value)){
+            foreach ($value as $k => $v){
+                $v['url'] = str_replace_url($v['url']);
+                $value[$k] = $v;
+            }
         }
         }
         $this->attributes['gallery'] = Arr::a2s($value);
         $this->attributes['gallery'] = Arr::a2s($value);
     }
     }
@@ -91,9 +93,11 @@ class Product extends Base
      */
      */
     public function getIconAttribute($value){
     public function getIconAttribute($value){
         $value = Arr::s2a($value);
         $value = Arr::s2a($value);
-        foreach ($value as $k => $v){
-            $v = getImageUrl($v);
-            $value[$k] = $v;
+        if(!empty($value)){
+            foreach ($value as $k => $v){
+                $v = getImageUrl($v);
+                $value[$k] = $v;
+            }
         }
         }
         return $value;
         return $value;
     }
     }