diff --git a/application/admin/model/wechat/WechatUser.php b/application/admin/model/wechat/WechatUser.php index 99821250..40542cc1 100644 --- a/application/admin/model/wechat/WechatUser.php +++ b/application/admin/model/wechat/WechatUser.php @@ -155,7 +155,7 @@ use service\SystemConfigService; } } } - $model = $model->where('openid','NOT NULL'); +// $model = $model->where('openid','NOT NULL'); if($where['nickname'] !== '') $model = $model->where('nickname','LIKE',"%$where[nickname]%"); if($where['data'] !== ''){ list($startTime,$endTime) = explode(' - ',$where['data']); @@ -203,7 +203,6 @@ use service\SystemConfigService; $item['qr_code'] = QrcodeService::getForeverQrcode('spread',$item['uid']); $item['extract_count_price'] = UserExtract::getUserCountPrice($item['uid']);//累计提现 $item['extract_count_num'] = UserExtract::getUserCountNum($item['uid']);//提现次数 -// $item['qr_code'] = ''; },$where); } diff --git a/application/admin/view/public/error.php b/application/admin/view/public/error.php index d2ff2952..604d2064 100644 --- a/application/admin/view/public/error.php +++ b/application/admin/view/public/error.php @@ -26,7 +26,7 @@ 刷新试试 返回上一页

-

crmeb提示您:您可能输入了错误的网址,或者该网页已删除或移动,3秒钟后自动跳转

+

CRMEB提示您:您可能输入了错误的网址,或者该网页已删除或移动,3秒钟后自动跳转

diff --git a/application/admin/view/public/success.php b/application/admin/view/public/success.php index df1b3c24..be047010 100644 --- a/application/admin/view/public/success.php +++ b/application/admin/view/public/success.php @@ -26,7 +26,7 @@

{$msg}!

3秒钟后自动跳转,点此手动跳转

-

crmeb提示您:您访问的页面正在跳转中,请耐心等待…

+

CRMEB提示您:您访问的页面正在跳转中,请耐心等待…

diff --git a/application/routine/model/store/StoreProductReply.php b/application/routine/model/store/StoreProductReply.php index abd044fa..a0a3c25f 100644 --- a/application/routine/model/store/StoreProductReply.php +++ b/application/routine/model/store/StoreProductReply.php @@ -66,6 +66,7 @@ class StoreProductReply extends ModelBasic return $list; } + public static function tidyProductReply($res) { $res['cart_info'] = json_decode($res['cart_info'],true)?:[]; diff --git a/public/system/css/layui-admin.css b/public/system/css/layui-admin.css index cb655dc8..5494081d 100644 --- a/public/system/css/layui-admin.css +++ b/public/system/css/layui-admin.css @@ -3,12 +3,6 @@ .layui-table-box{ overflow: initial; } -.layui-table-body{ - overflow: initial; -} -.layui-table-cell{ - overflow: initial; -} /* 部分样式重构 */ @@ -74,7 +68,9 @@ width: auto; } .layui-table-cell { + overflow: hidden; height: auto!important; + white-space:normal, } .layui-input-block .layui-admin-input{ width: 50%; @@ -86,6 +82,7 @@ .layui-input-block .time-w{ width: 200px; } +.layui-table-body{overflow: initial;} .layui-btn-group button i{ line-height: 30px; margin-right: 3px;