From 26f71a483433d33bbd4cc41640d8ab990164a6d4 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 17 Mar 2026 17:11:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/application/api/controller/Contract.php | 10 +++--- back/application/api/controller/User.php | 2 ++ back/application/database.php | 2 +- front/config/dev.env.js | 4 +-- front/config/prod.env.js | 4 +-- .../src/views/contract-mgr/contractsearch.vue | 34 +++++++++++-------- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/back/application/api/controller/Contract.php b/back/application/api/controller/Contract.php index 98a7567..419431d 100644 --- a/back/application/api/controller/Contract.php +++ b/back/application/api/controller/Contract.php @@ -235,11 +235,13 @@ class Contract extends Common $insert_info['contract_category']= $param['contract_category']; } - if($param['contract_url'] == ''){ + // 先检查键是否存在,再判断值是否为空 + if (!isset($param['contract_url']) || $param['contract_url'] == '') { $insert_info['contract_url'] = ''; - }else{ - $insert_info['contract_url'] = $param['contract_url']; - $insert_info['contract_file_name'] = $param['contract_file_name']; + } else { + $insert_info['contract_url'] = $param['cosssntract_url']; + // 同理,contract_file_name 也建议做存在性检查,避免同理报错 + $insert_info['contract_file_name'] = isset($param['contract_file_name']) ? $param['contract_file_name'] : ''; } db('contract_info')->insert($insert_info); return $this->sendSuccess('添加成功'); diff --git a/back/application/api/controller/User.php b/back/application/api/controller/User.php index 8d889c5..f8fdddc 100644 --- a/back/application/api/controller/User.php +++ b/back/application/api/controller/User.php @@ -321,6 +321,7 @@ class User extends Common $ret['company'] = "苏州维达奇智能科技有限公司"; } $ret['id'] = $login_id; + $ret['name'] = $res['user_name']; } //客户 if (2 == $res['user_type']) @@ -332,6 +333,7 @@ class User extends Common ->field('i.contacts_name as name, i.contacts_idcard as idcard, c.company_name as company') ->find(); $ret['id'] = $login_id; + $ret['name'] = $res['user_name']; } } diff --git a/back/application/database.php b/back/application/database.php index ee2f927..ea49943 100644 --- a/back/application/database.php +++ b/back/application/database.php @@ -19,7 +19,7 @@ return [ // 用户名 'username' => 'root', // 密码 - 'password' => '123456', + 'password' => '12356', // 端口 'hostport' => '', // 连接dsn diff --git a/front/config/dev.env.js b/front/config/dev.env.js index 03831c9..1fba01b 100644 --- a/front/config/dev.env.js +++ b/front/config/dev.env.js @@ -1,7 +1,7 @@ module.exports = { NODE_ENV: '"development"', ENV_CONFIG: '"dev"', - BASE_WMS_API: '"http://47.111.78.178:8011/api"', - BASE_WMS_FILE: '"http://47.111.78.178:8011/"' + BASE_WMS_API: '"http://127.0.0.1:8080/api"', + BASE_WMS_FILE: '"http://127.0.0.1:8080/"' // 47.101.147.253 } diff --git a/front/config/prod.env.js b/front/config/prod.env.js index 8626731..9874c6a 100644 --- a/front/config/prod.env.js +++ b/front/config/prod.env.js @@ -1,8 +1,8 @@ module.exports = { NODE_ENV: '"production"', ENV_CONFIG: '"prod"', - BASE_WMS_API: '"http://47.111.78.178:8011/api"', - BASE_WMS_FILE: '"http://47.111.78.178:8011/"' + BASE_WMS_API: '"http://127.0.0.1:8080/api"', + BASE_WMS_FILE: '"http://127.0.0.1:8080/"' ////BASE_AGV_API: '"http://192.168.3.223:55200/v1"', //BASE_WMS_API: '"http://169.254.71.103/api"', //BASE_AGV_API: '"http://127.0.0.1:55200/v1"', diff --git a/front/src/views/contract-mgr/contractsearch.vue b/front/src/views/contract-mgr/contractsearch.vue index b3a5896..66a8592 100644 --- a/front/src/views/contract-mgr/contractsearch.vue +++ b/front/src/views/contract-mgr/contractsearch.vue @@ -8,16 +8,23 @@