From e94e6721a4aeb8c21e97878239ec3429fc76d1ad Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 May 2023 14:23:45 +0800
Subject: [PATCH] 创建订单之前的判断修改
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 144 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 137 insertions(+), 7 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 5334e89..4b46ec5 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -8,6 +8,12 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">登录账户：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="登录账户" name="accountLogin" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
<input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
@@ -16,7 +22,7 @@
<div class="layui-inline">
<label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="账号/邀请码" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="手机号码/邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -89,6 +95,34 @@
<input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchDirector">
{{# } }}
</script>
+<script type="text/html" id="switchCreate">
+ {{# if(d.creater === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchCreate">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchCreate">
+ {{# } }}
+</script>
+<script type="text/html" id="switchPartner">
+ {{# if(d.partner === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchPartner">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchPartner">
+ {{# } }}
+</script>
+<script type="text/html" id="switchInsideWith">
+ {{# if(d.insideWith === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchInsideWith">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchInsideWith">
+ {{# } }}
+</script>
+<script type="text/html" id="switchOutsideWith">
+ {{# if(d.outsideWith === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchOutsideWith">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchOutsideWith">
+ {{# } }}
+</script>
<style>
.layui-form-onswitch {
background-color: #5FB878 !important;
@@ -96,6 +130,7 @@
</style>
<script type="text/html" id="tableMemberBar">
<div class="layui-btn-container">
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="exportMember">导出会员信息</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="addMember:update" lay-event="registMember">添加会员</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="balance">拨付余额</button>
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="score">拨付赠送积分</button>-->
@@ -103,12 +138,13 @@
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPwd">重置登录密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPayPwd">重置支付密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="agentLevelSet:update" lay-event="agentLevel">设置代理等级</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="voucherUpdate:update" lay-event="voucherUpdate">拨付绿色凭证</button>
</div>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'upload','febs'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
@@ -177,6 +213,30 @@
}
});
+ function outsideWithYes(id) {
+ febs.get(ctx + 'admin/mallMember/outsideWithYes/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+ function outsideWithNo(id) {
+ febs.get(ctx + 'admin/mallMember/outsideWithNo/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+ function insideWithYes(id) {
+ febs.get(ctx + 'admin/mallMember/insideWithYes/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+ function insideWithNo(id) {
+ febs.get(ctx + 'admin/mallMember/insideWithNo/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
function closeAccount(id) {
febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
febs.alert.success('禁用成功');
@@ -230,21 +290,28 @@
id: 'userTable',
url: ctx + 'admin/mallMember/getMallMemberList',
toolbar:"#tableMemberBar",
- defaultToolbar:[],
+ // defaultToolbar:[],
totalRow: true ,// 开启合计行
cols: [[
{type: 'checkbox'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left',hide:toolbarMallmember},
+ {field: 'accountLogin', title: '登录账户', minWidth: 150,align:'left'},
+ {field: 'phone', title: '手机号码', minWidth: 150,align:'left',hide:toolbarMallmember},
{field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计：'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
{field: 'prizeScore', title: '现金积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'},
{field: 'star', title: '贡献点', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.star) }}'},
{field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.totalScore) }}'},
+ {field: 'voucherCnt', title: '绿色凭证', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherCnt) }}'},
+ {field: 'voucherAmount', title: '凭证现金', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherAmount) }}'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
- {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left'},
- {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' },
+ {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left',hide:toolbarMallmember},
+ {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+ {field: 'creater', title: '联创', templet:'#switchCreate', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+ {field: 'partner', title: '合伙人', templet:'#switchPartner', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+ {field: 'insideWith', title: '是否内转', templet:'#switchInsideWith', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+ {field: 'outsideWith', title: '是否提现', templet:'#switchOutsideWith', minWidth: 120,align:'left' ,hide:toolbarMallmember},
{field: 'accountType', title: '账号类型',
templet: function (d) {
if (d.accountType === 2) {
@@ -255,7 +322,7 @@
return ''
}
}, minWidth: 100,align:'left'},
- {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left'},
+ {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left',hide:toolbarMallmember},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'left'},
// {title: '操作',
// templet: function (d) {
@@ -274,7 +341,12 @@
var data = obj.data,
layEvent = obj.event;
+ if (layEvent === 'exportMember') {
+ window.location.href = ctx + "admin/mallMember/exportMember";
+ }
+
if (layEvent === 'registMember') {
+
febs.modal.open( '添加会员', 'modules/mallMember/addMember', {
btn: ['提交', '取消'],
yes: function (index, layero) {
@@ -338,6 +410,19 @@
systemPay("修改余额", checkData[0].id, 1);
}
+ if (layEvent === 'voucherUpdate') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
+ if (checkData.length > 1) {
+ febs.alert.warn('请选择一个用户');
+ return;
+ }
+ voucherUpdate("拨付绿色凭证", checkData[0].id, 1);
+ }
+
if (layEvent === 'score') {
var checkData = table.checkStatus('userTable').data;
if (checkData.length <= 0) {
@@ -386,6 +471,18 @@
}
});
+ function voucherUpdate(text, id, type) {
+ febs.modal.open(text, 'modules/mallMember/voucherUpdate/' + type +'/'+ id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#voucher-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
function systemPay(text, id, type) {
febs.modal.open('text', 'modules/mallMember/mallSystemPay/' + type +'/'+ id, {
btn: ['提交', '取消'],
@@ -403,10 +500,27 @@
return {
name: $searchForm.find('input[name="name"]').val().trim(),
account: $searchForm.find('input[name="account"]').val().trim(),
+ accountLogin: $searchForm.find('input[name="accountLogin"]').val().trim(),
accountStatus: $searchForm.find("select[name='accountStatus']").val(),
level: $searchForm.find("select[name='level']").val(),
};
}
+
+ form.on('switch(switchInsideWith)', function (data) {
+ if (data.elem.checked) {
+ insideWithYes(data.value);
+ } else {
+ insideWithNo(data.value);
+ }
+ })
+
+ form.on('switch(switchOutsideWith)', function (data) {
+ if (data.elem.checked) {
+ outsideWithYes(data.value);
+ } else {
+ outsideWithNo(data.value);
+ }
+ })
form.on('switch(switchStatus)', function (data) {
if (data.elem.checked) {
@@ -431,5 +545,21 @@
changeIdentityNo(1, data.value);
}
})
+
+ form.on('switch(switchCreate)', function (data) {
+ if (data.elem.checked) {
+ changeIdentityYes(3, data.value);
+ } else {
+ changeIdentityNo(3, data.value);
+ }
+ })
+
+ form.on('switch(switchPartner)', function (data) {
+ if (data.elem.checked) {
+ changeIdentityYes(4, data.value);
+ } else {
+ changeIdentityNo(4, data.value);
+ }
+ })
})
</script>
\ No newline at end of file
--
Gitblit v1.9.1