ソースを参照

'后台统计'

aiyou 4 年 前
コミット
19ebb8ff4d

+ 8 - 1
application/admin/controller/MemberExtract.php

@@ -40,7 +40,7 @@ class MemberExtract extends Backend
     /**
      * 查看
      */
-    public function index()
+    public function index($suser_id=null)
     {
         //设置过滤方法
         $this->request->filter(['strip_tags']);
@@ -50,10 +50,16 @@ class MemberExtract extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $whre1=[];
+            if (!empty($suser_id)){
+                $whre1['type']='1';
+                $whre1['suser_id']=$suser_id;
+            }
             $total = $this->model
                 ->where($where)
                 ->where('is_del','0')
                 ->where('is_system_del','0')
+                ->where($whre1)
                 ->order($sort, $order)
                 ->count();
 
@@ -61,6 +67,7 @@ class MemberExtract extends Backend
                 ->where($where)
                 ->where('is_del','0')
                 ->where('is_system_del','0')
+                ->where($whre1)
                 ->with('member')
                 ->order($sort, $order)
                 ->limit($offset, $limit)

+ 35 - 0
application/admin/controller/ShopExtract.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 用户提现管理
+ *
+ * @icon fa fa-circle-o
+ */
+class ShopExtract extends Backend
+{
+    
+    /**
+     * ShopExtract模型对象
+     * @var \app\admin\model\ShopExtract
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\ShopExtract;
+
+    }
+    
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    
+
+}

+ 41 - 1
application/admin/controller/ShopOrder.php

@@ -30,6 +30,46 @@ class ShopOrder extends Backend
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
-    
+    /**
+     * 查看
+     */
+    public function index($suser_id=null)
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage,则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $where1['status']=['not in',['0','9']];
+            $where1['suser_id']=$suser_id;
+            $total = $this->model
+                ->where($where)
+                ->where('is_system_del','0')
+                //->where('is_del','0')
+                ->where($where1)
+                ->order($sort, $order)
+                ->count();
+
+            $list = $this->model
+                ->where($where)
+                ->with(['shopuser','member'])
+                ->where('is_system_del','0')
+                //->where('is_del','0')
+                ->where($where1)
+                ->order($sort, $order)
+                ->limit($offset, $limit)
+                ->select();
+
+            $list = collection($list)->toArray();
+
+            $result = array("total" => $total, "rows" => $list);
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
 
 }

+ 3 - 0
application/admin/controller/order/StoreOrder.php

@@ -51,10 +51,12 @@ class StoreOrder extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $where1['status']=['not in',['0','9']];
             $total = $this->model
                 ->where($where)
                 ->where('is_system_del','0')
                 ->where('is_del','0')
+                ->where($where1)
                 ->order($sort, $order)
                 ->count();
 
@@ -63,6 +65,7 @@ class StoreOrder extends Backend
                 ->with(['shopuser','member'])
                 ->where('is_system_del','0')
                 ->where('is_del','0')
+                ->where($where1)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
                 ->select();

+ 18 - 0
application/admin/lang/zh-cn/shop_extract.php

@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'Id'            => '订单ID',
+    'Extract_id'    => '订单号',
+    'Mid'           => '用户id',
+    'Suser_id'      => '商户ID',
+    'Real_name'     => '用户真实姓名',
+    'Extract_price' => '提现金额',
+    'Mark'          => '备注',
+    'Type'          => '1商家提现,2用户提现',
+    'Status'        => '0申请中,1已打款,2拒绝',
+    'Refuse_mark'   => '拒绝理由',
+    'Is_del'        => '是否删除',
+    'Is_system_del' => '后台是否删除',
+    'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间'
+];

+ 40 - 0
application/admin/model/ShopExtract.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class ShopExtract extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'member_extract';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+}

+ 12 - 1
application/admin/model/ShopOrder.php

@@ -82,6 +82,17 @@ class ShopOrder extends Model
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
-
+    public function shopuser()
+    {
+        return $this->belongsTo('app\admin\model\ShopUser','suser_id','id')->field('id,shopname');
+    }
+    public function product()
+    {
+        return $this->belongsTo('app\admin\model\store\StoreProduct','store_product_id','id')->field('id,store_name,image,price,special_price');
+    }
+    public function member()
+    {
+        return $this->belongsTo('app\admin\model\Member','mid','mid')->field('mid,nickname');
+    }
 
 }

+ 27 - 0
application/admin/validate/ShopExtract.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class ShopExtract extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

+ 76 - 0
application/admin/view/shop_extract/add.html

@@ -0,0 +1,76 @@
+<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">{:__('Extract_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-extract_id" data-rule="required" data-source="extract/index" class="form-control selectpage" name="row[extract_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mid" data-rule="required" class="form-control" name="row[mid]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Suser_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-suser_id" data-rule="required" data-source="suser/index" class="form-control selectpage" name="row[suser_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_name" data-rule="required" class="form-control" name="row[real_name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Extract_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-extract_price" data-rule="required" class="form-control" step="0.01" name="row[extract_price]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mark" data-rule="required" class="form-control" name="row[mark]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-type" data-rule="required" class="form-control" name="row[type]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refuse_mark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refuse_mark" data-rule="required" class="form-control" name="row[refuse_mark]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_del')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-is_del" data-rule="required" class="form-control" name="row[is_del]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_system_del')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-is_system_del" class="form-control" name="row[is_system_del]" type="number" value="0">
+        </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">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 76 - 0
application/admin/view/shop_extract/edit.html

@@ -0,0 +1,76 @@
+<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">{:__('Extract_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-extract_id" data-rule="required" data-source="extract/index" class="form-control selectpage" name="row[extract_id]" type="text" value="{$row.extract_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mid" data-rule="required" class="form-control" name="row[mid]" type="number" value="{$row.mid|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Suser_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-suser_id" data-rule="required" data-source="suser/index" class="form-control selectpage" name="row[suser_id]" type="text" value="{$row.suser_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_name" data-rule="required" class="form-control" name="row[real_name]" type="text" value="{$row.real_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Extract_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-extract_price" data-rule="required" class="form-control" step="0.01" name="row[extract_price]" type="number" value="{$row.extract_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mark" data-rule="required" class="form-control" name="row[mark]" type="text" value="{$row.mark|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-type" data-rule="required" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refuse_mark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refuse_mark" data-rule="required" class="form-control" name="row[refuse_mark]" type="text" value="{$row.refuse_mark|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_del')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-is_del" data-rule="required" class="form-control" name="row[is_del]" type="number" value="{$row.is_del|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_system_del')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-is_system_del" class="form-control" name="row[is_system_del]" type="number" value="{$row.is_system_del|htmlentities}">
+        </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">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 35 - 0
application/admin/view/shop_extract/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <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('shop_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('shop_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('shop_extract/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('shop_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('shop_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>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('shop_extract/edit')}" 
+                           data-operate-del="{:$auth->check('shop_extract/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

+ 11 - 11
application/admin/view/shop_order/index.html

@@ -7,18 +7,18 @@
                 <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('shop_order/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('shop_order/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('shop_order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('shop_order/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('shop_order/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('shop_order/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('shop_order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('shop_order/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('shop_order/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>
-                        </div>
+<!--                        <div class="dropdown btn-group {:$auth->check('shop_order/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>-->
+<!--                        </div>-->
 
                         
                     </div>

+ 62 - 0
public/assets/js/backend/shop_extract.js

@@ -0,0 +1,62 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'shop_extract/index' + location.search,
+                    add_url: 'shop_extract/add',
+                    edit_url: 'shop_extract/edit',
+                    del_url: 'shop_extract/del',
+                    multi_url: 'shop_extract/multi',
+                    table: 'member_extract',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'extract_id', title: __('Extract_id')},
+                        {field: 'mid', title: __('Mid')},
+                        {field: 'suser_id', title: __('Suser_id')},
+                        {field: 'real_name', title: __('Real_name')},
+                        {field: 'extract_price', title: __('Extract_price'), operate:'BETWEEN'},
+                        {field: 'mark', title: __('Mark')},
+                        {field: 'type', title: __('Type')},
+                        {field: 'status', title: __('Status')},
+                        {field: 'refuse_mark', title: __('Refuse_mark')},
+                        {field: 'is_del', title: __('Is_del')},
+                        {field: 'is_system_del', title: __('Is_system_del')},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

+ 51 - 47
public/assets/js/backend/shop_order.js

@@ -21,59 +21,63 @@ 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: 'id', title: __('Id'),operate:false},
                         {field: 'order_id', title: __('Order_id')},
-                        {field: 'mid', title: __('Mid')},
-                        {field: 'suser_id', title: __('Suser_id')},
-                        {field: 'store_product_id', title: __('Store_product_id')},
-                        {field: 'store_name', title: __('Store_name')},
-                        {field: 'cate_id', title: __('Cate_id')},
-                        {field: 'address_id', title: __('Address_id')},
-                        {field: 'address_name', title: __('Address_name')},
-                        {field: 'address_phone', title: __('Address_phone')},
-                        {field: 'address_address', title: __('Address_address')},
-                        {field: 'freight_price', title: __('Freight_price'), operate:'BETWEEN'},
-                        {field: 'total_num', title: __('Total_num')},
-                        {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
-                        {field: 'commission_price', title: __('Commission_price'), operate:'BETWEEN'},
-                        {field: 'total_postage', title: __('Total_postage'), operate:'BETWEEN'},
+                        {field: 'member.nickname', title: __('Mid'),operate:false},
+                        {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')},
+                        // {field: 'address_name', title: __('Address_name')},
+                        // {field: 'address_phone', title: __('Address_phone')},
+                        // {field: 'address_address', title: __('Address_address')},
+                        // {field: 'freight_price', title: __('Freight_price'), operate:'BETWEEN'},
+                        {field: 'total_num', title: __('Total_num'),operate:false},
+                        // {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
+                        // {field: 'total_postage', title: __('Total_postage'), operate:'BETWEEN'},
                         {field: 'pay_price', title: __('Pay_price'), operate:'BETWEEN'},
-                        {field: 'pay_postage', title: __('Pay_postage'), operate:'BETWEEN'},
-                        {field: 'deduction_price', title: __('Deduction_price'), operate:'BETWEEN'},
-                        {field: 'coupon_id', title: __('Coupon_id')},
-                        {field: 'coupon_price', title: __('Coupon_price'), operate:'BETWEEN'},
+                        {field: 'commission_price', title: __('佣金'),operate:false},
+                        // {field: 'pay_postage', title: __('Pay_postage'), operate:'BETWEEN'},
+                        // {field: 'deduction_price', title: __('Deduction_price'), operate:'BETWEEN'},
+                        // {field: 'coupon_id', title: __('Coupon_id')},
+                        // {field: 'coupon_price', title: __('Coupon_price'), operate:'BETWEEN'},
                         {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'take_time', title: __('Take_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'pay_type', title: __('Pay_type')},
-                        {field: 'prepay_id', title: __('Prepay_id')},
-                        {field: 'add_time', title: __('Add_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'is_seckill', title: __('Is_seckill')},
-                        {field: 'status', title: __('Status')},
-                        {field: 'refund_status', title: __('Refund_status')},
-                        {field: 'refund_type', title: __('Refund_type')},
-                        {field: 'refund_reason_wap_img', title: __('Refund_reason_wap_img')},
-                        {field: 'refund_reason_wap_explain', title: __('Refund_reason_wap_explain')},
-                        {field: 'refund_reason_time', title: __('Refund_reason_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'refund_reason_wap', title: __('Refund_reason_wap')},
-                        {field: 'refund_reason', title: __('Refund_reason')},
-                        {field: 'refund_delivery_name', title: __('Refund_delivery_name')},
-                        {field: 'refund_delivery_id', title: __('Refund_delivery_id')},
-                        {field: 'refund_price', title: __('Refund_price'), operate:'BETWEEN'},
-                        {field: 'delivery_name', title: __('Delivery_name')},
-                        {field: 'delivery_id', title: __('Delivery_id')},
-                        {field: 'gain_integral', title: __('Gain_integral'), operate:'BETWEEN'},
-                        {field: 'use_integral', title: __('Use_integral'), operate:'BETWEEN'},
-                        {field: 'back_integral', title: __('Back_integral'), operate:'BETWEEN'},
-                        {field: 'mark', title: __('Mark')},
-                        {field: 'is_del', title: __('Is_del')},
-                        {field: 'remark', title: __('Remark')},
-                        {field: 'shipping_type', title: __('Shipping_type')},
-                        {field: 'is_remind', title: __('Is_remind')},
-                        {field: 'is_system_del', title: __('Is_system_del')},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        // {field: 'pay_type', title: __('Pay_type')},
+                        // {field: 'prepay_id', title: __('Prepay_id')},
+                        {field: 'add_time', title: __('Add_time'),operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        //订单状态(-1 : 申请退款 -2 : 退货成功,-3退款失败 0:待付款,1:待发货(已付款);2:待收货(已发货);3:已收货(确认收货);4:已评价;)
+                        {field: 'status', title: __('订单状态'), searchList: {"-1":__('申请退款'),"-2":__('同意退款'),"-3":__('拒绝退款'),"-4":__('退货已发货'),"-5":__('退款成功'),"0":__('待付款'),"1":__('待发货'),"2":__('待收货'),"3":__('已收货'),"4":__('已评价'),"9":__('已取消')}, formatter: Table.api.formatter.normal},
+
+                        // {field: 'refund_status', title: __('Refund_status')},
+                        // {field: 'refund_type', title: __('Refund_type')},
+                        // {field: 'refund_reason_wap_img', title: __('Refund_reason_wap_img')},
+                        // {field: 'refund_reason_wap_explain', title: __('Refund_reason_wap_explain')},
+                        // {field: 'refund_reason_time', title: __('Refund_reason_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        // {field: 'refund_reason_wap', title: __('Refund_reason_wap')},
+                        // {field: 'refund_reason', title: __('Refund_reason')},
+                        // {field: 'refund_price', title: __('Refund_price'), operate:'BETWEEN'},
+                        // {field: 'delivery_name', title: __('Delivery_name')},
+                        // {field: 'delivery_id', title: __('Delivery_id')},
+                        // {field: 'gain_integral', title: __('Gain_integral'), operate:'BETWEEN'},
+                        // {field: 'use_integral', title: __('Use_integral'), operate:'BETWEEN'},
+                        // {field: 'back_integral', title: __('Back_integral'), operate:'BETWEEN'},
+                        {field: 'mark', title: __('Mark'),operate:'Like'},
+                        // {field: 'is_del', title: __('Is_del')},
+                        // {field: 'unique', title: __('Unique')},
+                        // {field: 'remark', title: __('Remark')},
+                        // {field: 'shipping_type', title: __('Shipping_type')},
+                        // {field: 'is_remind', title: __('Is_remind')},
+                        // {field: 'is_system_del', title: __('Is_system_del')},
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });

+ 37 - 1
public/assets/js/backend/shop_user.js

@@ -20,6 +20,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                height: $(window).height() - 100,
                 search:false,
                 showToggle: false,
                 showColumns: false,
@@ -44,7 +45,42 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'status', title: __('状态'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2'),"4":__('资料修改'),"5":__('修改驳回')}, formatter: Table.api.formatter.normal},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {
+                            field: 'operate', title: __('Operate'), table: table,
+
+                            buttons: [
+
+                                {
+                                    name: 'detail',
+                                    text: '订单查看',
+                                    title: function (row) {
+                                        return row.shopname+'的订单';
+                                    },
+                                    classname: 'btn btn-xs btn-success btn-addtabs',
+                                    icon: 'fa fa-list',
+                                    dropdown:'更多操作',
+                                    url: function (row) {
+                                        return 'shop_order/index?suser_id='+ row.id;
+                                    }
+                                },
+                                {
+                                    name: 'detail',
+                                    text: '提现查看',
+                                    title: function (row) {
+                                        return row.shopname+'的提现';
+                                    },
+
+                                    classname: 'btn btn-xs btn-warning btn-addtabs',
+                                    icon: 'fa fa-list',
+                                    dropdown:'更多操作',
+                                    url: function (row) {
+                                        return 'member_extract/index?suser_id='+ row.id;
+                                    }
+                                }
+                            ],
+
+                            events: Table.api.events.operate, formatter: Table.api.formatter.operate
+                        }
                     ]
                 ]
             });