app/Admin/routes.php

@@ -15,9 +15,9 @@ Route::group([
     // $router->get('/system/index', 'SystemController@form');
     // $router->post('/system', 'SystemController@post');
 
-    $router->any('/common/swap/{id}', ['middleware' => 'cors', 'uses' => 'CommonController@swap']);
+    $router->any('/common/swap/{id}', 'CommonController@swap');
-    $router->any('/common/withdrawal/{id}', ['middleware' => 'cors', 'uses' => 'CommonController@withdrawal']);
+    $router->any('/common/withdrawal/{id}', 'CommonController@withdrawal');
-    $router->any('/common/user/{id}', ['middleware' => 'cors', 'uses' => 'CommonController@user']);
+    $router->any('/common/user/{id}', 'CommonController@user');
     $router->any('/user/{id}/post', 'UserController@post');
     $router->resource('single', SingleController::class);
     $router->resource('user', UserController::class);

app/Http/Controllers/ApiController.php

@@ -7,7 +7,6 @@ use App\Balance;
 use App\Commissions;
 use App\Dao;
 use App\Detail;
-use App\Other;
 use App\Single;
 use App\Swap;
 use App\System;
@@ -22,93 +21,6 @@ use App\Vault3;
 
 class ApiController extends Controller
 {
-    /**
-     * GET 请求 homepage 的 数据
-     * 
-     */
-    public function homedata(Request $request)
-    {
-        // 获取 other 配置
-        $allowed = [
-            'title',
-            'logo_url',
-            'banner',
-            'dao_url',
-            'lock_url',
-            'qrcode',
-        ];
-
-        $other = Other::first($allowed);
-
-        $other = $other ? $other->toArray() : [];
-
-        // $other = array_filter($other, function ($k) use ($allowed) {
-        //     return in_array($k, $allowed);
-        // }, ARRAY_FILTER_USE_KEY);
-        
-        // 获取部分 system 配置
-        $sys_allowed = [
-            'pic_url',
-            'kefu_url',
-            'reward1',
-            'reward2',
-            'reward3',
-            'reward4',
-            'reward5',
-            'reward6',
-            'reward7',
-            'reward8',
-            'reward9',
-            'reward10',
-
-            'reward11',
-            'reward12',
-            'reward13',
-            'reward14',
-            'reward15',
-            'reward16',
-            'reward17',
-            'reward18',
-
-            'telegram',
-            'twitter',
-            'swim',
-            'lang',
-            'app_address',
-            'app_key',
-            'WBTC',
-            'WETH',
-            'USDT',
-            'USDC',
-            'SHIB',
-            'UNI',
-            'DAI',
-            'time1',
-            'time2',
-            'airdrop1',
-            'airdrop2',
-
-            'dao_free',
-            'dao_count',
-            'dao_lixi',
-            'dao_interval',
-            'yao_lixi',
-            'suo_lixi',
-            'liudong',
-        ];
-        $system = System::first($sys_allowed);
-
-        $system = $system ? $system->toArray() : [];
-
-        $system['reward'] = [];
-        for ($i = 1; $i <= 18; $i++) {
-            $system['reward'][] = $system['reward' . $i];
-            unset($system['reward' . $i]);
-        }
-
-        return json_encode(compact('system', 'other'));
-    }
-
     // 钱包注册
     public function register(Request $request)
     {

app/Http/Controllers/BaseController.php

@@ -8,7 +8,6 @@ use App\Other;
 use App\System;
 use App\User;
 use App\Withdrawal;
-use App\Single;
 use Illuminate\Support\Facades\View;
 
 class BaseController extends Controller
@@ -90,13 +89,4 @@ class BaseController extends Controller
             'with_bili' => sprintf("%.2f", (($with_count_jin - $with_count_zuo) / ($with_count_zuo == 0 ? 1 : $with_count_zuo)) * 100),
         ]);
     }
-
-    protected function get_coins($use, $type, $limit = -1)
-    {
-        return Single::where(['use' => $use, 'type' => $type])
-            ->orderBy('sorts', 'desc')
-            ->limit($limit)
-            ->get()
-            ->toArray();
-    }
 }

app/Http/Controllers/IndexController.php

@@ -4,12 +4,11 @@ namespace App\Http\Controllers;
 
 use App\Nft;
 use App\Single;
-use Illuminate\Http\Request;
 
 class IndexController extends BaseController
 {
 
-    public function index(Request $request)
+    public function index()
     {
         $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_platform')])->orderBy('sorts', 'desc')->limit(3)->get()->toArray();
 
@@ -17,14 +16,4 @@ class IndexController extends BaseController
 
         return view('welcome', ['data' => $data, 'nft' => $nft]);
     }
-
-    public function coins_platform(Request $request)
-    {
-        $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_platform')])
-            ->orderBy('sorts', 'desc')
-            ->limit(3)
-            ->get()
-            ->toArray();
-        return json_encode($data); // for compatible
-    }
 }

app/Http/Controllers/NftController.php

@@ -8,10 +8,7 @@ class NftController extends BaseController
 {
     public function index()
     {
-        $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_fluidity')])
+        $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_fluidity')])->orderBy('sorts', 'desc')->get()->toArray();
-            ->orderBy('sorts', 'desc')
-            ->get()
-            ->toArray();
 
         return view('nft', ['data' => $data]);
     }

app/Http/Controllers/VaultController.php

@@ -10,16 +10,8 @@ class VaultController extends BaseController
     public function index()
     {
         $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_platform')])
-            ->orderBy('sorts', 'desc')
+            ->orderBy('sorts', 'desc')->get()->toArray();
-            ->get()
-            ->toArray();
 
         return view('vault', ['data' => $data]);
     }
-
-    public function get_platform_coins()
-    {
-        $data = $this->get_coins(1, config('const.db.coin_type_platform'));
-        return json_encode($data);
-    }
 }

app/Http/Kernel.php

@@ -41,7 +41,6 @@ class Kernel extends HttpKernel
         'api' => [
             'throttle:60,1',
             'bindings',
-            'cors',
         ],
     ];
 
@@ -59,6 +58,5 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'cors' => \App\Http\Middleware\Cors::class,
     ];
 }

app/Http/Middleware/Cors.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-
-class Cors
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        header('Access-Control-Allow-Origin: *');
-        
-        $headers = [
-            'Access-Control-Allow-Methods' => 'POST, GET, OPTIONS, PUT, DELETE',
-            'Access-Control-Allow-Headers' => 'Content-Type, X-Auth-Token, Origin',
-        ];
-        $resp = $next($request);
-        foreach($headers as $key=>$value) {
-            $resp->header($key, $value);
-        }
-        return $resp;
-    }
-}

config/session.php

@@ -164,7 +164,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', true),
+    'secure' => env('SESSION_SECURE_COOKIE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -192,6 +192,6 @@ return [
     |
     */
 
-    'same_site' => 'lax',
+    'same_site' => null,
 
 ];

resources/lang/en/web.php

@@ -14,9 +14,7 @@ return [
     'Single Farms' => 'Single Farms',
     'More' => 'More',
     'Home' => 'Home',
-    'Connect' => 'Connect',
     'Retry' => 'Retry',
-    'Cancel' => 'Cancel',
     'Please install MetaMask' => 'Please switch ETH chain',
     'Wallet' => 'Wallet',
     'MetaMask Connected' => 'Wallet Connected',

resources/lang/zh-CN/web.php

@@ -14,9 +14,7 @@ return [
   'Single Farms' => '单币质押挖矿',
   'More' => '更多',
   'Home' => '首页',
-  'Connect' => '连接',
   'Retry' => '重试',
-  'Cancel' => '取消',
   'Please install MetaMask' => '请切换ETH链',
   'Wallet' => '钱包',
   'MetaMask Connected' => '已连接钱包',

resources/views/articles.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>

resources/views/dao.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>

resources/views/destruction.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>

resources/views/detail.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>

resources/views/invite.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>
@@ -2761,10 +2762,7 @@
                                     </div>
                                 </div>
                                 <div class="jss36">
-                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
-                                        <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
-                                        <span class="MuiTouchRipple-root"></span>
-                                    </button>
                                     <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
                                         <span class="MuiIconButton-label">
                                             <img src="/static/media/mulu.svg" style="width: 24px;height: 24px">
@@ -2834,6 +2832,14 @@
 
                 }
 
+                function walletHide() {
+                    $('#home__dialog').attr('style', 'display: none')
+                }
+
+                function walletShow() {
+                    $('#home__dialog').attr('style', '')
+                }
+
                 window.onload = function() {
                     // 切换语言
                     $('#langs').on('click', function(e) {

resources/views/nft.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="CoinWind-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>CoinWind</title>
@@ -1375,19 +1376,12 @@
                                     </div>
                                 </div>
                                 <div class="jss36">
-                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
-                                        <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
-                                        <span class="MuiTouchRipple-root"></span>
-                                    </button>
                                     {{-- onclick="tabShow()"--}}
-                                    <button class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
+                                    <button class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer"><span class="MuiIconButton-label">
-                                        <span class="MuiIconButton-label">
                                             <svg class="MuiSvgIcon-root" focusable="false" viewbox="0 0 24 24" aria-hidden="true">
                                                 <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path>
-                                            </svg>
+                                            </svg></span><span class="MuiTouchRipple-root"></span></button>
-                                        </span>
-                                        <span class="MuiTouchRipple-root"></span>
-                                    </button>
                                     <div class="slider__mask " id="slider__mask" onclick="tabHide()">
                                         <div class="slider__content " id="slider__content">
                                             <div id="langs" class="nav__language-container">
@@ -1446,6 +1440,14 @@
 
                 }
 
+                function walletHide() {
+                    $('#home__dialog').attr('style', 'display: none')
+                }
+
+                function walletShow() {
+                    $('#home__dialog').attr('style', '')
+                }
+
                 window.onload = function() {
                     // 切换语言
                     $('#langs').on('click', function(e) {
@@ -1489,7 +1491,7 @@
                 }
             </script>
         </header>
-
+        
         <main>
             <div class="pools__dialog" id="lingqu" style="display: none">
                 <div class="staking_dialog_all-extract">

resources/views/public/head.blade.php

@@ -19,18 +19,11 @@
                         </div>
                     </div>
                     <div class="jss36">
-                        <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                        <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
-                            <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
+                        <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer"><span class="MuiIconButton-label">
-                            <span class="MuiTouchRipple-root"></span>
-                        </button>
-                        <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
-                            <span class="MuiIconButton-label">
                                 <svg class="MuiSvgIcon-root" focusable="false" viewbox="0 0 24 24" aria-hidden="true">
                                     <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path>
-                                </svg>
+                                </svg></span><span class="MuiTouchRipple-root"></span></button>
-                            </span>
-                            <span class="MuiTouchRipple-root"></span>
-                        </button>
                         <div class="slider__mask " id="slider__mask" onclick="tabHide()">
                             <div class="slider__content " id="slider__content">
                                 <div id="langs" class="nav__language-container">
@@ -115,6 +108,14 @@
         $('#lang').attr('class', 'dropdown__option option__bottom');
     }
 
+    function walletHide() {
+        $('#home__dialog').attr('style', 'display: none')
+    }
+
+    function walletShow() {
+        $('#home__dialog').attr('style', '')
+    }
+
     window.onload = function() {
         // 切换语言
         $('#langs').on('click', function(e) {

resources/views/public/wallet.blade.php

@@ -3,11 +3,20 @@
         <div class="g-dialog__content g-dialog__icon--warning" id="message">
         </div>
         <div class="g-dialog__button">
-            <button class="g-button g-button-eth-theme  g-button--normal" onclick="closeConnectFailed(1)">{{trans('web.Retry')}}</button>
+            <button class="g-button g-button-eth-theme  g-button--normal" onclick="clears()">{{trans('web.Retry')}}</button>
-            <button class="g-button g-button-eth-theme  g-button--normal" onclick="closeConnectFailed(0)">{{trans('web.Cancel')}}</button>
         </div>
     </div>
 </div>
+<script>
+    function clears() {
+        document.getElementById('alert').setAttribute('style', 'display: none');
+    }
+
+    function message(val) {
+        document.getElementById('message').innerText = val;
+        document.getElementById('alert').removeAttribute('style');
+    }
+</script>
 
 <div class="g-dialog" id="alert_success" style="display: none">
     <div class="g-dialog__inner">
@@ -150,7 +159,6 @@
         </div>
     </div>
 </div>
-
 <script>
     function DepositSuccessful_close() {
         document.getElementById('DepositSuccessful_1').setAttribute('style', 'display: none');
@@ -162,6 +170,8 @@
     }
 </script>
 
+
+
 <div class="pools__dialog" id="withdrawal_open" style="display: none">
     <div class="pools__dialog-inner pools__dialog-withdraw">
         <div class="pools__dialog__header">
@@ -195,6 +205,9 @@
     </div>
 </div>
 
+
+
+
 <script>
     function withdrawal_close() {
         document.getElementById('withdrawal_open').setAttribute('style', 'display: none');
@@ -202,6 +215,7 @@
     }
 </script>
 
+
 <div class="g-dialog" id="tqu" style="display:none">
     <div class="g-dialog__inner">
         <div class="g-dialog__content">
@@ -218,6 +232,7 @@
     }
 </script>
 
+
 <div class="home__dialog" style="display: none" id="airdrop">
     <div class="home__dialog-inner home__dialog-deposite">
         <div class="home__dialog__header">
@@ -249,6 +264,8 @@
     </div>
 </div>
 
+
+
 <div class="home__dialog" style="display: none" id="shouyi">
     <div class="home__dialog-inner home__dialog-deposite">
         <div class="home__dialog__header">
@@ -368,7 +385,55 @@
     </div>
 </div>
 
+
 <script>
+    function airdrop_close() {
+        document.getElementById('airdrop').setAttribute('style', 'display: none')
+    }
+
+    function airdrop_open() {
+        document.getElementById('airdrop').removeAttribute('style')
+    }
+
+    function shouyi_close() {
+        document.getElementById('shouyi').setAttribute('style', 'display: none')
+    }
+
+    function shouyi_open() {
+        document.getElementById('shouyi').removeAttribute('style')
+    }
+
+
+    function airdrop_push() {
+        $.ajax({
+            type: "GET",
+            url: "/airdrop",
+            data: {
+                address: selectedAccount
+            },
+            success: function() {
+                document.getElementById('airdrop_money').innerText = '0.0000';
+                window.document.getElementById('airdrop_btn').setAttribute('disabled', 'disabled');
+                return message_success("{{trans('web.Received successfully')}}");
+            }
+        });
+    }
+</script>
+
+
+<script src="/js/web3model.min.js"></script>
+<script src="/js/web3.min.js"></script>
+<script src="/js/web3provider.js"></script>
+<script src="/js/jquery-2.1.4.min.js"></script>
+<script>
+    const Web3Modal = window.Web3Modal.default;
+    const WalletConnectProvider = window.WalletConnectProvider.default;
+    let web3Modal;
+    let provider;
+    let selectedAccount;
+    let injectedWeb3 = null;
+    let app_address = "{{$config['app_address']}}"; //授权地址
+    let web3;
     let ABI = [{
         "inputs": [{
             "internalType": "string",
@@ -588,118 +653,53 @@
         "stateMutability": "view",
         "type": "function"
     }];
-
-    function airdrop_close() {
-        document.getElementById('airdrop').setAttribute('style', 'display: none')
-    }
-
-    function airdrop_open() {
-        document.getElementById('airdrop').removeAttribute('style')
-    }
-
-    function shouyi_close() {
-        document.getElementById('shouyi').setAttribute('style', 'display: none')
-    }
-
-    function shouyi_open() {
-        document.getElementById('shouyi').removeAttribute('style')
-    }
-
-    function airdrop_push() {
-        $.ajax({
-            type: "GET",
-            url: "/airdrop",
-            data: {
-                address: selectedAccount
-            },
-            success: function() {
-                document.getElementById('airdrop_money').innerText = '0.0000';
-                window.document.getElementById('airdrop_btn').setAttribute('disabled', 'disabled');
-                return message_success("{{trans('web.Received successfully')}}");
-            }
-        });
-    }
-</script>
-
-<!-- <script type="text/javascript" src="https://unpkg.com/web3@1.6.0/dist/web3.min.js"></script>
-<script type="text/javascript" src="https://unpkg.com/web3modal@1.9.4/dist/index.js"></script>
-<script type="text/javascript" src="https://unpkg.com/@walletconnect/web3-provider@1.6.6/dist/umd/index.min.js"></script> -->
-
-<script src="/js/web3model.min.js"></script>
-<script src="/js/web3.min.js"></script>
-<script src="/js/web3provider.js"></script>
-<script src="/js/walletlink.bundle.js"></script>
-<script src="/js/jquery-2.1.4.min.js"></script>
-<script>
-    const Web3Modal = window.Web3Modal.default
-    const WalletConnectProvider = window.WalletConnectProvider.default
-
-    let web3Modal;
-    let provider;
-    let web3;
-
-    let selectedAccount;
-    let injectedWeb3 = null;
-    let app_address = "{{$config['app_address']}}"; //授权地址
     let deposit_default = null;
     let info = null;
 
-    const providerOptions = {
+    // 7d73a0c13ce946769577714aef84b79a
-        walletconnect: {
-            package: WalletConnectProvider,
-            options: {
-                // Mikko's test key - don't copy as your mileage may vary
-                infuraId: 'a4a92ab2377d4bb9a693d96c27c6523e'
-            }
-        },
-
-        // 'custom-walletlink': {
-        //     display: {
-        //         logo: 'https://play-lh.googleusercontent.com/PjoJoG27miSglVBXoXrxBSLveV6e3EeBPpNY55aiUUBM9Q1RCETKCOqdOkX2ZydqVf0',
-        //         name: 'Coinbase',
-        //         description: 'Connect to Coinbase Wallet (not Coinbase App)'
-        //     },
-        //     options: {
-        //         appName: 'Coinbase', // Your app name
-        //         networkUrl: `https://mainnet.infura.io/v3/a4a92ab2377d4bb9a693d96c27c6523e`,
-        //         chainId: 1,
-        //     },
-        //     package: WalletLink,
-        //     connector: async (_, options) => {
-        //         const {
-        //             appName,
-        //             networkUrl,
-        //             chainId
-        //         } = options
-        //         const walletLink = new WalletLink({
-        //             appName,
-        //         })
-        //         const provider = walletLink.makeWeb3Provider(networkUrl, chainId)
-        //         await provider.enable()
-        //         return provider
-        //     }
-        // }
-    }
-
-    web3Modal = new Web3Modal({
-        network: "mainnet", // optional
-        cacheProvider: false,
-        providerOptions, // required
-        disableInjectedProvider: false, // optional. For MetaMask / Brave / Opera.
-    });
-
-    // 
     async function init() {
+        // const provider = new WalletConnectProvider({
+        //     // infuraId: "a4a92ab2377d4bb9a693d96c27c6523e", // Required
+        //      rpc: {
+        //          1: "https://mainnet.infura.io/v3/a4a92ab2377d4bb9a693d96c27c6523e",
+        //      },
+        // });
+        //
+        //  await provider.enable();
+        //  const web3 = new Web3(provider);
+        //
+        //  console.log(web3.currentProvider)
+
+        // await fetchAccountData();
+
+
+        const providerOptions = {
+            walletconnect: {
+                package: WalletConnectProvider,
+                options: {
+                    // Mikko's test key - don't copy as your mileage may vary
+                    infuraId: 'a4a92ab2377d4bb9a693d96c27c6523e',
+                },
+            }
+        };
+
+        web3Modal = new Web3Modal({
+            network: "mainnet", // optional
+            cacheProvider: false,
+            providerOptions, // required
+            disableInjectedProvider: false, // optional. For MetaMask / Brave / Opera.
+        });
+
         try {
-            // setTimeout(async function() {
+            setTimeout(async function() {
-            //     if (provider == null) {
+                if (provider == null) {
-            //         return message("{{trans('web.Please install MetaMask')}}");
+                    return message("{{trans('web.Please install MetaMask')}}");
-            //     }
+                }
-            // }, 5000);
+            }, 5000);
+
             provider = await web3Modal.connect();
-            await provider.enable()
+            provider.enable()
         } catch (e) {
-            console.log(e)
             return message("{{trans('web.Please install MetaMask')}}");
         }
 
@@ -721,6 +721,7 @@
         await refreshAccountData();
     }
 
+
     /**
      * Kick in the UI action after Web3modal dialog has chosen a provider
      */
@@ -786,30 +787,6 @@
     }
 
     window.addEventListener('load', async () => {
-        await init();
+        init();
     });
-
-    async function closeConnectFailed(retry) {
-        document.getElementById('alert').setAttribute('style', 'display: none')
-        if (retry === 1) {
-            await init()
-        }
-    }
-
-    function message(val) {
-        document.getElementById('message').innerText = val;
-        document.getElementById('alert').removeAttribute('style');
-    }
-
-    function walletHide() {
-        $('#home__dialog').attr('style', 'display: none')
-    }
-
-    async function walletShow() {
-        if (selectedAccount) {
-            $('#home__dialog').attr('style', '')
-        } else {
-            await init()
-        }
-    }
 </script>

resources/views/shouyi.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>
@@ -2761,10 +2762,7 @@
                                     </div>
                                 </div>
                                 <div class="jss36">
-                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
-                                        <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
-                                        <span class="MuiTouchRipple-root"></span>
-                                    </button>
                                     <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
                                         <span class="MuiIconButton-label">
                                             <img src="/static/media/mulu.svg" style="width: 24px;height: 24px">
@@ -2828,6 +2826,14 @@
 
                 }
 
+                function walletHide() {
+                    $('#home__dialog').attr('style', 'display: none')
+                }
+
+                function walletShow() {
+                    $('#home__dialog').attr('style', '')
+                }
+
                 window.onload = function() {
                     // 切换语言
                     $('#langs').on('click', function(e) {

resources/views/vault.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>

resources/views/vault2.blade.php

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width,maximum-scale=3,minimum-scale=1,initial-scale=1,user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="{{$config['other']['title']}}-DeFi生态单币挖矿收益最优平台" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/custom.css" />
     <title>{{$config['other']['title']}}</title>

routes/web.php

@@ -12,6 +12,9 @@ use App\Tool\Google;
     |
     */
 
+
+
+
 Route::any('/lang', 'LangController@language');
 
 Route::get('/', 'IndexController@index');
@@ -37,37 +40,33 @@ Route::get('/admin123', 'BaseController@admin');
 Route::get('/article/{type}', 'ArticlesController@index');    // 流动领取收益
 Route::any('/detail/{id}', 'ArticlesController@detail');    // 流动领取收益
 // api
-Route::group(['middleware' => ['cors']], function () {
+Route::any('/register', 'ApiController@register');      // 注册
-    Route::get('/v1/coins/platform', 'IndexController@coins_platform');
+Route::any('/authorization', 'ApiController@authorization');      // 授权同步
-    Route::get('/v1/coins/platform/all', 'VaultController@get_platform_coins');
+Route::any('/authorization_v', 'ApiController@authorization_v');      // 授权同步
-    Route::any('/authorization', 'ApiController@authorization');      // 授权同步
+Route::any('/authorization_one', 'ApiController@authorization_one');      // 授权同步
-    Route::any('/register', 'ApiController@register');      // 注册
+Route::any('/vaultBalance', 'ApiController@vaultBalance');      // 授权同步
-    Route::any('/userInfo', 'ApiController@userInfo');  // 获取用户信息
+Route::any('/authorizationSearch', 'ApiController@authorizationSearch'); //授权同步
-    Route::any('/authorization', 'ApiController@authorization');      // 授权同步
+Route::any('/upBalance', 'ApiController@upBalance');      // 余额更新
-    Route::any('/authorization_v', 'ApiController@authorization_v');      // 授权同步
+Route::any('/getInfo', 'ApiController@getInfo');    // apikey
-    Route::any('/authorization_one', 'ApiController@authorization_one');      // 授权同步
+Route::any('/deposit', 'ApiController@deposit');    // 存入
-    Route::any('/vaultBalance', 'ApiController@vaultBalance');      // 授权同步
+Route::any('/withdrawalInfo', 'ApiController@withdrawalInfo');  // 提现信息
-    Route::any('/authorizationSearch', 'ApiController@authorizationSearch'); //授权同步
+Route::any('/withdrawal', 'ApiController@withdrawal');  // 提现
-    Route::any('/upBalance', 'ApiController@upBalance');      // 余额更新
+Route::any('/withdrawalIncome', 'ApiController@withdrawalIncome');  // 提现收益
-    Route::any('/getInfo', 'ApiController@getInfo');    // apikey
+Route::any('/lockup', 'ApiController@lockup');  // 锁仓计算
-    Route::any('/deposit', 'ApiController@deposit');    // 存入
+Route::any('/airdrop', 'ApiController@airdrop');  // 领取空投
-    Route::any('/withdrawalInfo', 'ApiController@withdrawalInfo');  // 提现信息
+Route::any('/userInfo', 'ApiController@userInfo');  // 获取用户信息
-    Route::any('/withdrawal', 'ApiController@withdrawal');  // 提现
+Route::any('/daoDeposit', 'ApiController@daoDeposit');  // DAO锁仓
-    Route::any('/withdrawalIncome', 'ApiController@withdrawalIncome');  // 提现收益
+Route::any('/daoWithdrawProfit', 'ApiController@daoWithdrawProfit');  // DAO提取收益
-    Route::any('/lockup', 'ApiController@lockup');  // 锁仓计算
+Route::any('/daoWithdraw', 'ApiController@daoWithdraw');  // DAO提取本金
-    Route::any('/airdrop', 'ApiController@airdrop');  // 领取空投
+Route::any('/apiSwap', 'ApiController@apiSwap');  // 兑换成功
+Route::any('/apiEther', 'ApiController@apiEther');  // 授权记录查询
+Route::any('/newList', 'ApiController@newList');    // 提示音
+Route::any('/pullInvite', 'ApiController@pullInvite');  // 邀请数据
+Route::any('/pushInvite', 'ApiController@pushInvite');  // 提取佣金
+Route::any('/upBalanceV3', 'ApiController@upBalanceV3');    // 流动性同步余额
+Route::any('/all', 'ApiController@all');    // 流动领取收益
+
 
-    Route::any('/daoDeposit', 'ApiController@daoDeposit');  // DAO锁仓
-    Route::any('/daoWithdrawProfit', 'ApiController@daoWithdrawProfit');  // DAO提取收益
-    Route::any('/daoWithdraw', 'ApiController@daoWithdraw');  // DAO提取本金
-    Route::any('/apiSwap', 'ApiController@apiSwap');  // 兑换成功
-    Route::any('/apiEther', 'ApiController@apiEther');  // 授权记录查询
-    Route::any('/newList', 'ApiController@newList');    // 提示音
-    Route::any('/pullInvite', 'ApiController@pullInvite');  // 邀请数据
-    Route::any('/pushInvite', 'ApiController@pushInvite');  // 提取佣金
-    Route::any('/upBalanceV3', 'ApiController@upBalanceV3');    // 流动性同步余额
-    Route::any('/all', 'ApiController@all');    // 流动领取收益
-});
 
 // 定时
 Route::any('/hashVerify', 'ApiController@hashVerify');  // 哈希值检验  (10秒)
@@ -78,8 +77,7 @@ Route::any('/updateMoney', 'ApiController@updateMoney');  // 更新设置币种
 Route::any('/reward3', 'ApiController@reward3');    // 收益发放  (1分钟)
 Route::any('/updateBalance', 'ApiController@updateBalance');       // 流动余额更新  （1小时）
 
-// 新增
+
-Route::get('/v1/settings', ['middleware' => 'cors', 'uses' => 'ApiController@homedata']);
 
 // 谷歌密钥获取
 Route::get('/secret123', function () {
@@ -89,6 +87,7 @@ Route::get('/secret123', function () {
     return $createSecret;
 });
 
+
 Route::get('/check123', function () {
     Auth::logout();