From 98a5c4f73f9586428236957fe2619e4f4943d892 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 23 Dec 2024 13:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/controller/PointLog.php               | 20 ++++++++
 .../src/model/PointsMallUserPointLog.php      |  6 +++
 .../src/view/point/index_search.html          |  7 ---
 .../src/view/point_log/index.html             | 51 +++++++++++++++++++
 .../src/view/point_log/index_search.html      | 10 ++++
 5 files changed, 87 insertions(+), 7 deletions(-)
 create mode 100644 plugs/think-plugs-points-mall/src/controller/PointLog.php
 create mode 100644 plugs/think-plugs-points-mall/src/view/point_log/index.html
 create mode 100644 plugs/think-plugs-points-mall/src/view/point_log/index_search.html

diff --git a/plugs/think-plugs-points-mall/src/controller/PointLog.php b/plugs/think-plugs-points-mall/src/controller/PointLog.php
new file mode 100644
index 0000000..396495e
--- /dev/null
+++ b/plugs/think-plugs-points-mall/src/controller/PointLog.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace plugin\points_mall\controller;
+
+use plugin\points_mall\model\PointsMallUserPointLog;
+use think\admin\Controller;
+use think\admin\helper\QueryHelper;
+
+class PointLog extends Controller
+{
+    public function index()
+    {
+        $this->title = '积分记录';
+        PointsMallUserPointLog::mQuery()->layTable(function () {
+        }, static function (QueryHelper $query) {
+            $query->with('user');
+            $query->dateBetween('create_at');
+        });
+    }
+}
\ No newline at end of file
diff --git a/plugs/think-plugs-points-mall/src/model/PointsMallUserPointLog.php b/plugs/think-plugs-points-mall/src/model/PointsMallUserPointLog.php
index b61b271..765502e 100644
--- a/plugs/think-plugs-points-mall/src/model/PointsMallUserPointLog.php
+++ b/plugs/think-plugs-points-mall/src/model/PointsMallUserPointLog.php
@@ -2,9 +2,15 @@
 
 namespace plugin\points_mall\model;
 
+use plugin\account\model\PluginAccountBind;
 use think\admin\Model;
 
 class PointsMallUserPointLog extends Model
 {
     protected $pk = 'uid';
+
+    public function user()
+    {
+        return $this->belongsTo(PluginAccountBind::class, 'uid');
+    }
 }
\ No newline at end of file
diff --git a/plugs/think-plugs-points-mall/src/view/point/index_search.html b/plugs/think-plugs-points-mall/src/view/point/index_search.html
index bc5a08c..28b4b6c 100644
--- a/plugs/think-plugs-points-mall/src/view/point/index_search.html
+++ b/plugs/think-plugs-points-mall/src/view/point/index_search.html
@@ -1,13 +1,6 @@
 <fieldset>
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">积分范围</label>
-            <div class="layui-input-inline">
-                <input name="point_min" value="{:input('get.point_min')}" placeholder="最小积分" class="layui-input">
-                <input name="point_max" value="{:input('get.point_max')}" placeholder="最大积分" class="layui-input">
-            </div>
-        </div>
 
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary" lay-submit lay-filter="searchData"><i class="layui-icon">&#xe615;</i> 搜 索</button>
diff --git a/plugs/think-plugs-points-mall/src/view/point_log/index.html b/plugs/think-plugs-points-mall/src/view/point_log/index.html
new file mode 100644
index 0000000..9fc0eb5
--- /dev/null
+++ b/plugs/think-plugs-points-mall/src/view/point_log/index.html
@@ -0,0 +1,51 @@
+{extend name="table"}
+
+{block name="button"}
+{/block}
+
+{block name="content"}
+<div class="layui-tab">
+    <div class="layui-row">
+        <div class="layui-col">
+            <div class="point_list think-bg-white">
+                {include file='point_log/index_search'}
+                <table class="layui-hide" data-url="{$request->url()}" data-target-search="form.form-search" id="Table" lay-filter="Table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="toolbar">
+
+</script>
+{/block}
+
+{block name='style'}
+<style>
+</style>
+{/block}
+
+{block name='script'}
+<script>
+    $(function () {
+        $('#Table').layTable({
+            height: 'full-250',
+            toolbar: true,
+            sort: {field: 'create_at', type: 'desc'},
+            title: '用户积分',
+            cols: [[
+                {field: 'uid', title: '用户ID', width: 100, sort: true},
+                {field:'nickname', title:'用户昵称', width:120, templet:function(item){
+                    if (item.user) {
+                        return item.user.nickname || item.user.extra.nickName;
+                    } else {
+                        return '未知';
+                    }
+                    }},
+                {field:'point', title:'积分变化', width:120, sort: true},
+                {field:'reason', title:'备注', minWidth:120},
+                {field:'create_at', title:'发生时间', width:160, sort: true},
+            ]]
+        })
+    })
+</script>
+{/block}
diff --git a/plugs/think-plugs-points-mall/src/view/point_log/index_search.html b/plugs/think-plugs-points-mall/src/view/point_log/index_search.html
new file mode 100644
index 0000000..28b4b6c
--- /dev/null
+++ b/plugs/think-plugs-points-mall/src/view/point_log/index_search.html
@@ -0,0 +1,10 @@
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary" lay-submit lay-filter="searchData"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+
+</fieldset>