分支合并冲突

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>

apps/bigmember_pc/src/components/subscribe-manager/SubConfig.vue

@@ -259,15 +259,10 @@ export default {
       timeout: null,
       entStatus: false,
       districtMapData: {},
-<<<<<<< HEAD
-      areaMapData: {},
+      areaMapData: this.area,
       regionMapData: this.regionMap,
       matchType: ['title'],
       keywordMatchTypeList
-=======
-      areaMapData: this.area,
-      regionMapData: this.regionMap
->>>>>>> main
     }
   },
   watch: {

apps/bigmember_pc/src/components/subscribe-manager/index.vue

@@ -95,11 +95,8 @@ export default {
         // 县区
         district: {}
       },
-<<<<<<< HEAD
-      setStatus: true
-=======
+      setStatus: true,
       showSetKeyDialog: false
->>>>>>> main
     }
   },
   watch: {
@@ -474,7 +471,6 @@ export default {
       padding: 0 0 32px;
     }
   }
-<<<<<<< HEAD
   .prevent-loading{
     opacity: 0;
   }
@@ -487,7 +483,6 @@ export default {
       }
     }
   }
-=======
   .custom-dialog.setkey-dialog {
     z-index: 2100 !important;
     .el-dialog__header {
@@ -504,6 +499,5 @@ export default {
   position: absolute;
   cursor: pointer;
   top: calc(100% + 100px);
->>>>>>> main
 }
 </style>