修改冲突route

src/router/router.js

@@ -78,7 +78,7 @@ const createGood = r => require.ensure([], () => r(require('../views/goods/creat
 const orderManage = r => require.ensure([], () => r(require('../views/goods/order-manage.vue')), 'order-manage')
 const orderDetail = r => require.ensure([], () => r(require('../views/goods/order-detail.vue')), 'order-detail')
 const plazaList = r => require.ensure([], () => r(require('../views/plaza/plaza-list.vue')), 'plaza-list')
-const createPlaza = r => require.ensure([], () => r(require('../views/plaza/create-plaza.vue')), 'create-plaza')
+const activityMember = r => require.ensure([], () => r(require('../views/activitymanagement/activity-member.vue')), 'activity-member')
 
 
 export default [{
@@ -334,8 +334,8 @@ export default [{
             component: plazaList,
         },
         {
-            path: '/create-plaza',
-            component: createPlaza,
+            path: '/activity-member',
+            component: activityMember,
         },
 
       // {

src/utils/activitymanagement/activitymanagementApi.js

@@ -14,6 +14,7 @@ export const getOnlineCircleList = () => {
     description: '获取所有已上线的圈子列表',
   })
 };
+
 export const getActivityInfoReq = (activityId) => {
   return fetch({
   headers,
@@ -31,3 +32,37 @@ export const getActivityInfoReq = (activityId) => {
       description: '专区活动列表与搜索',
     })
   };
+
+
+
+export const getActivityDocList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/activity/doctor/list`),
+    method: 'get',
+    params: params,
+    description: '后台管理--专区活动成员列表与搜索',
+  })
+};
+
+
+export const removeDoc = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/activity/doctor/remove`),
+    method: 'post',
+    data: params,
+    description: '后台管理--专区活动成员移除',
+  })
+};
+
+export const importDoc = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/activity/doctor/import/${params.activityId}/${params.importType}`),
+    method: 'post',
+    data: params,
+    description: '后台管理--专区活动成员导入',
+  })
+};
+

src/views/activitymanagement/activity-management.vue

@@ -90,7 +90,7 @@
               <!--<el-button @click="liveManage(scope.row)" type="text" size="small" v-if="scope.row.status != 0">直播管理</el-button>-->
               <!--<el-button @click="roleManage(scope.row)" type="text" size="small" v-if="scope.row.status != 0">成员管理</el-button>-->
               <el-button @click="editRange(scope.row)" type="text" size="small">编辑</el-button>
-              <el-button @click="deleteRange(scope.row)" type="text" size="small" v-if="showAllFlag && scope.row.status != 0">活动成员管理</el-button>
+              <el-button @click="activityManage(scope.row)" type="text" size="small">活动成员管理</el-button>
               <!--<el-button @click="setting(scope.row)" type="text" size="small" v-if="scope.row.status != 0 && showNewFlag">应用配置</el-button>-->
               <el-button @click="rangeManage(scope.row)" type="text" size="small" v-if="scope.row.status != 0">删除</el-button>
             </div>
@@ -287,7 +287,6 @@ export default {
       let params = this.searchForm;
 
       console.log('查询活动列表')
-      debugger
       getActivityList(params).then((res) => {
         closeLoading(this);
         if(res.code == "000000") {
@@ -441,6 +440,19 @@ export default {
       });
     },
 
+
+
+    activityManage(row){
+      this.$router.push({
+        path: '/activity-member',
+        query: {
+          id: row.id,
+          name: row.name,
+          activeName: 'first',
+        }
+      })
+    },
+
     // 应用配置
     setting(row){
       this.dialogSettingVisible = true;