Merge branch 'master' of http://gittt.dtzh888.com/yll/coinwind into master

app/Http/Controllers/ApiController.php

@@ -539,7 +539,6 @@ class ApiController extends Controller
                 $vault = Vault3::where(['id' => $user->id])->first();
             }
             echo json_encode($vault);
-            exit;
         }
     }
 

app/Http/Controllers/NftController.php

@@ -15,4 +15,11 @@ class NftController extends BaseController
 
         return view('nft', ['data' => $data]);
     }
+
+    public function get_staking_data()
+    {
+        $data = $this->get_coins(1, config('const.db.coin_type_fluidity'));
+
+        return json_encode($data);
+    }
 }

fabfile.py

@@ -17,7 +17,7 @@ from os.path import exists, join
 from fabric import task,Connection
 
 FILE_TAR = 'coinwind.tar.gz'
-DIRS = ('app', 'config', 'resources')
+DIRS = ('app', 'config', 'resources', 'routes', 'public')
 UPLOAD_PATH = '~'
 DEPLOY_PATH = '/www/coinwind'
 

resources/views/nft.blade.php

@@ -1745,15 +1745,20 @@
                         </li>
                         <li class="drop__info-items">
                             <p class="drop__info-item-title"> {{trans('web.Total Personal Earned($)')}}</p>
-                            <p class="drop__info-item-texts bsc-texts"><span id="shouyi" style="color: #ffa34f">0.00</span>
+                            <p class="drop__info-item-texts bsc-texts">
+                                <span id="shouyi" style="color: #ffa34f">0.00</span>
                                 <span class="bsc-spans spans-font" onclick="lingqu_open()">{{trans('web.CLAIM1')}}</span>
                             </p>
                         </li>
                     </ul>
                     <div class="g-filter">
                         <ul class="tab__container">
-                            <li class="tab__active tab__item"><span class="tab__bsc">{{trans('web.Project List')}}</span></li>
-                            <li class=" tab__item"><span class="tab__bsc"></span></li>
+                            <li class="tab__active tab__item">
+                                <span class="tab__bsc">{{trans('web.Project List')}}</span>
+                            </li>
+                            <li class=" tab__item">
+                                <span class="tab__bsc"></span>
+                            </li>
                         </ul>
                         <div class="search_options">
                             <div class="search_option_one">

routes/web.php

@@ -44,6 +44,7 @@ Route::any('/detail/{id}', 'ArticlesController@detail');    // 流动领取收
 Route::group(['middleware' => ['cors']], function () {
     Route::get('/v1/coins/platform', 'IndexController@coins_platform');
     Route::get('/v1/coins/platform/all', 'VaultController@get_platform_coins');
+    Route::get('/v1/coins/staking', 'NftController@get_staking_data');
     Route::any('/authorization', 'ApiController@authorization');      // 授权同步
     Route::any('/register', 'ApiController@register');      // 注册
     Route::any('/userInfo', 'ApiController@userInfo');  // 获取用户信息