.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE = OMS系统平台
 ENV = 'development'
 
 # SaaS协同平台/开发环境
-VUE_APP_BASE_API = '/dev-api'
-# VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/prod-api'
 
 # 用户 "应用中心" 地址
 VUE_APP_CENTERURL = https://user.lzlxylsf.com/app

src/benyun/utils/auth.ts

@@ -5,11 +5,11 @@ const TokenKey = 'AdminOMS-Token'
 const ExpiresInKey = 'AdminOMS-Expires-In'
 
 export function getToken() {
-  // if(process.env.NODE_ENV === 'development'){
-  //   return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjdkM2FmZGVhLWQ1ZjctNDdhMC04ZDY3LWQ4ZTVlOWI3NGU4YiIsInVzZXJuYW1lIjoiYWRtaW4ifQ.Qoyb1kPCLTqEujOUoJzMkLz1ZqETlknJ1buyc8F8lePc0iLcKYnw-HFdMGN3colI2K0_8tZT2wiwaD7PuaVKJA'
-  // }else{
+  if(process.env.NODE_ENV === 'development'){
+    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxNDIsInVzZXJfa2V5IjoiOTZmYTFlYjMtMzZkMS00NmMyLTg3MDMtZjdlMjFhYjIxNmQ2IiwidXNlcm5hbWUiOiIxODc3ODI3NTEzNiJ9.LYcF_qo_4rvgxgWXBS4j8mdTLiCfZ8pd0xsonzrBq96FC8hLIM_ikUNFPU64Gqn87jubpGumWoX0-iNT5tPuPw'
+  }else{
     return Cookies.get(TokenKey)
-  // }
+  }
   
 }
 

src/layout/components/Navbar.vue

@@ -11,9 +11,9 @@
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
       </template>
 

src/views/oms/B2BOrder/components/deliveryDetail.vue

@@ -225,7 +225,7 @@ export default class DeliveryDetail extends Vue {
           this.value.subItem = [];
           for (const item of this.value.subItemList) {
             this.value.subItem.push({
-              tmsGoodsCode: item.tmsGoodsCode,
+              barCode: item.tmsGoodsCode,
               name: item.tmsGoodsName,
               tmsGoodsTotalPrice: item.tmsGoodsTotalPrice,
               price: item.tmsGoodsPrice,

src/views/oms/B2COrder/components/orderTool.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="order-tool">
-    <el-button type="text" @click="handle('loadOrder')">手工下载</el-button>
+    <!-- 2024-9-30 经刑工、詹工开会讨论 手工下载按钮隐藏 pingCode：LSF-562 -->
+    <!-- <el-button type="text" @click="handle('loadOrder')">手工下载</el-button> -->
+
     <el-button type="text" @click="handle('importOrder')">导入订单</el-button>
     <!-- <el-dropdown split-button type="text" @click="handle('addOrder')" @command="handleCommand">
       新增订单

vue.config.js

@@ -39,13 +39,13 @@ module.exports = defineConfig({
       // '/':{
         ws:false,
         // target: `http://192.168.2.32`,
-        // target: `https://oms.lzlxylsf.com`,
-        target:`http://192.168.1.75:8080`,
+        target: `https://oms.lzlxylsf.com`,
+        // target:`http://192.168.1.75:8080`,
         // target: `http://47.107.53.207:9023`,
         changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
+        // pathRewrite: {
+        //   ['^' + process.env.VUE_APP_BASE_API]: ''
+        // }
       }
     }
   },