From c30238a989c8ea11ea6cd684e1ae9bdfbab8b2eb Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Fri, 15 Sep 2023 09:39:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0app=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/Auth.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 2df4e11b..94ff747b 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -1339,14 +1339,18 @@ class Auth extends BaseController $queryBuilder = $queryBuilder->where('version', '>', $version); } if ($phoneBrand) { + $pos = false; foreach($brandArray as $b) { $pos = stripos($phoneBrand, $b); if ($pos !== false) { $queryBuilder = $queryBuilder->where('phone_brand', $b); } } + if ($pos === false) { + $queryBuilder = $queryBuilder->where('phone_brand', ''); + } } - $appInfo = ($queryBuilder->order('id', 'desc')->fetchSql(false)->find()) ?? (object)[]; + $appInfo = ($queryBuilder->order('version', 'desc')->fetchSql(false)->find()) ?? (object)[]; } return app('json')->success(compact('appInfo')); From 26fd132b1721b3359ca44bc06a4fd32635e85e72 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Fri, 15 Sep 2023 09:53:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- public/static/js/index.cd02d553.js | 1 + public/static/js/pages-store-settled-index.f6d3fde9.js | 1 + public/static/js/pages-users-user_info-index.11ccc99a.js | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 public/static/js/index.cd02d553.js create mode 100644 public/static/js/pages-store-settled-index.f6d3fde9.js create mode 100644 public/static/js/pages-users-user_info-index.11ccc99a.js diff --git a/public/index.html b/public/index.html index 8b714f0f..2268d938 100644 --- a/public/index.html +++ b/public/index.html @@ -2,4 +2,4 @@ document.write('') if(window.location.protocol == 'https:'){ document.write('') - }