Merge branch 'feature/7月基础一异常冻结会员' into dev

* feature/7月基础一异常冻结会员:
  bug 修复-列表进详情 返回刷新

src/components/allCustomers/index.js

@@ -248,6 +248,9 @@ export default {
     this.getAjaxMembers();
     this.getEnterpriseInfo();
   },
+  activated(){
+    this.getAjaxMembers();
+  },
   beforUpdate() {},
   methods: {
     onSelectTreeChange(data) {

src/components/wechatmembers/abnormal-member/abnormal-setting/abnormal-setting.js

@@ -507,7 +507,7 @@ export default {
             this.submit();
           } else {
             this.$confirm(
-              `修改“异常规则”后，次日【异常会员】列表将全量更新，系统会根据最新的异常规则来判断“异常会员”并展示在列表中`,
+              `确定修改规则配置后，次日异常会员列表会全量更新（只调整“是否自动冻结”，不算调整异常判定规则，不会全量更新）`,
               "确定修改异常会员规则配置",
               {
                 confirmButtonText: "确定",

src/router/index.js

@@ -43,6 +43,8 @@ export const constantRouterMap = [
         meta: {
           title: '全部客户',
           keepAlive: true,
+          componentName: 'allCustomersList',
+          fromPath: ['/customerDetail'],
         },
       },
       {
@@ -131,7 +133,7 @@ export const constantRouterMap = [
         meta: {
           title: '冻结会员列表',
           componentName: 'forzenlist',
-          fromPath: ['/customersDetail','/frozenWhiteList','/frozenList/frozenMember'],
+          fromPath: ['/customerDetail','/frozenWhiteList','/frozenList/frozenMember'],
         },
       },
       {
@@ -140,7 +142,7 @@ export const constantRouterMap = [
         meta: {
           title: '冻结会员白名单',
           componentName: 'frozenMemberWhiteList',
-          fromPath: ['/customersDetail'],
+          fromPath: ['/customerDetail'],
         },
       },
       {
@@ -149,7 +151,7 @@ export const constantRouterMap = [
         meta: {
           title: '冻结会员',
           componentName: 'frozen-member',
-          fromPath: ['/customersDetail'],
+          fromPath: ['/customerDetail'],
         },
       },
       {