解决冲突后补充语言配置

src/static/lang/en.js

@@ -629,7 +629,7 @@ export default{
 		toRoom:'to door',
 		consigneeCity:"consignee's city" ,
 		consigneeAdd:"consignee's address",
-		logistics:'logistics information',
+		logistics:'transport',
 		endCity:'destination cargo',
 		startCity:'departure cargo',
 		address:'address',
@@ -683,7 +683,24 @@ export default{
 		ballAddress:'address of pick up bill',
 		loans:'Collection of loans',
 		showInfo:'Show',
-		hiddenInfo:'Hide'
+		hiddenInfo:'Hide',
+		copy:"copy",
+		typeName:"value-added services",
+		objectport:'Destination port customs clearance',
+		ourUndertakes:'Our company undertakes',
+		customerUndertakes:'Customer Undertaking',
+		creator:'creator',
+		warehouseName:'Warehouse',
+		externalWarehouse:'External warehouse',
+		estLoading:"Loading time",
+		loadingAddress:"Loading address",
+		tidanPrice:"Bill of lading Price",
+		show:"display",
+		noShow:"Do not display",
+		createTime:"Creation time",
+		inWarehouseInfo:"Warehouse entry information",
+		quickNos:"prefill express tracking number",
+		unitType:"Packaging type"
 	},
 	price:{
 		startCity:'place of departure ',

src/static/lang/zh.js

@@ -629,7 +629,7 @@ export default{
 		toRoom:'送货上门',
 		consigneeCity:'收货地区',
 		consigneeAdd:'收货地址',
-		logistics:'物流信息',
+		logistics:'运输',
 		endCity:'目的仓',
 		startCity:'始发仓',
 		address:'地址',
@@ -683,7 +683,24 @@ export default{
 		ballAddress:'提货点',
 		loans:'代收贷款',
 		showInfo:'展示',
-		hiddenInfo:'隐藏'
+		hiddenInfo:'隐藏',
+		copy:"复制",
+		typeName:"增值服务",
+		objectport:'目的港清关',
+		ourUndertakes:'我司承接',
+		customerUndertakes:'客户承接',
+		creator:'创建人',
+		warehouseName:'仓库',
+		externalWarehouse:'外部仓',
+		estLoading:"装柜时间",
+		loadingAddress:"装柜地址",
+		tidanPrice:"提单价格",
+		show:"显示",
+		noShow:"不显示",
+		createTime:"创建时间",
+		inWarehouseInfo:"入仓信息",
+		quickNos:"填单快递单号",
+		unitType:"包装类型"
 	},
 	price:{
 		startCity:'始发地',