Merge remote-tracking branch 'origin/main'

admin/src/views/order/appointment.vue

@@ -11,7 +11,7 @@
 
     <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">
           <el-button v-if="scope.row.status ==0 && scope.row.status == 0" type="primary" size="small" icon="el-icon-check" @click="onPass(scope.row)">
             确认

admin/src/views/proManagement/index.vue

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

service/app/admin/controller/OrderBooksController.php

@@ -14,16 +14,16 @@ class OrderBooksController extends base {
      * @throws \think\db\exception\DbException
      */
     public function list(Request $request) {
-        $query = OrderBooks::where([])->order('id', 'desc');
-        if($username = $request->get('username')) {
-            $query->where('username', $username);
+        $where = [];
+        if($request->get('sn')) {
+            $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));
         foreach ($list as &$val) {