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

调整

This commit is contained in:
jianghanbo 2024-10-22 15:58:25 +08:00
parent 357063025e
commit 05cac4d116
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
admin/src/assets/home/wechat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 176 KiB

2
admin/src/views/order/appointment.vue
View File

@ -11,7 +11,7 @@
<el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%"> <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
<el-table-column align="center" fixed width="220" label="操作"> <el-table-column align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.status ==0 && scope.row.status == 0" type="primary" size="small" icon="el-icon-check" @click="onPass(scope.row)"> <el-button v-if="scope.row.status ==0 && scope.row.status == 0" type="primary" size="small" icon="el-icon-check" @click="onPass(scope.row)">
确认 确认

7
admin/src/views/proManagement/index.vue
View File

@ -58,15 +58,14 @@
<el-table-column <el-table-column
align="center" align="center"
label="ID" label="平台商品ID"
width="80" width="200"
prop="id" prop="third_product_id"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="商品名称" label="商品名称"
width=""
prop="product_name" prop="product_name"
></el-table-column> ></el-table-column>

16
service/app/admin/controller/OrderBooksController.php
View File

@ -14,16 +14,16 @@ class OrderBooksController extends base {
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
*/ */
public function list(Request $request) { public function list(Request $request) {
$query = OrderBooks::where([])->order('id', 'desc'); $where = [];
if($username = $request->get('username')) { if($request->get('sn')) {
$query->where('username', $username); $order = Orders::where('sn', $request->get('sn'))->find();
if ($order) {
$where['order_id'] = $order->id;
} else {
$where['order_id'] = '-1';
} }
if($status = $request->get('status')) {
$query->where('status', $status);
}
if($is_order = $request->get('sn')) {
$query->where('is_order', $is_order);
} }
$query = OrderBooks::where($where)->order('id', 'desc');
$list = $query->with(['orderInfo'])->paginate($request->get('limit',10)); $list = $query->with(['orderInfo'])->paginate($request->get('limit',10));
foreach ($list as &$val) { foreach ($list as &$val) {