From 12b8ccc96996918b4e910791f1a3ff10c3d59aa2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 23 Jan 2025 12:00:11 +0800
Subject: [PATCH] feat(mall): 商品统计增加规格信息
---
src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html b/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
index ed1b52f..42b97e0 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-agent-apply-list" lay-title="代理申请列表">
+<div class="layui-fluid layui-anim febs-anim" id="febs-agent-apply-list" lay-title="合伙人申请列表">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
@@ -8,16 +8,19 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">微信昵称</label>
<div class="layui-input-inline">
<input type="text" placeholder="微信昵称" name="memberName" 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" placeholder="姓名" name="name" 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" placeholder="电话" name="phone" autocomplete="off" class="layui-input">
</div>
@@ -33,19 +36,6 @@
</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>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -59,6 +49,12 @@
</div>
</form>
<table lay-filter="agentApplyTable" lay-data="{id: 'agentApplyTable'}"></table>
+ <style type="text/css">
+ ::-webkit-scrollbar {
+ height: 20px !important;
+ background-color: #f4f4f4;
+ }
+ </style>
</div>
</div>
</div>
@@ -102,8 +98,19 @@
layEvent = obj.event;
if (layEvent === 'agree') {
- febs.modal.confirm('通过', '通过用户的代理申请？', function () {
- agree(data.id);
+ // febs.modal.confirm('通过', '通过用户的代理申请？', function () {
+ // agree(data.id);
+ // });
+
+ febs.modal.open('代理申请审核', 'modules/mallMember/agentVerify/' + data.id, {
+ btn: ['确认','取消'],
+ yes: function (index, layero) {
+ $('#agent-verify').find('#submit').trigger('click');
+ $query.click();
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
});
}
if (layEvent === 'disagree') {
@@ -145,15 +152,9 @@
url: ctx + 'admin/mallMember/getAgentApplyList',
defaultToolbar:[],
cols: [[
- {field: 'memberName', title: '微信昵称', minWidth: 150,align:'left'},
- {field: 'name', title: '姓名', minWidth: 100,align:'left'},
- {field: 'phone', title: '电话', minWidth: 100,align:'left'},
- {field: 'province', title: '省', minWidth: 100,align:'left'},
- {field: 'city', title: '市', minWidth: 100,align:'left'},
- {field: 'area', title: '区、县', minWidth: 100,align:'left'},
- {field: 'storeAddress', title: '详细地址', minWidth: 100,align:'left'},
- {field: 'storeName', title: '店铺名称', minWidth: 100,align:'left'},
- {field: 'state', title: '申请状态',
+ {field:'memberName', title:'微信昵称', width:100, rowspan: 2,align: 'center'}
+ ,{align: 'center', title: '基本信息', colspan: 9}
+ ,{field: 'state', title: '申请状态',
templet: function (d) {
if (d.state === 1) {
return '<span style="color:green;">申请中</span>'
@@ -164,18 +165,42 @@
}else{
return ''
}
- }, minWidth: 100,align:'center'},
- {field: 'createdTime', title: '申请时间', minWidth: 180,align:'center'},
- {title: '操作',
+ }, minWidth: 100,rowspan: 2,align:'center'},
+ ,{field:'createdTime', title:'申请时间', width:100,rowspan: 2,align: 'center'}
+ ,{title: '操作',
templet: function (d) {
- if(d.state === 1 ){
+ if(d.state === 1){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
}else{
return ''
}
- },minWidth: 200,align:'center', fixed:"right"
+ },width:200,rowspan: 2,align:'center', fixed:"right"
}
+ ],[
+ // {field: 'memberName', title: '微信昵称', minWidth: 150,align:'left'},
+ {field: 'name', title: '姓名', minWidth: 100,align:'left'},
+ {field: 'phone', title: '电话', minWidth: 100,align:'left'},
+ {field: 'amount', title: '充值金额', minWidth: 100,align:'left'},
+ {field: 'agentLevelName', title: '等级', minWidth: 100,align:'left'},
+ {field: 'province', title: '省', minWidth: 100,align:'left'},
+ {field: 'city', title: '市', minWidth: 100,align:'left'},
+ {field: 'area', title: '区、县', minWidth: 100,align:'left'},
+ {field: 'storeAddress', title: '详细地址', minWidth: 100,align:'left'},
+ {field: 'storeName', title: '店铺名称', minWidth: 100,align:'left'},
+ // {field: 'state', title: '申请状态',
+ // templet: function (d) {
+ // if (d.state === 1) {
+ // return '<span style="color:green;">申请中</span>'
+ // }else if (d.state === 2) {
+ // return '<span style="color:blue;">通过</span>'
+ // }else if (d.state === 3) {
+ // return '<span style="color:red;">拒绝</span>'
+ // }else{
+ // return ''
+ // }
+ // }, minWidth: 100,align:'center'},
+ // {field: 'createdTime', title: '申请时间', minWidth: 180,align:'center'},
]]
});
}
--
Gitblit v1.9.1