Merge remote-tracking branch 'origin/release' into release

src/lang/en.js

@@ -148,7 +148,7 @@ export default {
     Id1: "Please upload frontal photo of ID",
     Id2: "Please upload back side photo of ID",
     success: "Submitted successfully",
-    loading: "Uploading..",
+    uploading: "Uploading..",
     newPhone: "new phone",
     edited: "Edited Success",
     company: "company name",
@@ -1068,6 +1068,9 @@ export default {
     orderType1: 'Cargo service',
     orderType2: 'Overseas warehouse',
     consigneeName: 'consigneeName',
+    yes: 'Yes',
+    no: 'No',
+    name: 'Name',
     consigneeNameNotice: 'Please enter the name of the consignee',
     consigneeNameNoticeEn: 'Please enter the name of the consignee in English',
     openConsignee: 'Select the consignee',
@@ -1078,12 +1081,15 @@ export default {
     consigneeCompanyNoticeEn: 'Please enter the company name in English',
     consignorConfirm: 'Please confirm the freight be paid by sender？',
     emailNotice: 'Please enter email address',
+    transportTitle: 'transport info',
     transport: '*transport',
     transportNotice: 'Please select the mode of transportation',
     channel: 'channel',
     channelNotice: 'Please select the shipping channel',
     departure: '*departure',
+    destCountry: 'Destination country',
     destCountryRules: 'destination country must be chosen',
+    destCountryNotice: 'Please select the destination country',
     departureRules: 'The place of origin is mandatory',
     departureNotice: 'Please select the place of departure',
     objective: '*objective',
@@ -1091,6 +1097,7 @@ export default {
     objectiveNotice: 'Please select a destination',
     router: '*Please select a line',
     routerNotice: 'Select a line on the right',
+    addServices:'value-added services',
     goods: 'goods info',
     addPro: 'addPro',
     addPros: 'addPros',
@@ -1128,8 +1135,14 @@ export default {
     issuingMethod: '*issuingMethod',
     deliveryDate: '*deliveryDate',
     deliveryDateRules: 'The delivery date cannot be empty',
+    displayBillLading: '提单是否显示价格',
+    display: 'display',
+    notDisplay: 'Do not display',
     warehouseType: '*warehouseType',
+    externalWarehouse: 'External warehouse',
     harvestMethod: '*harvestMethod',
+    loadingTime: 'loading time',
+    loadingAddress: 'Loading address',
     deliveryaddress: 'deliveryaddress',
     deliveryaddressRules: 'The receiving area cannot be empty',
     addressdetail: 'addressdetail',

src/lang/zh.js

@@ -115,7 +115,7 @@ export default {
     Id1: "请上传证件正面照",
     Id2: "请上传证件反面照",
     success: "提交成功",
-    loading: "上传中..",
+    uploading: "上传中..",
     newPhone: "请输入您的新手机号",
     edited: "修改成功",
     company: "请输入公司名称",
@@ -992,6 +992,9 @@ export default {
     orderType1: '集运服务',
     orderType2: '海外仓',
     consigneeName: '收货人',
+    yes: "是",
+    no: "否",
+    name: '名称',
     consigneeNameNotice: '请输入收货人姓名',
     consigneeNameNoticeEn: '请输入收货人英文名称',
     openConsignee: '选择收货人',
@@ -1001,12 +1004,15 @@ export default {
     consigneeCompanyNotice: '请输入公司名称',
     consigneeCompanyNoticeEn: '请输入公司英文名称',
     emailNotice: '请输入邮箱',
+    transportTitle: '运输',
     transport: '运输方式',
     transportNotice: '请选择运输方式',
     channel: '出货渠道',
     channelNotice: '请选择出货渠道',
     departure: '始发城市',
+    destCountry: '目的国',
     destCountryRules: '目的国必选',
+    destCountryNotice: '请选择目的国',
     departureRules: '始发城市必选',
     departureNotice: '请选择始发地',
     objective: '目的城市',
@@ -1014,6 +1020,7 @@ export default {
     objectiveNotice: '请选择目的地',
     router: '请选择线路',
     routerNotice: '请在右侧选择线路',
+    addServices:'增值服务',
     goods: '商品',
     addPro: '添加货物',
     addPros: '批量添加货物',
@@ -1051,8 +1058,14 @@ export default {
     issuingMethod: '出单方式',
     deliveryDate: '预计送货日期',
     deliveryDateRules: '预计送货日期不能为空',
+    displayBillLading: '提单是否显示价格',
+    display: '显示',
+    notDisplay: '不显示',
     warehouseType: '入仓类型',
+    externalWarehouse: '外部仓库',
     harvestMethod: '收货方式',
+    loadingTime: '装货时间',
+    loadingAddress: '装货地址',
     deliveryaddress: '收货地区',
     deliveryaddressRules: '收货地区不能为空',
     addressdetail: '收货详细地址',

src/views/jiedao/profile/delivery.vue

@@ -32,8 +32,8 @@
       <section-title lang-key="delivery.header">
           {{$t('delivery.consigneeName')}}
           <el-radio-group v-if="noConsignee" v-model="hasConsignee">
-            <el-radio :label="true">{{$t('有')}}</el-radio>
-            <el-radio :label="false">{{$t('无')}}</el-radio>
+            <el-radio :label="true">{{$t('delivery.yes')}}</el-radio>
+            <el-radio :label="false">{{$t('delivery.no')}}</el-radio>
           </el-radio-group>
       </section-title>
 
@@ -41,7 +41,7 @@
       <el-row :gutter="20" style="margin-top: 30px" v-if="hasConsignee">
         <el-col :span="12">
           <el-form-item
-            :label="$t('名称')"
+            :label="$t('delivery.name')"
             prop="consigneeName"
           >
             <el-input
@@ -141,7 +141,7 @@
 
       <el-card style="margin-top:20px;">
         <template #header>
-          <section-title :title="$t('运输')"></section-title>
+          <section-title :title="$t('delivery.transportTitle')"></section-title>
         </template>
         <el-descriptions :column="2" border>
           <el-descriptions-item
@@ -207,18 +207,18 @@
           >
             <span
                 slot="label"
-            ><span style="color: red">*</span>{{ $t("目的国") }}</span>
+            ><span style="color: red">*</span>{{ $t("delivery.destCountry") }}</span>
             <el-form-item
                 label=""
                 label-width="0"
                 style="margin-bottom: 0"
                 prop="destCountryId"
                 required
-                :error="$t('请选择目的国')"
+                :error="$t('delivery.destCountryNotice')"
             >
               <el-select
                   v-model="form.destCountryId"
-                  :placeholder="$t('请选择目的国')"
+                  :placeholder="$t('delivery.destCountryNotice')"
                   clearable
                   @change="handleChangeDestCountry"
               >
@@ -327,7 +327,7 @@
           </el-descriptions-item>
 
           <!--服务-->
-          <el-descriptions-item :label="$t('增值服务')"
+          <el-descriptions-item :label="$t('delivery.addServices')"
                                 v-if="selectedRouter && (routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1)">
             <el-checkbox-group v-model="form.type">
               <el-checkbox label="1"
@@ -846,11 +846,11 @@
               </template>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('提单是否显示价格')" >
+          <el-descriptions-item :label="$t('delivery.displayBillLading')" >
             <el-form-item prop="displayBillLadingPrice" class="mb-0">
               <el-radio-group v-model="form.displayBillLadingPrice">
-                <el-radio :label="true">{{$t('显示')}}</el-radio>
-                <el-radio :label="false">{{$t('不显示')}}</el-radio>
+                <el-radio :label="true">{{$t('delivery.display')}}</el-radio>
+                <el-radio :label="false">{{$t('delivery.notDisplay')}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-descriptions-item>
@@ -876,7 +876,7 @@
             </el-form-item>
           </el-descriptions-item>
 
-          <el-descriptions-item :label="$t('外部仓库')" :span="2">
+          <el-descriptions-item :label="$t('delivery.externalWarehouse')" :span="2">
             <el-form-item prop="isExternalWarehouse" class="mb-0">
               <el-checkbox label="" v-model="form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox>
             </el-form-item>
@@ -884,7 +884,7 @@
               <div v-for="(item, index) in form.externalWarehouseDtoList" :key="index"
                    style="border-bottom: 1px solid #ccc; margin-bottom: 10px">
                 <div class="flex-1">
-                  <el-form-item :label="$t('装货时间')"
+                  <el-form-item :label="$t('delivery.loadingTime')"
                                 :prop="'externalWarehouseDtoList.' + index + '.estLoadingTime'"
                                 :rules="{
                               required: true, message: '装货时间不能为空', trigger: 'blur'
@@ -894,7 +894,7 @@
                   </el-form-item>
                 </div>
                 <div class="flex-1">
-                  <el-form-item :label="$t('装货地址')"
+                  <el-form-item :label="$t('delivery.loadingAddress')"
                                 :prop="'externalWarehouseDtoList.' + index + '.loadingAddress'"
                                 :rules="{
                               required: true, message: '装货地址不能为空', trigger: 'blur'