'确认收货才到商家账户'

application/admin/view/member_extract/index.html

@@ -7,17 +7,17 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('member_extract/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('member_extract/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('member_extract/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('member_extract/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('member_extract/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('member_extract/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('member_extract/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('member_extract/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
 
                         <div class="dropdown btn-group {:$auth->check('member_extract/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
-                            </ul>
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
+<!--                            </ul>-->
                         </div>
 
                         

application/api/controller/Order.php

@@ -461,7 +461,9 @@ class Order extends Api
         if (empty($get_order)){
             $this->result('此订单不能收货');
         }
-
+        ShopUser::where('id',$get_order['suser_id'])->setInc('order_num');
+        ShopUser::where('id',$get_order['suser_id'])->setInc('order_price',$get_order['pay_price']);
+        ShopUser::where('id',$get_order['suser_id'])->setInc('balance',$get_order['pay_price']);
 //        ShopUser::where('id',$get_order['suser_id'])->setInc('order_num');
 //        ShopUser::where('id',$get_order['suser_id'])->setInc('order_price',$get_order['pay_price']);
 //        ShopUser::where('id',$get_order['suser_id'])->setInc('balance',$get_order['pay_price']);
@@ -638,9 +640,7 @@ class Order extends Api
                             $status=1;
                             StoreOrder::where('order_id',$out_trade_no)->update(['status'=>$status,'pay_time'=>time()]);
                         }
-                        ShopUser::where('id',$get_order['suser_id'])->setInc('order_num');
-                        ShopUser::where('id',$get_order['suser_id'])->setInc('order_price',$get_order['pay_price']);
-                        ShopUser::where('id',$get_order['suser_id'])->setInc('balance',$get_order['pay_price']);
+
 
                         StoreProduct::where('id',$get_order['store_product_id'])->setDec('stock',$get_order['total_num']);
                         StoreProduct::where('id',$get_order['store_product_id'])->setInc('sales',$get_order['total_num']);

public/assets/js/backend/member_extract.js

@@ -21,19 +21,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                height: $(window).height() - 100,
+                showToggle: false,
+                showColumns: false,
+                visible:false,
+                //   showExport:false,
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
-                        {field: 'extract_id', title: __('退款单号')},
-                        {field: 'member.nickname', title: __('用户')},
+                        {field: 'id', title: __('Id'),operate:false},
+                        {field: 'extract_id', title: __('提现单号')},
+                        {field: 'member.nickname', title: __('用户'),operate:false},
                         // {field: 'suser_id', title: __('Suser_id')},
                         {field: 'extract_price', title: __('Extract_price'), operate:'BETWEEN'},
-                        {field: 'mark', title: __('Mark')},
+                        {field: 'mark', title: __('Mark'),operate:'false'},
                         {field: 'type', title: __('提现类型'), searchList: {"1":__('商家提现'),"2":__('用户提现')}, formatter: Table.api.formatter.normal},
 
                         {field: 'status', title: __('状态'), searchList: {"0":__('申请中'),"1":__('已打款'),"2":__('已拒绝')}, formatter: Table.api.formatter.normal},
-                        {field: 'refuse_mark', title: __('Refuse_mark')},
+                        {field: 'refuse_mark', title: __('Refuse_mark'),operate:false},
 
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table,

public/assets/js/backend/order/store_order.js

@@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id'),operate:false},
                         {field: 'order_id', title: __('Order_id')},
                         {field: 'member.nickname', title: __('Mid'),operate:false},
-                        {field: 'address_name', title: __('收件人')},
+                        {field: 'address_name', title: __('收件人'),operate:'Like'},
                         {field: 'shopuser.shopname', title: __('Suser_id'),operate:false},
                         {field: 'store_name', title: __('商品名称'),operate:'Like'},
                         // {field: 'address_id', title: __('Address_id')},