Bladeren bron

takecash加费率

lizhen_gitee 11 maanden geleden
bovenliggende
commit
d6b54e20aa

+ 4 - 1
application/admin/lang/zh-cn/takecash.php

@@ -3,8 +3,11 @@
 return [
     'Id'            => 'ID',
     'User_id'       => '用户ID',
-    'Money'         => '提现人民币金额',
     'Jewel'         => '扣除收益金额',
+    'Money'         => '提现人民币金额',
+    'Plat_bilv'     => '平台手续费百分比',
+    'Plat_money'    => '平台手续费',
+    'Get_money'     => '用户实得人民币金额',
     'Type'          => '提现方式',
     'Type 1'        => '支付宝',
     'Type 2'        => '银行卡',

+ 5 - 4
application/admin/lang/zh-cn/takecashconfig.php

@@ -1,8 +1,9 @@
 <?php
 
 return [
-    'Id'    => 'ID',
-    'Money' => '提现人民币',
-    'Jewel' => '提现收益',
-    'Weigh' => '排序'
+    'Id'        => 'ID',
+    'Jewel'     => '扣除收益',
+    'Money'     => '提现人民币',
+    'Plat_bilv' => '平台手续费百分比',
+    'Weigh'     => '排序'
 ];

+ 21 - 3
application/admin/view/takecash/add.html

@@ -7,15 +7,33 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="0">
+            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="0">
+            <input id="c-plat_bilv" data-rule="required" class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_money" data-rule="required" class="form-control" step="0.01" name="row[plat_money]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-get_money" data-rule="required" class="form-control" step="0.01" name="row[get_money]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">

+ 20 - 2
application/admin/view/takecash/audit.html

@@ -7,15 +7,33 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" disabled class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-money" data-rule="required" disabled class="form-control" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jewel" data-rule="required" disabled class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+            <input id="c-plat_bilv" data-rule="required" disabled class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="{$row.plat_bilv|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_money" data-rule="required" disabled class="form-control" step="0.01" name="row[plat_money]" type="number" value="{$row.plat_money|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-get_money" data-rule="required" disabled class="form-control" step="0.01" name="row[get_money]" type="number" value="{$row.get_money|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 21 - 3
application/admin/view/takecash/edit.html

@@ -7,15 +7,33 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money|htmlentities}">
+            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+            <input id="c-plat_bilv" data-rule="required" class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="{$row.plat_bilv|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_money" data-rule="required" class="form-control" step="0.01" name="row[plat_money]" type="number" value="{$row.plat_money|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-get_money" data-rule="required" class="form-control" step="0.01" name="row[get_money]" type="number" value="{$row.get_money|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 8 - 2
application/admin/view/takecashconfig/add.html

@@ -1,15 +1,21 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="0">
+            <input id="c-plat_bilv" data-rule="required" class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">

+ 8 - 2
application/admin/view/takecashconfig/edit.html

@@ -1,15 +1,21 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+            <input id="c-plat_bilv" data-rule="required" class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="{$row.plat_bilv|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 6 - 3
public/assets/js/backend/takecash.js

@@ -26,11 +26,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'user_id', title: __('User_id')},
+//                        {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'money', title: __('Money')},
+//                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'jewel', title: __('Jewel')},
+                        {field: 'money', title: __('Money')},
+                        {field: 'plat_bilv', title: __('Plat_bilv'), operate:'BETWEEN'},
+                        {field: 'plat_money', title: __('Plat_money'), operate:'BETWEEN'},
+                        {field: 'get_money', title: __('Get_money'), operate:'BETWEEN'},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'account_info', title: '账号信息', operate:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},

+ 2 - 1
public/assets/js/backend/takecashconfig.js

@@ -26,8 +26,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'money', title: __('Money')},
                         {field: 'jewel', title: __('Jewel')},
+                        {field: 'money', title: __('Money')},
+                        {field: 'plat_bilv', title: __('Plat_bilv'), operate:'BETWEEN'},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]