From 5c5589c0d343437275563a1a84f3a415a4ea16d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 16:50:40 +0800
Subject: [PATCH] fix
---
src/main/resources/templates/febs/views/modules/system/profitSetting.html | 5 -----
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 1 -
src/test/java/cc/mrbird/febs/ProfitTest.java | 2 +-
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 2 +-
4 files changed, 2 insertions(+), 8 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 50e976b..2dad877 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -227,11 +227,11 @@
{type: 'checkbox'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
{field: 'name', 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'},
{field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
{field: 'commission', title: '佣金', minWidth: 100,align:'left'},
- {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
{field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index 736ba65..17c0417 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -118,7 +118,6 @@
cols: [[
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
{field: 'type', title: '流水类型',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/modules/system/profitSetting.html b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
index 1053413..34c54c2 100644
--- a/src/main/resources/templates/febs/views/modules/system/profitSetting.html
+++ b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
@@ -52,11 +52,6 @@
margin-bottom: 20px !important;
}
</style>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-danger layui-btn-sm" type="button" lay-event="delSku">删除</button>
- </div>
-</script>
<script type="text/html" id="bonusSystem">
{{# layui.each(d, function(index, item){ }}
<div class="layui-form-item">
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index 603f651..49a05e8 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -35,7 +35,7 @@
@Test
public void dynamicProfit() {
- memberProfitService.dynamicProfit(16L);
+ memberProfitService.dynamicProfit(21L);
}
@Test
public void agentProfit() {
--
Gitblit v1.9.1