Commit 5ae76b95 authored by 李文起's avatar 李文起
Browse files

Merge branch 'feature/v1.2.4' into 'master'

更新提示

See merge request !25
parents dcaad0d1 6304fb91
1 merge request!25更新提示
Showing with 8 additions and 4 deletions
+8 -4
......@@ -19,8 +19,11 @@ class PageCoverAction extends ProjectAction
$pageCover = json_decode($this->data['value'],true);
$pageCover['app_img'] = !empty($pageCover['app_img']) ? getStorageUrl(env('APP_ENV').$pageCover['app_img'])['url']: '';
$pageCover['pc_img'] = !empty($pageCover['pc_img']) ? getStorageUrl(env('APP_ENV').$pageCover['pc_img'])['url'] : '';
return !empty($pageCover) ? ['app_img' => !empty($pageCover['app_img']) ? getStorageUrl(env('APP_ENV').$pageCover['app_img'])['url']: '','pc_img' => !empty($pageCover['pc_img']) ? getStorageUrl(env('APP_ENV').$pageCover['pc_img'])['url'] : ''] : ['app_img' => '','pc_img' => ''];
return $pageCover;
}
......
......@@ -19,12 +19,13 @@ class PromptAction extends ProjectAction
$prompt = json_decode($this->data['value'],true);
$prompt['app_img'] = !empty($prompt['app_img']) ? getStorageUrl(env('APP_ENV').$prompt['app_img'])['url']: '';
$prompt['pc_img'] = !empty($prompt['pc_img']) ? getStorageUrl(env('APP_ENV').$prompt['pc_img'])['url'] : '';
return !empty($prompt) ? ['app_img' => !empty($prompt['app_img']) ? getStorageUrl(env('APP_ENV').$prompt['app_img'])['url']: '','pc_img' => !empty($prompt['pc_img']) ? getStorageUrl(env('APP_ENV').$prompt['pc_img'])['url'] : ''] : ['app_img' => '','pc_img' => ''];
return $prompt;
}
return ['app_img'=> '','pc_img' => ''];
return ['app_img'=> '','pc_img' => '', 'time' => 0];
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment