From 0a12bc6ec7148ae33596e9de142027ec379c7835 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Apr 2024 10:11:50 +0800
Subject: [PATCH] Merge branch 'blnka' into blnka-vip
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index f2b2154..2c07876 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -29,19 +29,13 @@
</select>
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <label class="layui-form-label layui-form-label-sm">会员类型</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="level">-->
-<!-- <option value="">请选择</option>-->
-<!-- <option value="FIRST_LEVEL">普通会员</option>-->
-<!-- <option value="SECOND_LEVEL">一星</option>-->
-<!-- <option value="THIRD_LEVEL">二星</option>-->
-<!-- <option value="FOUR_LEVEL">三星</option>-->
-<!-- <option value="FIFTH_LEVEL">四星</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">会员生日</label>
+ <div class="layui-input-inline">
+ <input type="text" name="birthday" id="febs-member-benefits-list-birthday-start" lay-verify="date"
+ placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -118,7 +112,7 @@
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs', 'laydate'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
@@ -128,9 +122,14 @@
$reset = $view.find('#reset'),
$searchForm = $view.find('form'),
sortObject = {field: 'phone', type: null},
+ laydate = layui.laydate,
tableIns;
form.render();
+
+ laydate.render({
+ elem: '#febs-member-benefits-list-birthday-start'
+ });
// 表格初始化
initTable();
@@ -286,6 +285,7 @@
{type: 'checkbox'},
{field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
{field: 'name', title: '用户昵称', minWidth: 100,align:'left'},
+ {field: 'birthday', title: '会员生日', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left'},
// {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
@@ -477,6 +477,7 @@
name: $searchForm.find('input[name="name"]').val().trim(),
account: $searchForm.find('input[name="account"]').val().trim(),
level: $searchForm.find("select[name='level']").val(),
+ birthday: $searchForm.find("input[name='birthday']").val(),
// level: $searchForm.find("select[name='level']").val(),
};
}
--
Gitblit v1.9.1