Merge branch 'mergeBranch' into allTestUrgent

src/WebsiteManagement/dataStatistics/index.vue

@@ -171,7 +171,7 @@ export default {
         })
         .then((res) => {
           if (res.code != 1) return;
-          let type = this.$t("重复访客数量");
+          let type = this.$t("访问量");
           let list = res.data.map((v) => {
             v.type = type;
             return v;

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -142,6 +142,9 @@
           <div v-else-if="scope.column.columnname == 'scale'">
             <span>{{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]] + scope.column.data.unitname:'--'}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'address'">
+            <span>{{scope.column.data.province?scope.column.data.province + scope.column.data.city + scope.column.data.county + scope.column.data[[scope.column.columnname]]:'--'}}</span>
+          </div>
           <div v-else>
             {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
           </div>