From f7410364109ebb426a5e0184683a10fb1efdd0a0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Dec 2021 14:59:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

---
 src/main/resources/templates/febs/views/videoMember/memberList.html |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/febs/views/videoMember/memberList.html b/src/main/resources/templates/febs/views/videoMember/memberList.html
index 12c9afc..b2ea356 100644
--- a/src/main/resources/templates/febs/views/videoMember/memberList.html
+++ b/src/main/resources/templates/febs/views/videoMember/memberList.html
@@ -186,6 +186,8 @@
                                 return ''
                             }
                         }, minWidth: 80,align:'center'},
+                    {field: 'buyTime', title: '会员开始日期', minWidth: 180,align:'center'},
+                    {field: 'expireTime', title: '会员结束日期', minWidth: 180,align:'center'},
                     {field: 'accountType', title: '账号类型',
                         templet: function (d) {
                             if (d.accountType === 2) {
@@ -210,10 +212,15 @@
                     {title: '操作',
                         templet: function (d) {
                             if (d.accountStatus === 1) {
-                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="resetPwd" shiro:hasPermission="user:update">重置密码</button>'
-                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="close" shiro:hasPermission="user:update">禁用</button>'
-                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="setVip" shiro:hasPermission="user:update">设置会员</button>'
-                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancelVip" shiro:hasPermission="user:update">取消会员</button>'
+                                if(d.isVip === 2){
+                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="resetPwd" shiro:hasPermission="user:update">重置密码</button>'
+                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="close" shiro:hasPermission="user:update">禁用</button>'
+                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="setVip" shiro:hasPermission="user:update">设置会员</button>'
+                                }else{
+                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="resetPwd" shiro:hasPermission="user:update">重置密码</button>'
+                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="close" shiro:hasPermission="user:update">禁用</button>'
+                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancelVip" shiro:hasPermission="user:update">取消会员</button>'
+                                }
                             }else{
                                 return'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="resetPwd" shiro:hasPermission="user:update">重置密码</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="open" shiro:hasPermission="user:update">启用</button>'

--
Gitblit v1.9.1