Merge branch 'mergeBranch' into allTestUrgent

src/HManagement/accountManage/modules/account_detail.vue

@@ -213,7 +213,7 @@ export default {
       console.log(this.mainAreaData)
     },
     selectRow (data) {
-      this.$confirm(`${$t('确定将数据转移给')}“${data.name}”?`,this.$t('提示'),{
+      this.$confirm(`${this.$t('确定将数据转移给')}“${data.name}”?`,this.$t('提示'),{
         confirmButtonText:this.$t('确定'),
         cancelButtonText:this.$t('取消'),
         type:'warning'

src/HManagement/marketing/area/modules/start_area.vue

@@ -19,7 +19,7 @@ export default {
   },
   methods:{
     append () {
-      this.$confirm(`${$t('是否')}${this.data.isused === 1?this.$t('停 用'):this.$t('启 用')}${this.$t('当前区域')}?`, this.$t('提示'), {
+      this.$confirm(`${this.$t('是否')}${this.data.isused === 1?this.$t('停 用'):this.$t('启 用')}${this.$t('当前区域')}?`, this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'

src/HManagement/marketing2/salerScope/area/modules/start_area.vue

@@ -22,7 +22,7 @@ export default {
   },
   methods:{
     append () {
-      this.$confirm(`${$t('是否')}${this.data.isused === 1?this.$t('停用'):this.$t('启用')}${$t('当前区域')}?`, this.$t('提示'), {
+      this.$confirm(`${this.$t('是否')}${this.data.isused === 1?this.$t('停用'):this.$t('启用')}${this.$t('当前区域')}?`, this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'