Kirin 3 سال پیش
والد
کامیت
d14473ace7
2فایلهای تغییر یافته به همراه14 افزوده شده و 3 حذف شده
  1. 1 1
      app/admin/model/user/UserExtract.php
  2. 13 2
      app/admin/view/finance/user_extract/index.php

+ 1 - 1
app/admin/model/user/UserExtract.php

@@ -55,7 +55,7 @@ class UserExtract extends BaseModel
         //已提现金额
         $data['priced'] = floatval(self::where('status', 1)->sum('extract_price'));
         //未提现金额
-        $data['brokerage_not'] = bcsub(bcsub($data['brokerage_count'], $data['priced'], 2), $data['price'], 2);
+//        $data['brokerage_not'] = bcsub(bcsub($data['brokerage_count'], $data['priced'], 2), $data['price'], 2);
         $data['cash'] = \app\models\user\User::sum('cash');
         return compact('data');
     }

+ 13 - 2
app/admin/view/finance/user_extract/index.php

@@ -78,14 +78,25 @@
                             </div>
                         </div>
                     </div>
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">待</span>-->
+<!--                                <h5>未转换佣金</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.brokerage_not}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
                     <div class="col-sm-3 ui-sortable">
                         <div class="ibox float-e-margins">
                             <div class="ibox-title">
                                 <span class="label label-success pull-right">待</span>
-                                <h5>未提现金额</h5>
+                                <h5>未提现金</h5>
                             </div>
                             <div class="ibox-content">
-                                <h1 class="no-margins">{$data.brokerage_not}</h1>
+                                <h1 class="no-margins">{$data.cash}</h1>
                             </div>
                         </div>
                     </div>