充值调整

application/admin/lang/zh-cn/company_bank.php

@@ -9,5 +9,5 @@ return [
     'Bank_card'       => '银行卡号',
     'Createtime'      => '创建时间',
     'Updatetime'      => '更新时间',
-    'Company.name'    => '店铺名称'
+    'Company.name'    => '门店名称'
 ];

application/admin/lang/zh-cn/company_take_cash.php

@@ -3,7 +3,7 @@
 return [
     'Id'              => 'ID',
     'Order_no'        => '单号',
-    'User_id'         => '车行ID',
+    'User_id'         => '门店ID',
     'Money'           => '提现金额',
     'Real_money'      => '实到金额',
     'Bank_name'       => '开户银行',
@@ -18,5 +18,5 @@ return [
     'Updatetime'      => '更新时间',
     'Audittime'       => '审核时间',
     'Auditremark'     => '审核备注',
-    'Company.name'    => '店铺名称'
+    'Company.name'    => '门店名称'
 ];

application/admin/view/company_take_cash/add.html

@@ -9,7 +9,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+            <input id="c-user_id" data-rule="required" data-source="company/index" data-field="name" class="form-control selectpage" name="row[user_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -48,7 +48,7 @@
             <input id="c-bank_card" class="form-control" name="row[bank_card]" type="text">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             
@@ -63,7 +63,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Audittime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-audittime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[audittime]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <input id="c-audittime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[audittime]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -71,7 +71,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-auditremark" class="form-control" name="row[auditremark]" type="text">
         </div>
-    </div>
+    </div>-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/company_take_cash/edit.html

@@ -9,7 +9,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="company/index" data-field="name" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/api/controller/Pay.php

@@ -206,7 +206,7 @@ class Pay extends Api
             $pay_type = input('pay_type','wechat');
             $platform = input('platform','miniapp');
             $id = input('id','0');
-            $amounts = input('amounts','0.00');
+            $amounts = intval(input('amounts',0));
             $uid = $this->auth->id;
             $companyId = $this->auth->company_id;
             if (empty($id) && empty($amounts)) {

application/extra/site.php

@@ -44,5 +44,5 @@ return array (
   'min_withdrawal_money' => '1',
   'max_withdrawal_money' => '10000',
   'article_name' => '蓝精灵官方',
-  'article_avatar' => '/uploads/20230531/68bab200ae016db0fbe31e91ff370ecf.png',
+  'article_avatar' => '/uploads/20230608/68bab200ae016db0fbe31e91ff370ecf.png',
 );

public/assets/js/backend/company_bank.js

@@ -27,13 +27,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'company_id', title: __('Company_id')},
+                        {field: 'company.name', title: __('Company.name'), operate: 'LIKE'},
                         {field: 'bank_name', title: __('Bank_name'), operate: 'LIKE'},
                         {field: 'bank_branchname', title: __('Bank_branchname'), operate: 'LIKE'},
                         {field: 'bank_account', title: __('Bank_account'), operate: 'LIKE'},
                         {field: 'bank_card', title: __('Bank_card'), operate: 'LIKE'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'company.name', title: __('Company.name'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

public/assets/js/backend/company_take_cash.js

@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
                         {field: 'user_id', title: __('User_id')},
+                        {field: 'company.name', title: __('Company.name'), operate: 'LIKE'},
                         {field: 'money', title: __('Money'), operate:'BETWEEN'},
                         {field: 'real_money', title: __('Real_money'), operate:'BETWEEN'},
                         {field: 'bank_name', title: __('Bank_name'), operate: 'LIKE'},
@@ -41,7 +42,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'audittime', title: __('Audittime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'auditremark', title: __('Auditremark'), operate: 'LIKE'},
-                        {field: 'company.name', title: __('Company.name'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]