Merge branch 'master' of ssh://119.23.72.7:22611/q578953158/php_frq_api

app/Model/OpLogModel.php

@@ -38,7 +38,7 @@ class OpLogModel extends Model
                         break;
                         break;
                 }
                 }
             }
             }
-        })->orderBy('id','desc')->paginate(@$input['limit']  ? $input["limit"]:10, ['*'], 'page', @$input['p'] ? $input["p"]:1 )->toArray();
+        })->orderBy('id','desc')->paginate(@$input['limit']  ? $input["limit"]:10, ['*'], 'page', @$input['page'] ? $input["page"]:1 )->toArray();
         if (!$list) return [20001, '没有数据'];
         if (!$list) return [20001, '没有数据'];
         foreach ($list['data'] as $k=>&$v){
         foreach ($list['data'] as $k=>&$v){
             $v['types_val'] = $v['types'] == 1 ? '询价' : '报价';
             $v['types_val'] = $v['types'] == 1 ? '询价' : '报价';

app/Model/QuoteModel.php

@@ -417,7 +417,7 @@ class QuoteModel extends Model
             $data = [];
             $data = [];
             $data['types']       = 2;
             $data['types']       = 2;
             $data['relation_id'] = $res->id;
             $data['relation_id'] = $res->id;
-            $data['relation_sn'] = '';
+            $data['relation_sn'] = $quote_info['quote_sn'];
             $data['content']     = '新增报价，报价单号：'.$quote_info['quote_sn'];
             $data['content']     = '新增报价，报价单号：'.$quote_info['quote_sn'];
             $data['create_uid']  = $input['user_id'];
             $data['create_uid']  = $input['user_id'];
             $data['create_name'] = $input['user_name'];
             $data['create_name'] = $input['user_name'];