+会员卡列表;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -66,7 +66,7 @@ public class AdamMemberAdminController extends BaseController {
         startPage();
         return getDataTable(adamMemberService.list(
                 Wrappers.lambdaQuery(AdamMember.class).eq(AdamMember::getState, 1).select(
-                        AdamMember::getMemberId, AdamMember::getIcon, AdamMember::getName, AdamMember::getTitle
+                        AdamMember::getMemberId, AdamMember::getIcon, AdamMember::getTitle, AdamMember::getSubTitle, AdamMember::getOnsale
                 )
         ));
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/member.html

@@ -33,14 +33,34 @@
                     title: '会员卡ID'
                 },
                 {
-                    field: 'name',
-                    title: '会员卡名称',
+                    field: 'icon',
+                    title: 'ICON',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push($.common.sprintf("<img class='img-circle img-xs' src='%s' />", value));
+                        return actions;
+                    }
                 },
                 {
                     field: 'title',
                     title: '会员卡标题',
                     align: 'center',
                 },
+                {
+                    field: 'subTitle',
+                    title: '会员卡说明',
+                },
+                {
+                    field: 'onsale',
+                    title: '开售状态',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        var listClass = "badge badge-" + (value === 1 ? 'primary' : 'danger');
+                        actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, value === 1 ? '开售' : '停售'));
+                        return actions;
+                    }
+                },
                 {
                     title: '操作',
                     align: 'center',