修改2022

03c69d3c · 汪睦雄 · bceba8cf · 03c69d3c · 03c69d3c · 03c69d3c
Commit 03c69d3c authored Jun 30, 2022 by 汪睦雄
5 changed files
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -9,7 +9,7 @@ use think\Db;
 use think\Exception;
 use think\Loader;
 use app\common\model\UserAddress as UserAddressModel;
+use app\admin\controller\OutputExcel;
 Loader::import('wxpay.Api');
@@ -91,6 +91,7 @@ class Order extends AuthBase
            $condition['type'] = $type;
        }
        if($title){
+            // $title = mysql_escape_string($title);
            $condition['title'] = ['like','%'.$title.'%'];
        }
        if ($start_time && $end_time) {
@@ -164,7 +165,7 @@ class Order extends AuthBase
        $Description = '美行者订单导出';//这是描述;
        $Keywords = '';//这是关键字
        $Category = '';//这是分类
-        $filename = '美行者订单导出';//文件名
+        $filename = "美行者订单导出".date('YmdHis');//文件名
        $obj = new OutputExcel();
        /*调用excle导出类*/
        $obj->export($mulit_arr, $filename, $title, $Subject, $Description, $Keywords, $Category);

--- a/application/admin/controller/OutputExcel.php
+++ b/application/admin/controller/OutputExcel.php
@@ -110,7 +110,7 @@ class OutputExcel
            header('Content-Type:application/vnd.ms-execl');
            header('Content-Type:application/octet-stream');
            header('Content-Type:application/download');
-            header("Content-Disposition:attachment;filename='$filename'");
+            header("Content-Disposition:attachment;filename=$filename");
            header('Content-Transfer-Encoding:binary');
            $obwrite->save('php://output');
        }else if($type == 'put') {

--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -57,6 +57,7 @@ class User extends AuthBase
    }
    public function userOutPut(){
        $nickname = input('get.nickname');
+        $phone = input('get.phone');
        $is_vip = input('get.is_vip');
        $start_time = input('get.start_time');
        $end_time = input('get.end_time');
@@ -64,6 +65,9 @@ class User extends AuthBase
        if($nickname){
            $condition['nickname'] = ['like','%'.$nickname.'%'];
        }
+        if($phone){
+            $condition['phone'] = $phone;
+        }
        // if($is_vip){
        //     $condition['vip_endtime'] = ['>=',date('Y-m-d H:i:s')];
        // }else{
@@ -82,9 +86,10 @@ class User extends AuthBase
            }
        }
        $user_list = model('user')->where($condition)->field('name,wx_number,nickname,gender,phone,is_vip,created_at,updated_at,vip_endtime')->select();
+        // echo json_encode($condition); exit;
        $mulit_arr = [];
        $mulit_arr['data'] = [];
-        $cont = [['真实姓名','微信号','昵称','性别','电话','是否是会员','注册时间','更新时间','会员到期时间']];
+        $cont = [['真实姓名','微信号','昵称','性别','电话','是否会员','注册时间','更新时间','会员到期时间']];
        foreach ($user_list as $vo){
            $arr = [];
            $arr[] = $vo['name'];

--- a/application/admin/view/order/refund.html
+++ b/application/admin/view/order/refund.html
@@ -46,7 +46,9 @@
                    {volist name="$refund_list" id="vo" key="k" empty="暂时没有数据"}
                    <tr>
                        <td>{$vo.id}</td>
-                        <td>{$vo.order.title}</td>
+                        <td>
+                            订单ID：{$vo.order.id} <br/> {$vo.order.title} 
+                        </td>
                        <td>
                            {if condition="$vo.order.type == 1"}
                            活动报名订单
@@ -71,6 +73,18 @@
                                {if condition="$vo.order.user_info.is_vip == 1"}
                                {/if}
                            </p>
+                            <hr/>
+                            <p>
+                                下单地址：
+                                <?php
+                                    if(isset($vo['order']['extras']['address_id'])){
+                                        echo $vo['order']['extras']['nickname']." ".$vo['order']['extras']['phone']." ".$vo['order']['extras']['address'];
+                                    }else{
+                                        // 新版地址
+                                        echo $vo['order']['extras']['address'];
+                                    }
+                                ?>
+                            </p>
                        </td>
                        <td>{$vo.order.total_fee}</td>
                        <!--订单状态-->

--- a/application/admin/view/user/index.html
+++ b/application/admin/view/user/index.html
@@ -19,10 +19,8 @@
                <div class="form-group margin-right">
                    <select name="is_vip" id="is_vip" class="form-control">
                        <option value="">是否会员</option>
-                        <option value="1" {if condition="input('is_vip')==1" }selected{
+                        <option value="1" <?php echo input('is_vip')=='1'?"selected":""; ?> >会员</option>
-                        /if}>会员</option>
+                        <option value="0" <?php echo input('is_vip')==='0'?"selected":""; ?> >非会员</option>
-                        <option value="0" {if condition="input('is_vip')==='0'" }selected{
-                        /if}>非会员</option>
                    </select>
                </div>
                <div class="form-group margin-right">
@@ -156,13 +154,19 @@
            // $is_vip = input('get.is_vip');
            // $start_time = input('get.start_time');
            // $end_time = input('get.end_time');
            var nickname = $("#nickname").val();
+            var phone = $("#phone").val();
            var is_vip = $("#is_vip").val();
            var start_time = $("#start_time").val();
            var end_time = $("#end_time").val();
-            console.log("{:url('admin/user/userOutput')}" + '?nickname=' + nickname + '&is_vip=' + is_vip + '&start_time=' + start_time + '&end_time=' + end_time);
+            // console.log("{:url('admin/user/userOutput')}" + '?nickname=' + nickname + '&is_vip=' + is_vip + '&start_time=' + start_time + '&end_time=' + end_time);
-            window.location.href = "{:url('admin/user/userOutput')}" + '?nickname=' + nickname + '&is_vip=' + is_vip + '&start_time=' + start_time + '&end_time=' + end_time;
+            showDialog("提示", "请进行搜索筛选后导出部分数据，由于全部数据量过大超出内存限制，暂不支持导出全部数据。", function () {
-            $(this).removeAttr('disabled');
+                // ajax post 方法
+                window.location.href = "{:url('admin/user/userOutput')}" + '?nickname=' + nickname + '&is_vip=' + is_vip + '&start_time=' + start_time + '&end_time=' + end_time + '&phone=' + phone;
+                $(this).removeAttr('disabled');
+            });
        });
    });