Merge remote-tracking branch 'origin/master' into akun

@@ -150,9 +150,7 @@ class ReplaceHtml extends Command
             }else{
             }else{
                 $condition['html'] = ['like','%'.trim($info['old_html']).'%'];
                 $condition['html'] = ['like','%'.trim($info['old_html']).'%'];
             }
             }
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($condition, true) . PHP_EOL, FILE_APPEND);
             $bTemplateList = $bTemplateModel->list($condition);
             $bTemplateList = $bTemplateModel->list($condition);
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($bTemplateList, true) . PHP_EOL, FILE_APPEND);
             $saveData = [];
             $saveData = [];
             foreach ($bTemplateList as $v){
             foreach ($bTemplateList as $v){
                 $source_id = $v['source'] == 1 ? 0 : $v['source_id'];
                 $source_id = $v['source'] == 1 ? 0 : $v['source_id'];

@@ -34,10 +34,12 @@ class AggregationSetting extends Base
     public function getTopBannerAttribute($value){
     public function getTopBannerAttribute($value){
         if(!empty($value)){
         if(!empty($value)){
             $value = Arr::s2a($value);
             $value = Arr::s2a($value);
-            foreach ($value as $k => $v){
-                $v = getImageUrl($v);
-                $value[$k] = $v;
-            }
+//            foreach ($value as $k => $v){
+//                if($k == 'image'){
+//                    $v = getImageUrl($v);
+//                }
+//                $value[$k] = $v;
+//            }
         }
         }
         return $value;
         return $value;
     }
     }
@@ -52,10 +54,12 @@ class AggregationSetting extends Base
     public function getFootBannerAttribute($value){
     public function getFootBannerAttribute($value){
         if(!empty($value)){
         if(!empty($value)){
             $value = Arr::s2a($value);
             $value = Arr::s2a($value);
-            foreach ($value as $k => $v){
-                $v = getImageUrl($v);
-                $value[$k] = $v;
-            }
+//            foreach ($value as $k => $v){
+//                if($k == 'image'){
+//                    $v = getImageUrl($v);
+//                }
+//                $value[$k] = $v;
+//            }
         }
         }
         return $value;
         return $value;
     }
     }