Merge branch 'master' of http://118.178.128.178/Fedex/imac-vue

 # 开发环境配置
 # 开发环境配置
 ENV = 'development'
 ENV = 'development'
 
 
-# FedEx管理系统/开发环境
+# IMAC管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 VUE_APP_BASE_API = '/dev-api'
 
 
 # 路由懒加载
 # 路由懒加载

 # 生产环境配置
 # 生产环境配置
 ENV = 'production'
 ENV = 'production'
 
 
-# FedEx管理系统/生产环境
+# IMAC管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
 VUE_APP_BASE_API = '/prod-api'

@@ -3,5 +3,5 @@ NODE_ENV = production
 # 测试环境配置
 # 测试环境配置
 ENV = 'staging'
 ENV = 'staging'
 
 
-# FedEx管理系统/测试环境
+# IMAC管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
 VUE_APP_BASE_API = '/stage-api'

@@ -5,7 +5,7 @@
 git clone https://gitee.com/y_project/RuoYi-Vue
 git clone https://gitee.com/y_project/RuoYi-Vue
 
 
 # 进入项目目录
 # 进入项目目录
-cd FedEx-ui
+cd IMAC-ui
 
 
 # 安装依赖
 # 安装依赖
 npm install
 npm install

 {
 {
-  "name": "FedEx",
+  "name": "IMAC",
   "version": "3.5.0",
   "version": "3.5.0",
-  "description": "FedEx管理系统",
-  "author": "FedEx",
+  "description": "IMAC管理系统",
+  "author": "IMAC",
   "license": "MIT",
   "license": "MIT",
   "scripts": {
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev": "vue-cli-service serve",

 {
 {
-  "name": "FedEx",
+  "name": "IMAC",
   "version": "3.5.0",
   "version": "3.5.0",
-  "description": "FedEx管理系统",
-  "author": "FedEx",
+  "description": "IMAC后台管理系统",
+  "author": "IMAC",
   "license": "MIT",
   "license": "MIT",
   "scripts": {
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev": "vue-cli-service serve",

 module.exports = {
 module.exports = {
-  title: 'FedEx管理系统',
+  title: 'IMAC后台管理系统',
 
 
   /**
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

@@ -316,8 +316,13 @@
         this.loadingFlightDate = true;
         this.loadingFlightDate = true;
         this.sourceFlightAndFlightDate = [];
         this.sourceFlightAndFlightDate = [];
         findSourceFlightAndFlightDateApi(this.queryParams).then(response => {
         findSourceFlightAndFlightDateApi(this.queryParams).then(response => {
-          this.sourceFlightAndFlightDate = response.data;
-          this.loadingFlightDate = false;
+          if(response.code === 200){
+            this.sourceFlightAndFlightDate = response.data;
+            this.loadingFlightDate = false;
+          }else{
+            this.msgError(response.msg);
+          }
+        
         });
         });
 
 
 
 

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
   return path.join(__dirname, dir)
 }
 }
 
 
-const name = defaultSettings.title || 'FedEx管理系统' // 标题
+const name = defaultSettings.title || 'IMAC后台管理系统' // 标题
 
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 const port = process.env.port || process.env.npm_config_port || 80 // 端口