浏览代码

前端代码合并提交

Administrator 3 年之前
父节点
当前提交
0c3c0b33ac
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      src/config/globle.js
  2. 2 2
      src/views/noCar/billway.vue
  3. 2 2
      src/views/platform/waybillmanagement/waybillList.vue

+ 2 - 2
src/config/globle.js

@@ -1,3 +1,3 @@
-//window.hostUrl = "http://47.94.149.131:80/";
-window.hostUrl = "http://127.0.0.1:18080/"
+window.hostUrl = "http://itest.jkcredit.com:80/";
+//window.hostUrl = "http://127.0.0.1:18080/"
 window.tableHeight =  (document.body.clientHeight*0.6-20);

+ 2 - 2
src/views/noCar/billway.vue

@@ -466,9 +466,9 @@ import XLSX from "xlsx";
                   return v[j]/100;
               }else if(j=='hisFlag'){
                 if(v[j] == 0){
-                  return "历史运单";
-                }else{
                   return "实时运单";
+                }else{
+                  return "历史运单";
                 }
               }else{
                   return v[j];

+ 2 - 2
src/views/platform/waybillmanagement/waybillList.vue

@@ -356,9 +356,9 @@ async  exportExcel() {
                  }
               }else if(j=='hisFlag'){
                 if(v[j] == 0){
-                  return "历史运单";
-                }else{
                   return "实时运单";
+                }else{
+                  return "历史运单";
                 }
               }else if(j =='fee'){
                   return v[j]/100;