diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index 49cdd6e..ac0dbdf 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -10,7 +10,7 @@ export default {
       url: 'operation-management/permission',
       perms: 'operation-management:permission',
       type: 0,
-      elIcon: 'el-icon-setting',
+      elIcon: 'el-icon-key',
       orderNum: 0,
       open: null,
       list: [
@@ -35,7 +35,7 @@ export default {
           url: 'operation-management/permission/merchant-account/index',
           perms: 'operation-management:permission:merchant-account:index',
           type: 1,
-          elIcon: 'el-icon-user-solid',
+          elIcon: 'el-icon-s-custom',
           orderNum: 0,
           open: null,
           list: []
@@ -50,7 +50,7 @@ export default {
       url: 'operation-management/order/index',
       perms: 'operation-management:order:index',
       type: 1,
-      elIcon: 'el-icon-tickets',
+      elIcon: 'el-icon-document',
       orderNum: 0,
       open: null,
       list: []
@@ -129,7 +129,7 @@ export default {
       url: 'content-management',
       perms: 'content-management',
       type: 0,
-      elIcon: 'el-icon-document',
+      elIcon: 'el-icon-edit',
       orderNum: 0,
       open: null,
       list: [
@@ -141,7 +141,7 @@ export default {
           url: 'operation-management/notice/index',
           perms: 'operation-management:notice:index',
           type: 1,
-          elIcon: 'el-icon-menu',
+          elIcon: 'el-icon-bell',
           orderNum: 0,
           open: null,
           list: []
@@ -154,7 +154,7 @@ export default {
           url: 'operation-management/paynotice/index',
           perms: 'operation-management:paynotice:index',
           type: 1,
-          elIcon: 'el-icon-menu',
+          elIcon: 'el-icon-warning',
           orderNum: 0,
           open: null,
           list: []
@@ -167,7 +167,7 @@ export default {
           url: 'operation-management/banner/index',
           perms: 'operation-management:banner:index',
           type: 1,
-          elIcon: 'el-icon-menu',
+          elIcon: 'el-icon-picture',
           orderNum: 0,
           open: null,
           list: []
@@ -200,6 +200,72 @@ export default {
         // }
       ]
     },
+    {
+      menuId: getUUID(),
+      parentId: 0,
+      parentName: null,
+      name: '菜市场管理',
+      url: 'market',
+      perms: 'market',
+      type: 0,
+      elIcon: 'el-icon-office-building',
+      orderNum: 0,
+      open: null,
+      list: [
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: '摊位列表',
+          url: 'market/stall/index',
+          perms: 'market:stall:index',
+          type: 1,
+          elIcon: 'el-icon-s-shop',
+          orderNum: 0,
+          open: null,
+          list: []
+        },
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: '专员列表',
+          url: 'market/assistant/index',
+          perms: 'market:assistant:index',
+          type: 1,
+          elIcon: 'el-icon-user-solid',
+          orderNum: 0,
+          open: null,
+          list: []
+        },
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: '市场基础配置',
+          url: 'market/config/index',
+          perms: 'market:config:index',
+          type: 1,
+          elIcon: 'el-icon-setting',
+          orderNum: 0,
+          open: null,
+          list: []
+        },
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: '同城运费配置',
+          url: 'market/city/index',
+          perms: 'market:city:index',
+          type: 1,
+          elIcon: 'el-icon-map-location',
+          orderNum: 0,
+          open: null,
+          list: []
+        }
+      ]
+    },
     // {
     //     "menuId": 999,
     //     url: 'http://localhost:8082/',
@@ -244,7 +310,7 @@ export default {
           url: 'operation-management/market-list/index',
           perms: 'operation-management:market-list:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-office-building',
           orderNum: 0,
           open: null,
           list: []
@@ -257,7 +323,7 @@ export default {
           url: 'operation-management/shop-list/index',
           perms: 'operation-management:shop-list:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-s-shop',
           orderNum: 0,
           open: null,
           list: []
@@ -270,7 +336,7 @@ export default {
           url: 'operation-management/brand-store/index',
           perms: 'operation-management:brand-store:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-medal',
           orderNum: 0,
           open: null,
           list: []
@@ -283,7 +349,7 @@ export default {
           url: 'operation-management/brand-market/index',
           perms: 'operation-management:brand-market:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-medal-1',
           orderNum: 0,
           open: null,
           list: []
@@ -296,7 +362,7 @@ export default {
           url: 'operation-management/distributor/index',
           perms: 'operation-management:distributor:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-connection',
           orderNum: 0,
           open: null,
           list: []
@@ -309,7 +375,7 @@ export default {
           url: 'operation-management/total-order/index',
           perms: 'operation-management:total-order:index',
           type: 1,
-          elIcon: 'el-icon-menu',
+          elIcon: 'el-icon-tickets',
           orderNum: 0,
           open: null,
           list: [],
@@ -323,11 +389,11 @@ export default {
           url: 'operation-management/brand-order/index',
           perms: 'operation-management:brand-order:index',
           type: 1,
-          elIcon: 'el-icon-menu',
+          elIcon: 'el-icon-document',
           orderNum: 0,
           open: null,
           list: []
-        },
+        }
         // {
         //   menuId: getUUID(),
         //   parentId: 0,
@@ -365,7 +431,7 @@ export default {
       url: 'bank-card/index',
       perms: 'bank-card:index',
       type: 0,
-      elIcon: 'el-icon-picture-outline',
+      elIcon: 'el-icon-bank-card',
       orderNum: 0,
       open: null,
       list: [],
@@ -391,7 +457,7 @@ export default {
           url: 'brand/config/index',
           perms: 'brand:config:index',
           type: 1,
-          elIcon: 'el-icon-postcard',
+          elIcon: 'el-icon-medal',
           orderNum: 0,
           open: null,
           list: []
@@ -431,7 +497,7 @@ export default {
           url: 'presale/products/index',
           perms: 'presale:products:index',
           type: 1,
-          elIcon: 'el-icon-postcard',
+          elIcon: 'el-icon-goods',
           orderNum: 0,
           open: null,
           list: []
@@ -444,7 +510,7 @@ export default {
           url: 'presale/order/index',
           perms: 'presale:order:index',
           type: 1,
-          elIcon: 'el-icon-postcard',
+          elIcon: 'el-icon-document',
           orderNum: 0,
           open: null,
           list: []
@@ -525,7 +591,7 @@ export default {
           url: 'marketing/points-mall/index',
           perms: 'marketing:points-mall:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-goods',
           orderNum: 0,
           open: null,
           list: []
@@ -538,7 +604,7 @@ export default {
           url: 'marketing/points-order/index',
           perms: 'marketing:points-order:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-document',
           orderNum: 0,
           open: null,
           list: []
@@ -565,7 +631,7 @@ export default {
           url: 'agent/data-panel/index',
           perms: 'agent:data-panel:index',
           type: 1,
-          elIcon: 'el-icon-user',
+          elIcon: 'el-icon-s-data',
           orderNum: 0,
           open: null,
           list: []
@@ -578,7 +644,7 @@ export default {
           url: 'agent/brand/index',
           perms: 'agent:brand:index',
           type: 1,
-          elIcon: 'el-icon-data-analysis',
+          elIcon: 'el-icon-medal',
           orderNum: 0,
           open: null,
           list: []
@@ -591,7 +657,7 @@ export default {
           url: 'agent/report-form/index',
           perms: 'agent:report-form:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-data-analysis',
           orderNum: 0,
           open: null,
           list: []
@@ -604,7 +670,7 @@ export default {
           url: 'agent/jurisdiction/index',
           perms: 'agent:jurisdiction:index',
           type: 1,
-          elIcon: 'el-icon-shopping-cart-full',
+          elIcon: 'el-icon-key',
           orderNum: 0,
           open: null,
           list: []
@@ -632,7 +698,7 @@ export default {
           url: 'wallet/index',
           perms: 'wallet:index',
           type: 1,
-          elIcon: 'el-icon-menu',
+          elIcon: 'el-icon-wallet',
           orderNum: 0,
           open: null,
           list: []
@@ -659,7 +725,7 @@ export default {
           url: 'logistics-fare/logistics-template/index',
           perms: 'logistics-fare:logistics-template:index',
           type: 1,
-          elIcon: 'el-icon-postcard',
+          elIcon: 'el-icon-document-copy',
           orderNum: 0,
           open: null,
           list: []
@@ -723,4 +789,4 @@ export default {
   ],
   code: 0,
   permissions: []
-}
\ No newline at end of file
+}
diff --git a/src/views/modules/market/assistant/index.vue b/src/views/modules/market/assistant/index.vue
new file mode 100644
index 0000000..5ca345d
--- /dev/null
+++ b/src/views/modules/market/assistant/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>专员列表</div>
+</template>
diff --git a/src/views/modules/market/city/index.vue b/src/views/modules/market/city/index.vue
new file mode 100644
index 0000000..186e3f5
--- /dev/null
+++ b/src/views/modules/market/city/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>同城运费配置</div>
+</template>
diff --git a/src/views/modules/market/config/index.vue b/src/views/modules/market/config/index.vue
new file mode 100644
index 0000000..1177b87
--- /dev/null
+++ b/src/views/modules/market/config/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>市场基础配置</div>
+</template>
diff --git a/src/views/modules/market/stall/index.vue b/src/views/modules/market/stall/index.vue
new file mode 100644
index 0000000..2a1aecd
--- /dev/null
+++ b/src/views/modules/market/stall/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>摊位列表</div>
+</template>
diff --git a/src/views/modules/operation-management/permission/merchant-account/index.vue b/src/views/modules/operation-management/permission/merchant-account/index.vue
index b21c223..02523ef 100644
--- a/src/views/modules/operation-management/permission/merchant-account/index.vue
+++ b/src/views/modules/operation-management/permission/merchant-account/index.vue
@@ -9,7 +9,7 @@
       style="max-width: 600px"
     >
       <el-form-item
-        v-if="!marketId && markets.length > 0"
+        v-if="!marketId && marketList.length > 0"
         label="选择市场"
         prop="selectedMarketId"
       >
@@ -19,7 +19,7 @@
           style="width: 100%"
         >
           <el-option
-            v-for="market in markets"
+            v-for="market in marketList"
             :key="market.marketId"
             :label="market.marketName"
             :value="market.marketId"
@@ -427,7 +427,6 @@ export default {
       'storeList',
       'marketId',
       'shopId',
-      'markets'
     ]),
     uploadUrl() {
       return mer_admin.uploadFile()