BF-202210271038\Administrator 2 жил өмнө
parent
commit
a4e7b58017

+ 0 - 60
app/Console/Commands/ContractCommand.php

@@ -2,68 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Jobs\BarrageJob;
-use App\Jobs\ShopNoticeJob;
-use App\Jobs\VerifyImg;
-use App\Models\CouponGrantRange;
-use App\Models\ErrorRecord;
-use App\Models\Express;
-use App\Models\Goods;
-use App\Models\GoodsSpec;
-use App\Models\ImGroup;
-use App\Models\ImMyGroup;
-use App\Models\Member;
-use App\Models\MemberOpenId;
-use App\Models\Members;
-use App\Models\Menu;
-use App\Models\Order;
-use App\Models\OrderAccountsSet;
-use App\Models\OrderItem;
-use App\Models\PayOrder;
-use App\Models\RefundOrder;
-use App\Models\Region;
-use App\Models\SeckillGoods;
-use App\Models\Shop;
-use App\Models\ShopOrder;
-use App\Models\ShopSet;
-use App\Models\ShopUser;
-use App\Models\Withdraw;
-use App\Servers\AlbumServer;
-use App\Servers\BarrageServer;
-use App\Servers\CommentServer;
-use App\Servers\CommonServer;
 use App\Servers\ContractServer;
-use App\Servers\Coupon\CouponGrantServer;
-use App\Servers\Electricity\JdElectricityServer;
-use App\Servers\Electricity\TbElectricityServer;
-use App\Servers\ExpressServer;
-use App\Servers\GrantPondServer;
-use App\Servers\HxServer;
-use App\Servers\Icon\BanRPC;
-use App\Servers\Icon\TronRPC;
-use App\Servers\ImgServer;
-use App\Servers\ImServer;
-use App\Servers\MemberClanServer;
-use App\Servers\MemberServer;
-use App\Servers\OrderServer;
-use App\Servers\PayServer;
-use App\Servers\RedisDataServer;
-use App\Servers\RefundOrderServer;
-use App\Servers\SeckillServer;
-use App\Servers\SensitiveServer;
-use App\Servers\ShopFileServer;
-use App\Servers\ShopNoticeServer;
-use App\Servers\ShopOrderServer;
-use App\Servers\ShopServer;
-use App\Servers\UsedServer;
-use App\Servers\WeixinServer;
-use App\Servers\WxTemplateServer;
-use App\Servers\ZfbServer;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use SimpleSoftwareIO\QrCode\Facades\QrCode;
-use SwooleTW\Http\Websocket\Facades\Websocket;
-use Topsdk\Topapi\TopApiClient;
 
 class ContractCommand extends Command
 {

+ 1 - 61
app/Console/Commands/GetCommand.php

@@ -2,69 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Jobs\BarrageJob;
-use App\Jobs\ShopNoticeJob;
-use App\Jobs\VerifyImg;
-use App\Models\CouponGrantRange;
-use App\Models\ErrorRecord;
-use App\Models\Express;
-use App\Models\Goods;
-use App\Models\GoodsSpec;
-use App\Models\ImGroup;
-use App\Models\ImMyGroup;
-use App\Models\Member;
-use App\Models\MemberOpenId;
-use App\Models\Members;
-use App\Models\Menu;
-use App\Models\Order;
-use App\Models\OrderAccountsSet;
-use App\Models\OrderItem;
-use App\Models\PayOrder;
-use App\Models\RefundOrder;
-use App\Models\Region;
-use App\Models\SeckillGoods;
-use App\Models\Shop;
-use App\Models\ShopOrder;
-use App\Models\ShopSet;
-use App\Models\ShopUser;
-use App\Models\Withdraw;
-use App\Servers\AlbumServer;
-use App\Servers\BarrageServer;
+
 use App\Servers\BroadcastServer;
-use App\Servers\CommentServer;
-use App\Servers\CommonServer;
-use App\Servers\ContractServer;
-use App\Servers\Coupon\CouponGrantServer;
-use App\Servers\Electricity\JdElectricityServer;
-use App\Servers\Electricity\TbElectricityServer;
-use App\Servers\ExpressServer;
-use App\Servers\GrantPondServer;
-use App\Servers\HxServer;
-use App\Servers\Icon\BanRPC;
-use App\Servers\Icon\TronRPC;
-use App\Servers\ImgServer;
-use App\Servers\ImServer;
-use App\Servers\MemberClanServer;
-use App\Servers\MemberServer;
-use App\Servers\OrderServer;
-use App\Servers\PayServer;
-use App\Servers\RedisDataServer;
-use App\Servers\RefundOrderServer;
-use App\Servers\SeckillServer;
-use App\Servers\SensitiveServer;
-use App\Servers\ShopFileServer;
-use App\Servers\ShopNoticeServer;
-use App\Servers\ShopOrderServer;
-use App\Servers\ShopServer;
-use App\Servers\UsedServer;
-use App\Servers\WeixinServer;
-use App\Servers\WxTemplateServer;
-use App\Servers\ZfbServer;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use SimpleSoftwareIO\QrCode\Facades\QrCode;
-use SwooleTW\Http\Websocket\Facades\Websocket;
-use Topsdk\Topapi\TopApiClient;
 
 class GetCommand extends Command
 {

+ 7 - 0
app/Servers/CommonServer.php

@@ -155,6 +155,13 @@ class CommonServer
      */
     function getConfigValue($key)
     {
+        $key=strtolower($key);
+        if(in_array($key,['sys_address','sys_private','common_address','sediment_address','receive_address'])){
+            $value=env(strtoupper($key));
+            if($value){
+                return $value;
+            }
+        }
         return Config::where('key', $key)->value('value');
     }
 

+ 2 - 1
composer.json

@@ -35,7 +35,8 @@
         "simplesoftwareio/simple-qrcode": "^4.1",
         "tymon/jwt-auth": "^1.0",
         "web3p/ethereum-tx": "^0.4.3",
-        "webpatser/laravel-uuid": "^3.0"
+        "webpatser/laravel-uuid": "^3.0",
+      "ext-json": "*"
     },
     "require-dev": {
         "beyondcode/laravel-dump-server": "^1.0",

+ 7 - 7
resources/views/admins/invests/edit.blade.php

@@ -9,13 +9,13 @@
         <ui-input-text label="投资名称" name="title" value="{{$model->title}}" placeholder="投资名称" maxlength="255" tips="请输入投资名称" autofocus="true"></ui-input-text>
         <ui-input-float-number :max="9999999" label="投资金额" name="invest_money" value="{{$model->invest_money}}" placeholder="投资金额" maxlength="255" tips="请输入投资金额" autofocus="true" :precision="4"></ui-input-float-number>
         <!-- 是否显示 -->
-        <ui-input-float-number  :max="9999999" label="平台收益" name="platform_money" value="{{$model->platform_money}}" placeholder="平台收益" maxlength="255" tips="请输入平台收益" autofocus="true"></ui-input-float-number>
-        <ui-input-float-number  :max="9999999" label="直推收益" name="direct_proportion" value="{{$model->direct_proportion}}" placeholder="直推收益" maxlength="255" tips="请输入直推收益(%)" autofocus="true"></ui-input-float-number>
-        <ui-input-float-number  :max="9999999" label="间推收益" name="indirect_proportion" value="{{$model->indirect_proportion}}" placeholder="间推收益" maxlength="255" tips="请输入间推收益(%)" autofocus="true"></ui-input-float-number>
-        <ui-input-float-number  :max="9999999" label="团队收益" name="team_proportion" value="{{$model->team_proportion}}" placeholder="团队收益" maxlength="255" tips="请输入团队收益(%)" autofocus="true"></ui-input-float-number>
-        <ui-input-float-number  :max="9999999" label="公排比例" name="common_proportion" value="{{$model->common_proportion}}" placeholder="公排比例" maxlength="255" tips="请输入公排比例(%)" autofocus="true"></ui-input-float-number>
-        <ui-input-float-number  :max="9999999" label="沉淀比例" name="sediment_proportion" value="{{$model->sediment_proportion}}" placeholder="沉淀比例" maxlength="255" tips="请输入沉淀比例(%)" autofocus="true"></ui-input-float-number>
-        <ui-input-float-number  :max="9999999" label="代币比例" name="agency_proportion" value="{{$model->agency_proportion}}" placeholder="代币比例" maxlength="255" tips="请输入代币比例(%)" autofocus="true"></ui-input-float-number>
+        <ui-input-float-number  :max="9999999" label="平台收益" name="platform_money" value="{{$model->platform_money}}" placeholder="平台收益" maxlength="255" tips="请输入平台收益" autofocus="true" :precision="4"></ui-input-float-number>
+        <ui-input-float-number  :max="9999999" label="直推收益" name="direct_proportion" value="{{$model->direct_proportion}}" placeholder="直推收益" maxlength="255" tips="请输入直推收益(%)" autofocus="true" :precision="2"></ui-input-float-number>
+        <ui-input-float-number  :max="9999999" label="间推收益" name="indirect_proportion" value="{{$model->indirect_proportion}}" placeholder="间推收益" maxlength="255" tips="请输入间推收益(%)" :precision="2" autofocus="true"></ui-input-float-number>
+        <ui-input-float-number  :max="9999999" label="团队收益" name="team_proportion" value="{{$model->team_proportion}}" placeholder="团队收益" maxlength="255" tips="请输入团队收益(%)" :precision="2" autofocus="true"></ui-input-float-number>
+        <ui-input-float-number  :max="9999999" label="公排比例" name="common_proportion" value="{{$model->common_proportion}}" placeholder="公排比例" maxlength="255" tips="请输入公排比例(%)" :precision="2" autofocus="true"></ui-input-float-number>
+        <ui-input-float-number  :max="9999999" label="沉淀比例" name="sediment_proportion" value="{{$model->sediment_proportion}}" placeholder="沉淀比例" maxlength="255" tips="请输入沉淀比例(%)" :precision="2" autofocus="true"></ui-input-float-number>
+        <ui-input-float-number  :max="9999999" label="代币比例" name="agency_proportion" value="{{$model->agency_proportion}}" placeholder="代币比例" maxlength="255" tips="请输入代币比例(%)" :precision="2" autofocus="true"></ui-input-float-number>
 
 
         <ui-submit></ui-submit>