Explorar el Código

更新后台列表样式撑开,修复分销列表不显示小程序用户,修改cmseb 提示错误

sugar1569 hace 7 años
padre
commit
c0f815c523

+ 1 - 2
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);
     }
 

+ 1 - 1
application/admin/view/public/error.php

@@ -26,7 +26,7 @@
                         <a class="refresh" href="javascript:location.reload();">刷新试试</a>
                         <a class="back" href="javascript:void(0);">返回上一页</a>
                     </p>
-                    <p class="tips">crmeb提示您:您可能输入了错误的网址,或者该网页已删除或移动,<span class="nmb">3</span>秒钟后自动跳转</p>
+                    <p class="tips">CRMEB提示您:您可能输入了错误的网址,或者该网页已删除或移动,<span class="nmb">3</span>秒钟后自动跳转</p>
                 </div>
             </div>
         </div>

+ 1 - 1
application/admin/view/public/success.php

@@ -26,7 +26,7 @@
                 <div class="text">
                     <p class="status">{$msg}!</p>
                     <p class="countdown"><span class="nmb">3</span>秒钟后自动跳转,<a class="back" href="javascript:void(0);">点此手动跳转</a></p>
-                    <p class="tips">crmeb提示您:您访问的页面正在跳转中,请耐心等待…</p>
+                    <p class="tips">CRMEB提示您:您访问的页面正在跳转中,请耐心等待…</p>
                 </div>
             </div>
         </div>

+ 1 - 0
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)?:[];

+ 3 - 6
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;