From 0adc7b8f73cdb45992f868bf1e3a97a070e43a9e Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 09 Apr 2024 22:16:47 +0800 Subject: [PATCH] fix --- src/main/resources/templates/febs/views/modules/mallMember/memberBenefitsList.html | 72 +++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/main/resources/templates/febs/views/modules/mallMember/memberBenefitsList.html b/src/main/resources/templates/febs/views/modules/mallMember/memberBenefitsList.html index 41b5ab6..f28141f 100644 --- a/src/main/resources/templates/febs/views/modules/mallMember/memberBenefitsList.html +++ b/src/main/resources/templates/febs/views/modules/mallMember/memberBenefitsList.html @@ -31,28 +31,39 @@ </div> <div class="layui-inline"> - <label class="layui-form-label layui-form-label-sm">会员生日</label> + <label class="layui-form-label layui-form-label-sm">是否领取</label> <div class="layui-input-inline"> - <input type="text" name="birthdayStart" id="febs-member-benefits-list-birthday-start" lay-verify="date" - placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input"> - </div> - <div class="layui-input-inline"> - <input type="text" name="birthdayEnd" id="febs-member-benefits-list-birthday-end" lay-verify="date" - placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input"> + <select name="hasReceive"> + <option value="">请选择</option> + <option value="1">已领取</option> + <option value="2">未领取</option> + </select> </div> </div> <div class="layui-inline"> - <label class="layui-form-label layui-form-label-sm">领取时间</label> + <label class="layui-form-label layui-form-label-sm">会员生日</label> <div class="layui-input-inline"> - <input type="text" name="receiveStartTime" id="febs-member-benefits-list-start" lay-verify="date" + <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 class="layui-input-inline"> - <input type="text" name="receiveEndTime" id="febs-member-benefits-list-end" lay-verify="date" - placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input"> - </div> +<!-- <div class="layui-input-inline">--> +<!-- <input type="text" name="birthdayEnd" id="febs-member-benefits-list-birthday-end" lay-verify="date"--> +<!-- placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">--> +<!-- </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="receiveStartTime" id="febs-member-benefits-list-start" lay-verify="date"--> +<!-- placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">--> +<!-- </div>--> +<!-- <div class="layui-input-inline">--> +<!-- <input type="text" name="receiveEndTime" id="febs-member-benefits-list-end" lay-verify="date"--> +<!-- placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">--> +<!-- </div>--> +<!-- </div>--> </div> </div> @@ -90,17 +101,8 @@ //日期范围 laydate.render({ - elem: '#febs-member-benefits-list-start' - }); - laydate.render({ - elem: '#febs-member-benefits-list-end' - }); - laydate.render({ elem: '#febs-member-benefits-list-birthday-start' - }); - - laydate.render({ - elem: '#febs-member-benefits-list-birthday-end' + ,value: new Date() }); form.render(); @@ -131,6 +133,12 @@ $reset.on('click', function () { $searchForm[0].reset(); sortObject.type = 'null'; + + + laydate.render({ + elem: '#febs-member-benefits-list-birthday-start' + ,value: new Date() + }); tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject}); }); @@ -144,14 +152,14 @@ {field: 'memberName', title: '会员名称', minWidth: 100,align:'left'}, {field: 'memberPhone', title: '手机号码', minWidth: 150,align:'left'}, {field: 'benefitsName', title: '权益', minWidth: 150,align:'left'}, - {field: 'benefitsType', title: '权益类型', + {field: 'hasReceive', title: '是否领取', templet: function (d) { - if (d.benefitsType === 1) { - return '<span>会员日</span>' - } else if (d.benefitsType === 2) { - return '<span>生日</span>' + if (d.hasReceive === 1) { + return '<span>已领取</span>' + } else if (d.hasReceive === 2) { + return '<span>未领取</span>' } else { - return '<span>其他</span>' + return '<span>-</span>' } }, minWidth: 80,align:'center'}, {field: 'receiveName', title: '领取名称', minWidth: 150,align:'left'}, @@ -193,13 +201,11 @@ // 获取查询参数 function getQueryParams() { return { - receiveStartTime: $searchForm.find('input[name="receiveStartTime"]').val().trim(), - receiveEndTime: $searchForm.find('input[name="receiveEndTime"]').val().trim(), - birthdayStart: $searchForm.find('input[name="birthdayStart"]').val().trim(), - birthdayEnd: $searchForm.find('input[name="birthdayEnd"]').val().trim(), + birthday: $searchForm.find('input[name="birthday"]').val().trim(), // memberName: $searchForm.find('input[name="memberName"]').val().trim(), memberPhone: $searchForm.find('input[name="memberPhone"]').val().trim(), status: $searchForm.find("select[name='status']").val(), + hasReceive: $searchForm.find("select[name='hasReceive']").val(), }; } -- Gitblit v1.9.1