Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/pickupLoc/index.vue

@@ -47,7 +47,11 @@
     <el-table v-loading="loading" :data="list" @sort-change="sortChange">
       <el-table-column :label="$t('序号')" type="index" width="50" />
 
-      <el-table-column :label="$t('提货点名称')" align="center" :prop="$l('title')" />
+      <el-table-column :label="$t('提货点名称')" align="center"  >
+        <template v-slot="{row}">
+          {{$l(row,'title')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('排序')" sortable="custom" align="center" prop="sort" />
 
       <el-table-column :label="$t('地区')" align="center" prop="countryId">
@@ -132,10 +136,12 @@ import { createPickupLoc, updatePickupLoc, deletePickupLoc, getPickupLoc, getPic
 import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 import { getListTree } from "@/api/ecw/region";
+import Template from "@/views/cms/template/index.vue";
 
 export default {
   name: "PickupLoc",
   components: {
+    Template
   },
   data() {
     return {
@@ -229,7 +235,7 @@ export default {
     getCountryName(countryId) {
       for(let index in this.countryList) {
         let country = this.countryList[index];
-        if(country.id == countryId) return $l(country, 'title');
+        if(country.id == countryId) return this.$l(country, 'title');
       }
     },