From 4a00013d105220947d7d2b57d89300d44fdedcd3 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 20 Mar 2021 10:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/shopindusrty/IShopIndusrtyDao.java | 22 +++++++++---------- .../pojo/dtos/shopmember/ShopMemberDTO.java | 8 +++---- .../pojo/vos/shopmember/ShopMemberVO.java | 12 +++++----- .../resources/static/route/shop/list.html | 19 ++++++++++++++-- 4 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/main/java/cn/com/tenlion/dao/shopindusrty/IShopIndusrtyDao.java b/src/main/java/cn/com/tenlion/dao/shopindusrty/IShopIndusrtyDao.java index 2968833..1bef71e 100644 --- a/src/main/java/cn/com/tenlion/dao/shopindusrty/IShopIndusrtyDao.java +++ b/src/main/java/cn/com/tenlion/dao/shopindusrty/IShopIndusrtyDao.java @@ -23,7 +23,7 @@ import java.util.Map; public interface IShopIndusrtyDao { /** - * 新增 + * 鏂板 * * @param params * @throws SaveException @@ -31,7 +31,7 @@ public interface IShopIndusrtyDao { void save(Map params) throws SaveException; /** - * 删除 + * 鍒犻櫎 * * @param params * @throws RemoveException @@ -39,7 +39,7 @@ public interface IShopIndusrtyDao { void remove(Map params) throws RemoveException; /** - * 删除（物理） + * 鍒犻櫎锛堢墿鐞嗭級 * * @param params * @throws RemoveException @@ -47,7 +47,7 @@ public interface IShopIndusrtyDao { void delete(Map params) throws RemoveException; /** - * 修改 + * 淇敼 * * @param params * @throws UpdateException @@ -55,7 +55,7 @@ public interface IShopIndusrtyDao { void update(Map params) throws UpdateException; /** - * 详情 + * 璇︽儏 * * @param params * @return @@ -64,7 +64,7 @@ public interface IShopIndusrtyDao { ShopIndusrtyDTO get(Map params) throws SearchException; /** - * 详情 + * 璇︽儏 * * @param params * @return @@ -73,7 +73,7 @@ public interface IShopIndusrtyDao { ShopIndusrtyBO getBO(Map params) throws SearchException; /** - * 详情 + * 璇︽儏 * * @param params * @return @@ -82,7 +82,7 @@ public interface IShopIndusrtyDao { ShopIndusrtyPO getPO(Map params) throws SearchException; /** - * 列表 + * 鍒楄〃 * * @param params * @return @@ -91,7 +91,7 @@ public interface IShopIndusrtyDao { List list(Map params) throws SearchException; /** - * 列表 + * 鍒楄〃 * * @param params * @return @@ -100,7 +100,7 @@ public interface IShopIndusrtyDao { List listBO(Map params) throws SearchException; /** - * 列表 + * 鍒楄〃 * * @param params * @return @@ -109,7 +109,7 @@ public interface IShopIndusrtyDao { List listPO(Map params) throws SearchException; /** - * 统计 + * 缁熻 * * @param params * @return diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/shopmember/ShopMemberDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/shopmember/ShopMemberDTO.java index cdd59c1..a5c6758 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/shopmember/ShopMemberDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/shopmember/ShopMemberDTO.java @@ -14,13 +14,13 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel public class ShopMemberDTO { - @ApiModelProperty(name = "shopId", value = "店铺ID") + @ApiModelProperty(name = "shopId", value = "鍟嗛摵ID") private String shopId; - @ApiModelProperty(name = "userId", value = "用户ID") + @ApiModelProperty(name = "userId", value = "鐢ㄦ埛ID") private String userId; - @ApiModelProperty(name = "memberLevel", value = "会员等级") + @ApiModelProperty(name = "memberLevel", value = "浼氬憳绛夌骇") private Integer memberLevel; - @ApiModelProperty(name = "gmtCreate", value = "创建时间") + @ApiModelProperty(name = "gmtCreate", value = "鍒涘缓鏃堕棿") private String gmtCreate; public String getShopId() { diff --git a/src/main/java/cn/com/tenlion/pojo/vos/shopmember/ShopMemberVO.java b/src/main/java/cn/com/tenlion/pojo/vos/shopmember/ShopMemberVO.java index 57740cc..9df914a 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/shopmember/ShopMemberVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/shopmember/ShopMemberVO.java @@ -16,15 +16,15 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel public class ShopMemberVO { - @ApiModelProperty(name = "shopId", value = "店铺ID") + @ApiModelProperty(name = "shopId", value = "鍟嗛摵ID") private String shopId; - @ApiModelProperty(name = "userId", value = "用户ID") + @ApiModelProperty(name = "userId", value = "鐢ㄦ埛ID") private String userId; - @ApiModelProperty(name = "memberLevel", value = "会员等级") - @CheckNumberAnnotation(name = "会员等级") + @ApiModelProperty(name = "memberLevel", value = "浼氬憳绛夌骇") + @CheckNumberAnnotation(name = "锟斤拷员锟饺硷拷") private Integer memberLevel; - @ApiModelProperty(name = "gmtCreate", value = "创建时间") - @CheckEmptyAnnotation(name = "创建时间", verifyType = "datetime") + @ApiModelProperty(name = "gmtCreate", value = "鍒涘缓鏃堕棿") + @CheckEmptyAnnotation(name = "锟斤拷锟斤拷时锟斤拷", verifyType = "datetime") private String gmtCreate; public String getShopId() { diff --git a/src/main/resources/static/route/shop/list.html b/src/main/resources/static/route/shop/list.html index 035f7b7..1026f17 100644 --- a/src/main/resources/static/route/shop/list.html +++ b/src/main/resources/static/route/shop/list.html @@ -318,9 +318,24 @@ }); table.on('tool(dataTable)', function(obj){ - var checkStatus = table.checkStatus(obj.config.id); + //var checkStatus = table.checkStatus(obj.config.id); var data = obj.data; - console.log(data); + var event = obj.event; + + if(event === 'show') { + layer.open({ + type: 2, + title: false, + closeBtn: 0, + area: ['100%', '100%'], + shadeClose: true, + anim: 2, + content: top.restAjax.path('route/shop/show.html?shopId={shopId}', [data.showId]), + end: function() { + reloadTable(); + } + }); + // switch(obj.event){ // case 'add': // layer.msg('娣诲姞');