hrjy 3 年之前
父节点
当前提交
ccf6ddb2e0
共有 25 个文件被更改,包括 121 次插入33 次删除
  1. 6 2
      app/admin/controller/auction/AuctionOrder.php
  2. 52 3
      app/admin/model/auction/AuctionOrder.php
  3. 60 26
      app/admin/view/auction/auction_order/index.php
  4. 1 0
      app/admin/view/user/user/index.php
  5. 1 1
      app/models/auction/AuctionProduct.php
  6. 1 1
      public/index/index.html
  7. 0 0
      public/index/static/js/index.5e2f6032.js
  8. 0 0
      public/index/static/js/index.8672ff17.js
  9. 0 0
      public/index/static/js/pages-collection-wx.55b5ec0f.js
  10. 0 0
      public/index/static/js/pages-hall-hallinfo.4ea8490b.js
  11. 0 0
      public/index/static/js/pages-hall-hallpay.0448382c.js
  12. 0 0
      public/index/static/js/pages-money-pay.73efa015.js
  13. 0 0
      public/index/static/js/pages-money-paySuccess.7276e233.js
  14. 0 0
      public/index/static/js/pages-money-paySuccess.e5b86928.js
  15. 0 0
      public/index/static/js/pages-order-createOrder.dd39fbec.js
  16. 0 0
      public/index/static/js/pages-order-evaluate.06d4083e.js
  17. 0 0
      public/index/static/js/pages-order-expressInfo.3083b546.js
  18. 0 0
      public/index/static/js/pages-order-order.d8b815a7.js
  19. 0 0
      public/index/static/js/pages-order-order1.71919450.js
  20. 0 0
      public/index/static/js/pages-order-orderDetail.dfbe041c.js
  21. 0 0
      public/index/static/js/pages-order-orderRefund.b840980f.js
  22. 0 0
      public/index/static/js/pages-set-userinfo.5f735597.js
  23. 0 0
      public/index/static/js/pages-user-approve.f0e57460.js
  24. 0 0
      public/index/static/js/pages-user-gzsq.6009be36.js
  25. 0 0
      public/index/static/js/pages-user-mygs.3c362572.js

+ 6 - 2
app/admin/controller/auction/AuctionOrder.php

@@ -32,10 +32,11 @@ class AuctionOrder extends AuthController
     {
     {
 
 
         $list = \app\admin\model\auction\Auction::select();
         $list = \app\admin\model\auction\Auction::select();
-
+        $gu = \app\admin\model\auction\AuctionGu::select();
         $this->assign([
         $this->assign([
             'year' => get_month(),
             'year' => get_month(),
             'auction'=> $list,
             'auction'=> $list,
+            'gu' => $gu
 
 
         ]);
         ]);
         return $this->fetch();
         return $this->fetch();
@@ -55,7 +56,10 @@ class AuctionOrder extends AuthController
             ['auction_id', ''],
             ['auction_id', ''],
             ['store_name', ''],
             ['store_name', ''],
             ['data', ''],
             ['data', ''],
-            ['status', '']
+            ['status', ''],
+            ['gu_id', ''],
+            ['product_name'],
+            ['excel', 0]
         ]);
         ]);
         $data = model::list($where);
         $data = model::list($where);
         foreach ($data['data'] as $key => $val){
         foreach ($data['data'] as $key => $val){

+ 52 - 3
app/admin/model/auction/AuctionOrder.php

@@ -8,9 +8,12 @@
 
 
 namespace app\admin\model\auction;
 namespace app\admin\model\auction;
 
 
+use app\admin\model\order\StoreOrderCartInfo;
 use app\admin\model\user\User;
 use app\admin\model\user\User;
 use app\admin\model\user\UserBill;
 use app\admin\model\user\UserBill;
+use app\admin\model\wechat\WechatUser;
 use app\models\auction\AuctionProduct;
 use app\models\auction\AuctionProduct;
+use crmeb\services\PHPExcelService;
 use crmeb\services\product\Product;
 use crmeb\services\product\Product;
 use crmeb\traits\ModelTrait;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 use crmeb\basic\BaseModel;
@@ -35,17 +38,31 @@ class AuctionOrder extends BaseModel
     {
     {
         $model = self::alias('a')
         $model = self::alias('a')
             ->order('a.id', 'desc')
             ->order('a.id', 'desc')
-            ->field('a.*, u.account, u.nickname,p.name, p.image')
+            ->field('a.*, u.account, u.nickname,us.account as us_account,p.name, p.image, au.nickname as au_name, gu.name as gu_name')
             ->leftJoin('user u', 'a.uid = u.uid')
             ->leftJoin('user u', 'a.uid = u.uid')
-            ->leftJoin('auction_product p', 'a.product_id = p.id');
+            ->leftJoin('user us', 'us.uid = a.collection_id')
+            ->leftJoin('auction_product p', 'a.product_id = p.id')
+            ->leftJoin('auction au', 'au.id = p.auction_id')
+            ->leftJoin('auction_gu gu', 'gu.id = au.auction_gu_id');
 
 
 
 
 
 
         if (trim($where['store_name']) != '') $model->where('a.id|u.account|u.nickname|a.order_id', 'like', '%'.$where['store_name'].'%');
         if (trim($where['store_name']) != '') $model->where('a.id|u.account|u.nickname|a.order_id', 'like', '%'.$where['store_name'].'%');
         if (trim($where['status']) != '') $model->where('a.status', $where['status']);
         if (trim($where['status']) != '') $model->where('a.status', $where['status']);
-        if (trim($where['auction_id']) != '') $model->where('a.auction_id', $where['auction_id']);
+        if (trim($where['auction_id']) != '') $model->where('au.id', $where['auction_id']);
+        if (trim($where['gu_id']) != '') $model->where('gu.id', $where['gu_id']);
+        if (trim($where['product_name']) != '') $model->where('p.name', $where['product_name']);
         if (trim($where['data']) != '') $model = self::getModelTime($where, $model,  'a.create_time');
         if (trim($where['data']) != '') $model = self::getModelTime($where, $model,  'a.create_time');
 
 
+        if (isset($where['excel']) && $where['excel'] == 1) {
+            $list = ($list = $model->select()) && count($list) ? $list->toArray() : [];
+        } else {
+            $list = ($list = $model->page((int)$where['page'], (int)$where['limit'])->select()) && count($list) ? $list->toArray() : [];
+        }
+        if (isset($where['excel']) && $where['excel'] == 1) {
+            self::SaveExcel($list);
+        }
+
         if ($where['page'] && $where['limit']){
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
             $model->page($where['page'], $where['limit']);
         }else{
         }else{
@@ -55,11 +72,43 @@ class AuctionOrder extends BaseModel
         $data['count'] = $model->count();
         $data['count'] = $model->count();
         $list = $model->select();
         $list = $model->select();
 
 
+
         $data['data'] = $list;
         $data['data'] = $list;
         return $data;
         return $data;
 
 
     }
     }
 
 
+    /*
+     * 保存并下载excel
+     * $list array
+     * return
+     */
+    public static function SaveExcel($list)
+    {
+        $export = [];
+        foreach ($list as $index => $item) {
+            $status = $item['status']== 0 ? '过期' :  $item['status']== 1 ? '待上传':$item['status']== 2 ? '待审核':$item['status']== 3 ? '完成': '未知';
+            $export[] = [
+                $item['order_id'],
+                $item['name'],
+                $item['au_name'],
+                $item['gu_name'],
+                $item['account'],
+                $item['nickname'],
+                $item['us_account'],
+                $item['price'],
+                $status,
+                $item['create_time'],
+            ];
+        }
+        PHPExcelService::setExcelHeader(['订单号', '商品名', '场馆', '场次', '买家账号', '买家昵称', '卖家账号','商品价格', '状态',
+            '订单时间'])
+            ->setExcelTile('订单导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间:' . date('Y-m-d H:i:s', time()))
+            ->setExcelContent($export)
+            ->ExcelSave();
+    }
+
+
     /**
     /**
      * 卖家操作
      * 卖家操作
      * @param $id  //商品所属人
      * @param $id  //商品所属人

+ 60 - 26
app/admin/view/auction/auction_order/index.php

@@ -51,17 +51,45 @@
                                     <input type="text" name="store_name" class="layui-input" placeholder="订单号,账号,昵称,编号">
                                     <input type="text" name="store_name" class="layui-input" placeholder="订单号,账号,昵称,编号">
                                 </div>
                                 </div>
                             </div>
                             </div>
-                            <div class="layui-col-lg12">
+                            <div class="layui-inline">
-                                <label class="layui-form-label">创建状态:</label>
+                                <label class="layui-form-label" style="top: -4.5px">商品名称</label>
-                                <div class="layui-input-block" v-cloak="">
+                                <div class="layui-input-inline">
-                                    <button class="layui-btn layui-btn-sm" type="button" v-for="item in statusList"
+                                    <input type="text" name="product_name" class="layui-input" placeholder="商品名称">
-                                            @click="where.status = item.value"
+                                </div>
-                                            :class="{'layui-btn-primary':where.status!==item.value}">{{item.name}}
+                            </div>
-                                    </button>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="top: -4.5px">所有场次</label>
+                                <div class="layui-input-block">
+                                    <select name="auction_id">
+                                        <option value=" ">全部</option>
+                                        {volist name='auction' id='vo'}
+                                        <option value="{$vo.id}">{$vo.nickname}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="top: -4.5px">所有场馆</label>
+                                <div class="layui-input-block">
+                                    <select name="gu_id">
+                                        <option value=" ">全部</option>
+                                        {volist name='gu' id='vo'}
+                                        <option value="{$vo.id}">{$vo.name}</option>
+                                        {/volist}
+                                    </select>
                                 </div>
                                 </div>
                             </div>
                             </div>
 
 
-                            <div class="layui-col-lg12">
+                            <div class="layui-col-lg12" id="app1">
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">创建状态:</label>
+                                    <div class="layui-input-block" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm" type="button" v-for="item in statusList"
+                                                @click="where.status = item.value"
+                                                :class="{'layui-btn-primary':where.status!==item.value}">{{item.name}}
+                                        </button>
+                                    </div>
+                                </div>
                                 <label class="layui-form-label">创建时间:</label>
                                 <label class="layui-form-label">创建时间:</label>
                                 <div class="layui-input-block" data-type="data" v-cloak="">
                                 <div class="layui-input-block" data-type="data" v-cloak="">
                                     <button class="layui-btn layui-btn-sm" type="button" v-for="item in dataList"
                                     <button class="layui-btn layui-btn-sm" type="button" v-for="item in dataList"
@@ -76,11 +104,18 @@
                                             v-show="showtime==true" ref="date_time">{$year.0} - {$year.1}
                                             v-show="showtime==true" ref="date_time">{$year.0} - {$year.1}
                                     </button>
                                     </button>
                                 </div>
                                 </div>
+                                <button @click="excel" type="button"
+                                        class="layui-btn layui-btn-warm layui-btn-sm export" type="button">
+                                    <i class="fa fa-floppy-o" style="margin-right: 3px;"></i>导出
+                                </button>
                             </div>
                             </div>
                             <div class="layui-inline" style="top: -5px">
                             <div class="layui-inline" style="top: -5px">
                                 <div class="layui-input-inline">
                                 <div class="layui-input-inline">
+
                                     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search" >
                                     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search" >
-                                        <i class="layui-icon layui-icon-search"></i>搜索</button>
+                                        <i class="layui-icon layui-icon-search"></i>搜索
+                                    </button>
+
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </div>
                         </div>
@@ -111,6 +146,10 @@
                     <script type="text/html" id="image"  >
                     <script type="text/html" id="image"  >
                         <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}" style="cursor: pointer">
                         <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}" style="cursor: pointer">
                     </script>
                     </script>
+                    <script type="text/html" id="au_name"  >
+                        <div>{{d.gu_name}}</div>
+                        <div>{{d.au_name}}</div>
+                    </script>
                     <script type="text/html" id="status">
                     <script type="text/html" id="status">
                         {{#  if(d.status < 1){ }}
                         {{#  if(d.status < 1){ }}
                         <button type="button" name="status" class="layui-btn-disabled layui-btn-xs" id="">
                         <button type="button" name="status" class="layui-btn-disabled layui-btn-xs" id="">
@@ -136,7 +175,7 @@
                             未上传打款凭证
                             未上传打款凭证
                         </button>
                         </button>
                         {{#  } else { }}
                         {{#  } else { }}
-                            <img style="cursor: pointer" lay-event="open_image" src="{{d.upload_image}}" style="cursor: pointer">
+                            <img style="cursor: pointer" lay-event="open_upload_image" src="{{d.upload_image}}" style="cursor: pointer">
                         {{#  } }}
                         {{#  } }}
                     </script>
                     </script>
                     <script type="text/html" id="act">
                     <script type="text/html" id="act">
@@ -165,12 +204,14 @@
             {type: 'checkbox'},
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'image', title: '图片', templet: '#image',  align: 'center', width: '5%'},
             {field: 'image', title: '图片', templet: '#image',  align: 'center', width: '5%'},
-            {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center',width: '5%'},
             {field: 'order_id', title: '订单号', templet: '#order_id',  align: 'center'},
             {field: 'order_id', title: '订单号', templet: '#order_id',  align: 'center'},
+            {field: 'au_name', title: '场次', templet: '#au_name',  align: 'center'},
             {field: 'account', title: '购买用户账号', templet: '#account',  align: 'center'},
             {field: 'account', title: '购买用户账号', templet: '#account',  align: 'center'},
             {field: 'nickname', title: '购买用户呢称', templet: '#nickname',  align: 'center'},
             {field: 'nickname', title: '购买用户呢称', templet: '#nickname',  align: 'center'},
+            {field: 'us_account', title: '卖家账号', templet: '#us_account',  align: 'us_account'},
             {field: 'name', title: '商品', templet: '#name',  align: 'center'},
             {field: 'name', title: '商品', templet: '#name',  align: 'center'},
             {field: 'price', title: '购买价格', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
             {field: 'price', title: '购买价格', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
+            {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center',width: '5%'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'create_time', title: '预约时间', templet: '#date', align: 'center'},
             {field: 'create_time', title: '预约时间', templet: '#date', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
@@ -214,6 +255,9 @@
             case 'open_image':
             case 'open_image':
                 $eb.openImage(data.image);
                 $eb.openImage(data.image);
                 break;
                 break;
+            case 'open_upload_image':
+                $eb.openImage(data.upload_image);
+                break;
             case 'edit':
             case 'edit':
                 location.href = layList.U({a:'edit',q:{id:data.id}});
                 location.href = layList.U({a:'edit',q:{id:data.id}});
                 break;
                 break;
@@ -222,7 +266,6 @@
 
 
     //查询
     //查询
     layList.search('search',function(where){
     layList.search('search',function(where){
-        console.log(111);
         layList.reload(where,true);
         layList.reload(where,true);
     });
     });
 
 
@@ -244,7 +287,7 @@
     });
     });
     require(['vue'], function (Vue) {
     require(['vue'], function (Vue) {
         new Vue({
         new Vue({
-            el: "#app",
+            el: "#app1",
             data: {
             data: {
                 badge: [],
                 badge: [],
                 dataList: [
                 dataList: [
@@ -273,22 +316,12 @@
                 showtime: false,
                 showtime: false,
             },
             },
             watch: {
             watch: {
-                'where.status': function () {
+                'where.store_name': function () {
-                    this.where.excel = 0;
-                    this.getBadge();
-                    layList.reload(this.where, true);
-                },
-                'where.data': function () {
-                    this.where.excel = 0;
-                    this.getBadge();
-                    layList.reload(this.where, true);
-                },
-                'where.type': function () {
                     this.where.excel = 0;
                     this.where.excel = 0;
                     this.getBadge();
                     this.getBadge();
                     layList.reload(this.where, true);
                     layList.reload(this.where, true);
                 },
                 },
-                'where.pay_type': function () {
+                'where.product_name': function () {
                     this.where.excel = 0;
                     this.where.excel = 0;
                     this.getBadge();
                     this.getBadge();
                     layList.reload(this.where, true);
                     layList.reload(this.where, true);
@@ -321,8 +354,9 @@
                     this.getBadge();
                     this.getBadge();
                 },
                 },
                 excel: function () {
                 excel: function () {
+                    console.log(11111);
                     this.where.excel = 1;
                     this.where.excel = 1;
-                    location.href = layList.U({c: 'order.store_order', a: 'order_list', q: this.where});
+                    location.href = layList.U({c: 'Auction.auction_order', a: 'list', q: this.where});
                     this.where.excel = 0;
                     this.where.excel = 0;
                 }
                 }
             },
             },

+ 1 - 0
app/admin/view/user/user/index.php

@@ -314,6 +314,7 @@
             {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
             {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
             {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
             {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
             {field: 'integral', title: '积分',width:'6%',sort:true,event:'integral',align:'center'},
             {field: 'integral', title: '积分',width:'6%',sort:true,event:'integral',align:'center'},
+            {field: 'anticipate', title: '预约券',width:'6%',sort:true,event:'integral',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
             {field: 'sex', title: '性别',width:'4%',align:'center'},
             {field: 'sex', title: '性别',width:'4%',align:'center'},
             {field: 'data_time', title: '访问日期',align:'center',width:'12%',templet:'#data_time'},
             {field: 'data_time', title: '访问日期',align:'center',width:'12%',templet:'#data_time'},

+ 1 - 1
app/models/auction/AuctionProduct.php

@@ -36,7 +36,7 @@ class AuctionProduct extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      */
      */
     public static function list($data, $uid){
     public static function list($data, $uid){
-        $model = self::where('is_show', 1)->where('auction_id', $data['id'])->order('sort DESC,id DESC');
+        $model = self::where('is_show', 1)->where('auction_id', $data['id'])->order('id DESC');
         $model->page($data['page'], $data['limit']);
         $model->page($data['page'], $data['limit']);
         if ($data['name']) $model->where('name', 'like', '%'.$data['name'].'%');
         if ($data['name']) $model->where('name', 'like', '%'.$data['name'].'%');
         $list = $model->select();
         $list = $model->select();

+ 1 - 1
public/index/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.0e356d87.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.8672ff17.js></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/index.5e2f6032.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/index.8672ff17.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-collection-wx.55b5ec0f.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-hall-hallinfo.4ea8490b.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-hall-hallpay.0448382c.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-money-pay.73efa015.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-money-paySuccess.7276e233.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-money-paySuccess.e5b86928.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-order-createOrder.dd39fbec.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-order-evaluate.06d4083e.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-order-expressInfo.3083b546.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-order-order.d8b815a7.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-order-order1.71919450.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-order-orderDetail.dfbe041c.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-order-orderRefund.b840980f.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-set-userinfo.5f735597.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-user-approve.f0e57460.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-user-gzsq.6009be36.js


文件差异内容过多而无法显示
+ 0 - 0
public/index/static/js/pages-user-mygs.3c362572.js


部分文件因为文件数量过多而无法显示