mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新合并处理

Browse Source
This commit is contained in:
yaooo 2023-09-18 12:29:38 +08:00
commit 398def5dc3
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controller/api/Auth.php
View File

@ -1339,14 +1339,18 @@ class Auth extends BaseController
$queryBuilder = $queryBuilder->where('version', '>', $version); $queryBuilder = $queryBuilder->where('version', '>', $version);
} }
if ($phoneBrand) { if ($phoneBrand) {
$pos = false;
foreach($brandArray as $b) { foreach($brandArray as $b) {
$pos = stripos($phoneBrand, $b); $pos = stripos($phoneBrand, $b);
if ($pos !== false) { if ($pos !== false) {
$queryBuilder = $queryBuilder->where('phone_brand', $b); $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')); return app('json')->success(compact('appInfo'));

2
public/index.html
View File

@ -2,4 +2,4 @@
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />') document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
if(window.location.protocol == 'https:'){ if(window.location.protocol == 'https:'){
document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">') document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.e1419629.js></script></body></html> }</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.cd02d553.js></script></body></html>

1
public/static/js/index.cd02d553.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-store-settled-index.f6d3fde9.js Normal file
View File

File diff suppressed because one or more lines are too long