提交代码

README.md

@@ -63,5 +63,6 @@ putenv
 
 composer require phpoffice/phpspreadsheet
 composer require yzalis/identicon
+composer require topthink/think-image
 php think UserStatisticsHour
 

app/admin/controller/User.php

@@ -37,7 +37,6 @@ class User extends Base
     public function list()
     {
         $param = $this->request->param();
-
         // 构建查询条件
         $where = [];
         if (!empty($param['user_id'])) {
@@ -56,6 +55,9 @@ class User extends Base
             $times = explode(' - ', $param['addtime']);
             $where[] = ['addtime', 'between', [strtotime($times[0]), strtotime($times[1])]];
         }
+        if (!empty($param['pid'])) {
+            $where[] = ['pid', '=', intval($param['pid']) - 1260];
+        }
         $field = '*';
         $order = 'id desc';
         $data = UserModel::getList($where, $field, $order, $this->page);

app/admin/view/User/index.html

@@ -12,6 +12,13 @@
                                 class="layui-input">
                         </div>
                     </div>
+
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input type="text" name="pid" placeholder="请输入推荐人UID" autocomplete="off"
+                                class="layui-input">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
                             <input type="text" name="mobile" placeholder="请输入手机号" autocomplete="off"
@@ -154,17 +161,11 @@
     <script type="text/html" id="combinedTpl">
         <div class="combined-values">
             <div>盒柜价值：{{(Number(d.user_hegui) * 100).toFixed(2)}}</div>
-            
             <div>总消费：{{Number(d.user_all_total).toFixed(2)}}</div>
-            
             <div>微信消费：{{Number(d.user_weixin_total).toFixed(2)}}</div>
-            
             <div>余额消费：{{Number(d.user_use_money).toFixed(2)}}</div>
-            
             <div>吧唧币消费：{{Number(d.user_use_integral).toFixed(2)}}</div>
-            
             <div>回收货币：{{Number(d.user_goodslist_money).toFixed(2)}}</div>
-        
             <div>发货价值：{{Number(d.user_goodslist_money2).toFixed(2)}}</div>
         </div>
     </script>
@@ -302,7 +303,7 @@
                         , nickname = $('input[name="nickname"]').val()
                         , last_login_ip = $('input[name="last_login_ip"]').val()
                         , addtime = $('input[name="addtime"]').val();
-
+                    var pid = $('input[name="pid"]').val();
                     table.reload('LAY-user-table', {
                         where: {
                             user_id: user_id
@@ -310,6 +311,7 @@
                             , nickname: nickname
                             , last_login_ip: last_login_ip
                             , addtime: addtime
+                            , pid: pid
                         }
                         , page: {
                             curr: 1
@@ -489,11 +491,10 @@
             font-weight: bold;
         }
 
-        .layui-table td,
+        .layui-table td {
-        .layui-table th {
             padding: 10px 15px;
             /* 调整单元格内边距 */
-            height: 80px !important;
+            height: 150px !important;
         }
 
         /* 充值按钮样式 */
@@ -513,7 +514,7 @@
         }
 
         .layui-table-cell {
-            height: 100% !important;
+            height: 150px !important;
             line-height: 28px;
             padding: 0 15px;
             position: relative;
@@ -543,9 +544,29 @@
             padding: 0 8px;
         }
 
+        .combined-values {
+            overflow: auto;
+            height: 100%;
+        }
+
         .combined-values div {
             margin: 0;
-            padding: 2px 0;
+            padding: 0px 0;
+
+        }
+
+
+
+        .layui-table thead th {
+            height: 30px !important;
+        }
+
+        .layui-table thead th div {
+            height: 30px !important;
+        }
+
+        .layui-table-col-special {
+            height: 30px !important;
         }
     </style>
 </body>

composer.json

@@ -29,7 +29,8 @@
         "endroid/qr-code": "^4.6",
         "phpoffice/phpspreadsheet": "^1.29",
         "qcloud/cos-sdk-v5": "^2.6",
-        "yzalis/identicon": "^2.0"
+        "yzalis/identicon": "^2.0",
+        "topthink/think-image": "^1.0"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "50099350288722431f222e8410e3c5b4",
+    "content-hash": "6fc796da97ffd24ae219cc1be9728619",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -2029,6 +2029,50 @@
             "description": "The ThinkPHP6 Helper Package",
             "time": "2024-11-21T01:47:51+00:00"
         },
+        {
+            "name": "topthink/think-image",
+            "version": "v1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/top-think/think-image.git",
+                "reference": "d1d748cbb2fe2f29fca6138cf96cb8b5113892f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/top-think/think-image/zipball/d1d748cbb2fe2f29fca6138cf96cb8b5113892f1",
+                "reference": "d1d748cbb2fe2f29fca6138cf96cb8b5113892f1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-gd": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.8.*",
+                "topthink/framework": "^5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "think\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "yunwuxin",
+                    "email": "448901948@qq.com"
+                }
+            ],
+            "description": "The ThinkPHP5 Image Package",
+            "support": {
+                "issues": "https://github.com/top-think/think-image/issues",
+                "source": "https://github.com/top-think/think-image/tree/v1.0.8"
+            },
+            "time": "2024-08-07T10:06:35+00:00"
+        },
         {
             "name": "topthink/think-multi-app",
             "version": "v1.1.1",