From 2b279f855cc6866e108a9dd908a264582a698252 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 23 Apr 2023 21:33:25 +0800
Subject: [PATCH] fxi
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 2 +-
src/main/resources/templates/febs/views/modules/mallMember/addMember.html | 7 +++++++
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 1 +
src/main/resources/templates/febs/views/modules/goods/goodsList.html | 6 +++---
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index 5d46eb0..af2af3f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -404,6 +404,7 @@
registerDto.setPassword("a123456");
registerDto.setInviteId(member.getInviteId());
registerDto.setName(member.getName());
+ registerDto.setSex(member.getSex());
apiMallMemberService.register(registerDto);
return new FebsResponse().success();
}
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 0d6e177..4af0ce8 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -104,7 +104,7 @@
</div>
</div>
- <div class="layui-form-item tc-set">
+ <div class="layui-form-item febs-hide tc-set">
<label class="layui-form-label febs-form-item-require">商品类型</label>
<div class="layui-input-block">
<select name="goodsLevel" class="goods-level" lay-filter="goods-level-select">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
index 4b7e0ca..74ae8f3 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -51,7 +51,7 @@
<span shiro:lacksPermission="user:view,user:update,user:delete">
<span class="layui-badge-dot febs-bg-orange"></span> 无权限
</span>
- <a lay-event="edit" shiro:hasPermission="user:update"><i
+ <a lay-event="edit" shiro:hasPermission="goodsUpdateNew:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
<script type="text/html" id="upOrDownSwitch">
@@ -248,8 +248,8 @@
if (d.isSale === 1) {
return '';
}else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="user:update">编辑</button>'
- + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="user:update">删除</button>'
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="goodsUpdateNew:update">编辑</button>'
+ + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="goodsUpdateNew:update">删除</button>'
}
},minWidth: 160,align:'center'}
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/addMember.html b/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
index 55344f8..06e1b9e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
@@ -40,6 +40,13 @@
<input type="text" name="inviteId" lay-verify="required" autocomplete="off" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">性别：</label>
+ <div class="layui-input-block">
+ <input type="radio" name="sex" value="1" title="男" checked />
+ <input type="radio" name="sex" value="2" title="女" />
+ </div>
+ </div>
<div class="layui-form-item febs-hide">
<button class="layui-btn" lay-submit="" lay-filter="member-add-form-submit" id="submit"></button>
</div>
--
Gitblit v1.9.1