diff --git a/src/config/router.config.js b/src/config/router.config.js
index 3931722..d25302a 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -231,11 +231,12 @@ export const asyncRouterMap = [
         name: 'shop',
         component: RouteView,
         redirect: '/shop/index',
-        moduleKey: 'shop-manage',
+        moduleKey: 'merchant',
         meta: { title: '商户管理', icon: Icons.server, permission: ['/shop'] },
         children: [
           {
             path: '/shop/index',
+            moduleKey: 'merchant-manage',
             component: () => import(/* webpackChunkName: "server" */ '@/views/shop/Index'),
             meta: { title: '商户管理', keepAlive: false, permission: ['/shop/index'] },
           },
diff --git a/src/views/client/wxapp/Setting.vue b/src/views/client/wxapp/Setting.vue
index 04de472..c439043 100644
--- a/src/views/client/wxapp/Setting.vue
+++ b/src/views/client/wxapp/Setting.vue
@@ -207,6 +207,8 @@ export default {
               'new_product',
               'ranking_list',
               'service',
+              'square_dynamic',
+              'select_mechant'
             ])
           )
         })
diff --git a/src/views/manage/role/modules/EditForm.vue b/src/views/manage/role/modules/EditForm.vue
index badda6f..c59cadf 100644
--- a/src/views/manage/role/modules/EditForm.vue
+++ b/src/views/manage/role/modules/EditForm.vue
@@ -5,6 +5,7 @@
     :visible="visible"
     :confirmLoading="confirmLoading"
     :maskClosable="false"
+    :footer="storeVersion === 0 || (storeVersion === 1 && isSuper === 0) ? undefined : null"
     @ok="handleSubmit"
     @cancel="handleCancel"
   >
@@ -99,6 +100,14 @@ export default {
       }
     }
   },
+  computed: {
+    isSuper() {
+      return window.roles ? window.roles.isSuper : 0
+    },
+    storeVersion() {
+      return window.storeInfo ? window.storeInfo.store_version : 0
+    }
+  },
   methods: {
 
     // 显示对话框
diff --git a/src/views/shop/Index.vue b/src/views/shop/Index.vue
index 7773c1c..8435356 100644
--- a/src/views/shop/Index.vue
+++ b/src/views/shop/Index.vue
@@ -72,10 +72,14 @@ export default {
           dataIndex: 'is_select_mechant',
           scopedSlots: { customRender: 'is_select_mechant' }
         },
-        // {
-        //   title: '排序',
-        //   dataIndex: 'sort'
-        // },
+        {
+          title: '累计金额',
+          dataIndex: 'total_amount'
+        },
+        {
+          title: '可用金额',
+          dataIndex: 'available_amount'
+        },
         {
           title: '添加时间',
           dataIndex: 'create_time'