多语言合并代码

.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

@@ -14,17 +14,17 @@
 						<view class="">{{$lang.lang.light.marks}}：{{orderData.marks}}</view>
 						<view class="">{{$lang.lang.light.sum}}：{{orderData.sumNum}}/{{orderData.costVO?orderData.costVO.totalNum:0}}</view>
 						<view class="">{{$lang.lang.light.orderStatus}}：{{getStatusName(orderData.status)}}</view>
-						<view class="">{{$lang.lang.light.consignor}}：{{orderData.consignorVO?orderData.consignorVO.name:''}}</view>						
+						<view class="">{{$lang.lang.light.consignor}}：{{orderData.consignorVO?orderData.consignorVO.name:''}}</view>
 					</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.consignee}}：{{orderData.consigneeVO?orderData.consigneeVO.name:''}}</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> 
+				</view>
 				<view class="order-info-line">
-					<view class="order-info-line-v">				
+					<view class="order-info-line-v">
 						<view class="">{{$lang.lang.light.company}}：{{orderData.consigneeVO?orderData.consigneeVO.company:''}}</view>
 						<view class="">{{$lang.lang.light.phone}}：{{orderData.consigneeVO?$request.checkAddIcon(orderData.consigneeVO.countryCode):''}}{{orderData.consigneeVO?orderData.consigneeVO.phone:''}}</view>
 						<view class="">{{$lang.lang.orderInfo.consignorCom}}：{{orderData.consignorVO?orderData.consignorVO.company:''}}</view>
@@ -50,9 +50,9 @@
 							<view class="weight_style">
 								<text>{{$lang.lang.light.goodsName}}：</text>
 								<text>{{item.prodTitleZh}}{{item.prodTitleEn}}</text>
-							</view> 
+							</view>
 							<view class="weight_style">
-								<text>{{$lang.lang.light.formInfo}}:</text>					 
+								<text>{{$lang.lang.light.formInfo}}:</text>
 								<view class="weight_info">
 									<text>{{$lang.lang.light.brand}}：{{item.brandType?$lang.lang.create.yes:$lang.lang.create.no}}</text>
 									<text>{{$lang.lang.light.num}}：{{item.num||0}} </text>
@@ -82,21 +82,21 @@
 
 					</view>
 				</view>
-				<view  class="corder-goods-v corder-sum"> 
+				<view  class="corder-goods-v corder-sum">
 					<view>
 						<text>{{$lang.lang.light.total}}:</text>
 						<text>{{$lang.lang.light.num}}：{{shopSum.sumNum||0}} </text>
 						<text>{{$lang.lang.light.volume}}：{{shopSum.sumVolume||0}}CBM </text>
 						<text> {{$lang.lang.light.weight}}：{{shopSum.sumWeight||0}}KG</text>
-					</view>	
+					</view>
 					<view>
 						<text>{{$lang.lang.light.rucang}}:</text>
 						<text>{{$lang.lang.light.num}}：{{shopSum.warehouseNum||0}} </text>
 						<text>{{$lang.lang.light.volume}}：{{shopSum.warehouseVolume||0}}CBM </text>
 						<text> {{$lang.lang.light.weight}}：{{shopSum.warehouseWeight||0}}KG</text>
-					</view>	
+					</view>
 				</view>
-			</view>	
+			</view>
 			<view class="apply-btn">
 					<!-- <view @click="sumbit('general_cargo')">{{$lang.lang.light.common}}</view> -->
 					<view  @click="sumbit('process')">{{$lang.lang.light.lightAgree}}</view>
@@ -156,7 +156,7 @@
 						}else{
 							label = item.labelEn
 						}
-						
+
 					}
 				})
 				return label
@@ -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 => {
@@ -192,7 +186,7 @@
 			orderConfig (field, key) {
 				this.$request.getConfig(field).then(res => {
 					if(res.code==0&&res.data.list.length > 0){
-						this.config[key] = res.data.list					
+						this.config[key] = res.data.list
 					}
 				})
 			},
@@ -217,7 +211,7 @@
 					that.shopSum.sumNum += item.num
 					that.shopSum.sumVolume += item.volume
 					that.shopSum.sumWeight += item.weight
-					
+
 					that.shopSum.warehouseNum += item.warehouseInInfoVO.cartonsNum
 					that.shopSum.warehouseVolume += item.warehouseInInfoVO.volume
 					that.shopSum.warehouseWeight += item.warehouseInInfoVO.weight

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",
\ No newline at end of file
+  "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."
+}

src/static/lang/en/orderInfo.js

@@ -91,4 +91,4 @@ export default {
   "quickNos": "Tracking Number",
   "unitType": "Packaging Type",
   "is": "Yes"
-}
+}
\ No newline at end of file