From c0f815c5236d5804a3723fc62384d00a8e61f6b5 Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Tue, 13 Nov 2018 09:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E5=8F=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=E6=92=91=E5=BC=80=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=86=E9=94=80=E5=88=97=E8=A1=A8=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9cmseb=20=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/model/wechat/WechatUser.php         | 3 +--
 application/admin/view/public/error.php               | 2 +-
 application/admin/view/public/success.php             | 2 +-
 application/routine/model/store/StoreProductReply.php | 1 +
 public/system/css/layui-admin.css                     | 9 +++------
 5 files changed, 7 insertions(+), 10 deletions(-)

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 @@
                         <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>
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 @@
                 <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>
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;