|
@@ -747,10 +747,10 @@ class MyController extends Controller
|
|
|
$user = $this->getUser();
|
|
$user = $this->getUser();
|
|
|
$dreams = DreamInfoModel::where('user_id',$user->id)->orderBy('created_at','desc')->with('img')->paginate();
|
|
$dreams = DreamInfoModel::where('user_id',$user->id)->orderBy('created_at','desc')->with('img')->paginate();
|
|
|
foreach ($dreams as $dream) {
|
|
foreach ($dreams as $dream) {
|
|
|
- if ($dream->end_time > time()) {
|
|
|
|
|
|
|
+ if (strtotime($dream->end_time) > time()) {
|
|
|
$dream->type_name = '进行中';
|
|
$dream->type_name = '进行中';
|
|
|
}else{
|
|
}else{
|
|
|
- if ($dream->coin >=$dream->get_coin) {
|
|
|
|
|
|
|
+ if ($dream->get_coin >=$dream->coin) {
|
|
|
$dream->type_name = '已完成';
|
|
$dream->type_name = '已完成';
|
|
|
}else{
|
|
}else{
|
|
|
$dream->type_name = '未完成';
|
|
$dream->type_name = '未完成';
|
