Merge branch 'feature/order_edit' into release

# Conflicts:
#	src/static/lang/en/orderInfo.js
#	src/static/lang/zh/orderInfo.js

src/pages/orderInfo/orderInfo.vue

@@ -246,10 +246,10 @@
              </view>
              <view class="order-table-v">
               <text>{{$lang.lang.orderInfo.inWarehouseInfo}}:</text>
-              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:item.num}}{{$lang.lang.orderInfo.box}}</text>
-              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.weight:item.weight}}KG</text>
-              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.volume:item.volume}}m³</text>
-              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.quantityAll:item.quantity}}{{$lang.lang.create.aunit}}</text>
+              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:0}}{{$lang.lang.orderInfo.box}}</text>
+              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.weight:0}}KG</text>
+              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.volume:0}}m³</text>
+              <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.quantityAll:0}}{{$lang.lang.create.aunit}}</text>
              </view>
              <view class="order-table-v">
               <text>{{$lang.lang.create.quickNo}}:{{item.warehouseInInfoVO?item.warehouseInInfoVO.expressNo:item.expressNo}}</text>

src/static/lang/en/orderInfo.js

@@ -70,5 +70,22 @@ 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"
 }
\ No newline at end of file

src/static/lang/zh/orderInfo.js

@@ -70,5 +70,22 @@ export default {
   "ballAddress": "提货点",
   "loans": "代收贷款",
   "showInfo": "展示",
-  "hiddenInfo": "隐藏"
+  "hiddenInfo": "隐藏",
+  "copy":"复制",
+  "typeName":"增值服务",
+  "objectport":'目的港清关',
+  "ourUndertakes":'我司承接',
+  "customerUndertakes":'客户承接',
+  "creator":'创建人',
+  "warehouseName":'仓库',
+  "externalWarehouse":'外部仓',
+  "estLoading":"装柜时间",
+  "loadingAddress":"装柜地址",
+  "tidanPrice":"提单价格",
+  "show":"显示",
+  "noShow":"不显示",
+  "createTime":"创建时间",
+  "inWarehouseInfo":"入仓信息",
+  "quickNos":"填单快递单号",
+  "unitType":"包装类型"
 }
\ No newline at end of file