senyao
/
travel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

This commit is contained in:
jianghanbo 2024-08-28 16:12:16 +08:00
parent 9db5918a79
commit ca9d3deef2
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/app/admin/controller/OrderController.php
View File

@ -47,9 +47,16 @@ class OrderController extends base
if($os_status) { if($os_status) {
if ($os_status[0] == array_search(Orders::OSS[4],Orders::OSS)){ if ($os_status[0] == array_search(Orders::OSS[4],Orders::OSS)){
if (isset($os_status[1]) && is_numeric($os_status[1])) {
$query->whereRaw(Orders::AllOssStatusSql[$os_status[1]]); $query->whereRaw(Orders::AllOssStatusSql[$os_status[1]]);
}
}else{ }else{
$query->where('os', $os_status[0] ?? 0 )->where('order_status', $os_status[1] ?? 0); if (isset($os_status[0]) && is_numeric($os_status[0])) {
$query->where('os', $os_status[0]);
}
if (isset($os_status[1]) && is_numeric($os_status[1])) {
$query->where('order_status', $os_status[1]);
}
} }
} }

2
service/public/index.html
View File

File diff suppressed because one or more lines are too long

2
service/public/static/css/chunk-1ea86fd8.05da890b.css → service/public/static/css/chunk-6e13869a.748f022c.css
View File

@ -1 +1 @@
.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-467b1006]{position:relative;padding-bottom:60px}.el-table[data-v-467b1006],.filter-container[data-v-467b1006]{padding-bottom:5px} .pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-34c5198e]{position:relative;padding-bottom:60px}.el-table[data-v-34c5198e],.filter-container[data-v-34c5198e]{padding-bottom:5px}

1
service/public/static/js/app.700851be.js
View File

File diff suppressed because one or more lines are too long

1
service/public/static/js/chunk-1ea86fd8.b7f01e91.js
View File

File diff suppressed because one or more lines are too long