多语言合并代码

.hbuilderx/launch.json

@@ -17,7 +17,7 @@
             "type" : "uni-app:app-android"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-ios"
         }
     ]

src/pages/light_exception/light_exception.vue

@@ -18,8 +18,8 @@
 					</view>
 					<view class="order-info-line-v">
 						<view class="" >{{$lang.lang.light.transport}}：{{getConfigLabel('transport',orderData.transportId)}}</view>
-						<view class="" >{{$lang.lang.light.startCity}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startTitleZh:orderData.logisticsInfoDto.startTitleEn):''}}</view>
-						<view class="">{{$lang.lang.light.endCity}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.destTitleZh:orderData.logisticsInfoDto.destTitleEn):''}}</view>
+						<view class="" >{{$lang.lang.light.startCity}}：{{orderData.logisticsInfoDto?orderData.logisticsInfoDto[$lang.startTitle]:''}}</view>
+						<view class="">{{$lang.lang.light.endCity}}：{{orderData.logisticsInfoDto?orderData.logisticsInfoDto[$lang.destTitle]:''}}</view>
 						<view class="">{{$lang.lang.light.consignee}}：{{orderData.consigneeVO?orderData.consigneeVO.name:''}}</view>
 					</view>
 				</view>
@@ -174,13 +174,7 @@
 			getStatusName (type){
 				let that = this
 				var status = that.statusData.find(item=>item.value == type)
-				if(status) {
-					if(that.$lang.locale=='zh'){
-						return status.label
-					}else{
-						return status.labelEn
-					}
-				}
+				return status[that.$lang.label]
 			},
 			getStatusData () {
 				this.$request.getConfig('order_status').then(res => {

src/static/lang/en/order.js

@@ -80,5 +80,14 @@ export default {
   "manager": "Administrator",
   "lendingType": "Verification Method",
   "lendSussess": "Successfully released",
-  "copy": "Copy"
+  "copy": "Copy",
+  "unloadTime": "Warehouse Arrival/Unloading Date",
+  "lockConsigneeTime": "Consignee Lock Expiration",
+  "isLimitUpdateConsignee": "Order Restricts Consignee Modification",
+  "yes": "Yes",
+  "no": "No",
+  "remark1": "Note: Consignee lock period has not expired; consignee modification is not allowed.",
+  "remark2": "Note: Consignee lock period has expired; consignee modification is allowed.",
+  "remark3": "Note: Order has not been unloaded/arrived at the warehouse; consignee modification is not allowed.",
+  "remark4": "Note: Consignee modification is allowed for the order."
 }