diff --git a/epmet-oper-web/src/App.vue b/epmet-oper-web/src/App.vue
index 89fa5d2..20a9614 100644
--- a/epmet-oper-web/src/App.vue
+++ b/epmet-oper-web/src/App.vue
@@ -80,6 +80,7 @@ export default {
       Vue.prototype.$ELEMENT = { size: 'medium', zIndex: 3000 }
     }
 
+
     window.onresize = () => {
       return (() => {
         if (!that.timer) {
diff --git a/epmet-oper-web/src/assets/scss/variables.scss b/epmet-oper-web/src/assets/scss/variables.scss
index 81814d1..171d572 100644
--- a/epmet-oper-web/src/assets/scss/variables.scss
+++ b/epmet-oper-web/src/assets/scss/variables.scss
@@ -12,11 +12,16 @@ $sidebar--text-color-dark: #8a979e;
 $sidebar--menu-item-height: 48px;
 
 // Content
-$content--padding: 15px; 
+$content--padding: 10px;
 $content--background-color: #f1f4f5;
 $content--card-header-height: 60px;
 $content--tabs-header-height: 38px;
 // Content, 填充整屏高度(非tabs状态) = 整屏高度 - 导航条高度 - aui-content上下内边距高度
-$content--fill-height: calc(100vh - #{$navbar--height} - #{$content--padding * 2});
+$content--fill-height: calc(
+  100vh - #{$navbar--height} - #{$content--padding * 2}
+);
 // Content, 填充整屏高度(是tabs状态) = 整屏高度 - 导航条高度 - tabs组件header高度 - tabs组件content上下内边距高度
-$content--fill-height-tabs: calc(100vh - #{$navbar--height} - #{$content--tabs-header-height} - #{$content--padding * 2});
+$content--fill-height-tabs: calc(
+  100vh - #{$navbar--height} - #{$content--tabs-header-height} - #{$content--padding *
+    2}
+);
diff --git a/epmet-oper-web/src/js/columns/columns.js b/epmet-oper-web/src/js/columns/columns.js
index 7526a94..0803124 100644
--- a/epmet-oper-web/src/js/columns/columns.js
+++ b/epmet-oper-web/src/js/columns/columns.js
@@ -10,6 +10,9 @@ import Category from './code/category'
 
 // 产品配置
 import CustomizedFunction from './miniPro/customizedFunction'
+import FootBar from './productConfig/footBar'
+
+//外部客户
 import partner from './miniPro/partner'
 import partnerApp from './miniPro/partnerApp'
 
@@ -25,10 +28,12 @@ export default {
   OperHistory: OperHistory, // 客户管理——代小程序管理——版本管理——操作历史
   Category: Category, // 客户管理——代小程序管理——类目
 
-  // 小程序管理
-  CustomizedFunction: CustomizedFunction, // 定制功能
+  FootBarCustomize: FootBar['customize'], // 客户定制化——FootBar配置
+
+  CustomizedFunction: CustomizedFunction, // 产品配置——定制功能
+  FootBar: FootBar['default'], // 产品配置——FootBar配置
 
   // 外部客户
   partnerApp, // 外部客户
   partner // 外部客户应用
-}
\ No newline at end of file
+}
diff --git a/epmet-oper-web/src/js/columns/customer/manage/customer.js b/epmet-oper-web/src/js/columns/customer/manage/customer.js
index b690b62..97924dc 100644
--- a/epmet-oper-web/src/js/columns/customer/manage/customer.js
+++ b/epmet-oper-web/src/js/columns/customer/manage/customer.js
@@ -77,7 +77,7 @@ export default {
     },
     {
       key: 'rootManageName',
-      title: '跟管理员',
+      title: '根管理员',
       display: ['table', 'model'],
       type: 'input',
       rule: [
diff --git a/epmet-oper-web/src/js/columns/productConfig/footBar.js b/epmet-oper-web/src/js/columns/productConfig/footBar.js
new file mode 100644
index 0000000..7c7123c
--- /dev/null
+++ b/epmet-oper-web/src/js/columns/productConfig/footBar.js
@@ -0,0 +1,132 @@
+export default {
+  default: [
+    {
+      key: 'barKey',
+      title: 'Key',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 80
+    },
+    {
+      key: 'barName',
+      title: '导航栏名称',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 80
+    },
+    {
+      key: 'pageTitle',
+      title: '页面标题',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 120
+    },
+    {
+      key: 'iconPath',
+      title: '图标',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: 100,
+      width: 120,
+      tableType: 'image',
+      imgWidth: '50px',
+      imgHeight: '50px'
+    },
+    {
+      key: 'selectedIconPath',
+      title: '选中图标',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 100,
+      tableType: 'image',
+      imgWidth: '50px',
+      imgHeight: '50px'
+    },
+    {
+      key: 'display',
+      title: '状态',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 80,
+      format: (cellValue, index) => {
+        if (cellValue === 0) {
+          return '隐藏'
+        } else if (cellValue === 1) {
+          return '显示'
+        } else {
+          return '未知'
+        }
+      }
+    }
+  ],
+  customize: [
+    {
+      key: 'defaultName',
+      title: '默认导航栏名称',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 80
+    },
+    {
+      key: 'barName',
+      title: '导航栏名称',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 80
+    },
+    {
+      key: 'pageTitle',
+      title: '页面标题',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 120
+    },
+    {
+      key: 'iconPath',
+      title: '图标',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: 100,
+      width: 120,
+      tableType: 'image',
+      imgWidth: '50px',
+      imgHeight: '50px'
+    },
+    {
+      key: 'selectedIconPath',
+      title: '选中图标',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 100,
+      tableType: 'image',
+      imgWidth: '50px',
+      imgHeight: '50px'
+    },
+    {
+      key: 'display',
+      title: '状态',
+      display: ['formA', 'formU', 'table', 'model'],
+      fixed: false,
+      block: true,
+      width: 80,
+      format: (cellValue, index) => {
+        if (cellValue === 0) {
+          return '隐藏'
+        } else if (cellValue === 1) {
+          return '显示'
+        } else {
+          return '未知'
+        }
+      }
+    }
+  ]
+}
diff --git a/epmet-oper-web/src/views/components/CForm.vue b/epmet-oper-web/src/views/components/CForm.vue
index 6a8f672..b21b1ee 100644
--- a/epmet-oper-web/src/views/components/CForm.vue
+++ b/epmet-oper-web/src/views/components/CForm.vue
@@ -525,9 +525,16 @@ export default {
       this.model = window.app.service.getModel(this.keyWord)
     },
     validate (callback) {
-      this.$refs['form'].validate((valid) => {
+      this.$refs['form'].validate((valid, messageObj) => {
         if (!valid) {
-          this.$message.error('表单验证失败!')
+          let message = ''
+          for (var oneObj in messageObj) {
+
+            message = message + (messageObj[oneObj])[0].message + ' \n '
+          }
+
+          this.$message.error(message)
+
         } else {
           if (typeof callback === 'function') callback(valid)
         }
diff --git a/epmet-oper-web/src/views/components/CTableNoPage.vue b/epmet-oper-web/src/views/components/CTableNoPage.vue
index 404058a..45e86b6 100644
--- a/epmet-oper-web/src/views/components/CTableNoPage.vue
+++ b/epmet-oper-web/src/views/components/CTableNoPage.vue
@@ -37,7 +37,7 @@
       </div>
       <template v-for="col in tableColumn">
         <!--渲染列-->
-        <el-table-column v-if="col.render"
+        <el-table-column v-if="col.tableType==='span'"
                          :key="col.key"
                          :label="col.title"
                          :min-width="col.width"
@@ -49,8 +49,27 @@
             <span v-html="col.render(scope.row[col.key])"></span>
           </template>
         </el-table-column>
+        <!--图片列-->
+        <el-table-column v-if="col.tableType==='image'"
+                         :key="col.key"
+                         :label="col.title"
+                         :min-width="col.width"
+                         :fixed="col.isFrozen"
+                         show-overflow-tooltip
+                         :align="'center'"
+                         :header-align="headerAlign"
+                         :formatter="col.formatter">
+          <template slot-scope="scope">
+            <img v-if="scope.row[col.key]"
+                 :src="scope.row[col.key]"
+                 :style="{width: col.imgWidth?col.imgWidth:'50px',height:col.imgHeight?col.imgHeight:'50px'}"
+                 class="function-icon"
+                 :fit=" col.fill?col.fill:'fill'">
+
+          </template></el-table-column>
+
         <!--普通列-->
-        <el-table-column v-else
+        <el-table-column v-if="!col.tableType||col.tableType===''"
                          :key="col.key"
                          :label="col.title"
                          :min-width="col.width"
@@ -60,6 +79,31 @@
                          :header-align="headerAlign"
                          :formatter="col.formatter"></el-table-column>
       </template>
+      <!--排序操作列-->
+      <el-table-column v-if="orderOperations.length && orderOperations.length > 0"
+                       label="移动"
+                       :width="orderOperationWidth"
+                       fixed="right"
+                       align="center"
+                       header-align="center"
+                       class="operate">
+        <template slot-scope="scope">
+
+          <!-- <el-button type="text"
+                         style="width=100px;height=100px"
+               
+                         icon="el-icon-top"></el-button> -->
+
+          <el-button v-for="(item,index) in orderOperations"
+                     :key="index"
+                     :style=item.style
+                     :type=item.type
+                     :size=item.size
+                     :icon=item.icon
+                     :plain=item.plain
+                     @click.stop="handleMethod(scope.$index, scope.row,item.methodName)"></el-button>
+        </template>
+      </el-table-column>
       <!--操作列-->
       <el-table-column v-if="operations.length && operations.length > 0"
                        label="操作"
@@ -69,13 +113,13 @@
                        class="operate">
         <template slot-scope="scope">
           <!--传入的操作按钮属性    lyx   20190411   -->
-          <el-button v-for="item in operations"
-                     :key="item.lable"
+          <el-button v-for="(item,index) in operations"
+                     :key="index"
                      :style=item.style
                      :type=item.type
                      :size=item.size
                      :plain=item.plain
-                     @click.stop="handleMethod(scope.$index, scope.row,item.methodName)">{{item.lable}}</el-button>
+                     @click.stop="handleMethod(scope.$index, scope.row,item.methodName)">{{typeof (item.lable) === 'function'?(item.lable)(scope.row[item.key]) :item.lable}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -140,17 +184,27 @@ export default {
         return [{}]
       }
     },
+    orderOperations: {
+      type: Array,
+      default () {
+        return [{}]
+      }
+    },
     tableHeight: {
       type: Number
     },
     pageVisible: Boolean // 是否显示page分页     lyx   20190411
   },
+  activated () {
+    // debugger
+    // this.$nextTick(() => {
+    //   this.$refs.table.doLayout() // 解决表格错位
+    // })
+  },
   computed: {
     // 操作列宽度
-    operationWidth: function () {
-      //  return this.operations.includes('add')
-      //    ? (this.operations.length - 1) * 80
-      //    : this.operations.length * 80
+    operationWidth: function() {
+
       if (this.operations.includes('add')) {
         return (this.operations.length - 1) * 80 // 操作列包含add类型按钮时返回
       } else if (this.operations.includes('analyze')) {
@@ -159,6 +213,13 @@ export default {
         return this.operations.length * 80
       }
     },
+    // 移动操作列宽度
+    orderOperationWidth: function() {
+
+
+      return this.orderOperations.length * 50
+
+    },
     ...mapGetters(['resolution'])
   },
   methods: {
@@ -166,6 +227,7 @@ export default {
       this.loadData()
     },
     loadData () {
+      this.$refs.table.doLayout() // 解决表格错位
       this.templateRadio = ''
       this.loading = true
       Object.keys(this.params).forEach(key => {
@@ -181,6 +243,7 @@ export default {
         (data, rspMsg) => {
           if (data) {
             this.tableData = data
+
           }
           this.loading = false
         },
@@ -256,8 +319,13 @@ export default {
     handleMethod (index, row, methodName) {
       this.handleClearSelection()
       this.$refs['table'].toggleRowSelection(row, true)
-      this.$emit(methodName, row)
+      this.$emit(methodName, row, index)
+    },
+    getTableData () {
+      return this.tableData
     }
+
+
   }
 }
 </script>
diff --git a/epmet-oper-web/src/views/main-content.vue b/epmet-oper-web/src/views/main-content.vue
index 3c85a63..174cd4d 100644
--- a/epmet-oper-web/src/views/main-content.vue
+++ b/epmet-oper-web/src/views/main-content.vue
@@ -34,7 +34,8 @@
                   frameborder="0"
                   scrolling="yes"></iframe>
           <keep-alive v-else>
-            <router-view v-if="item.name === $store.state.contentTabsActiveName" />
+            <router-view v-if="item.name === $store.state.contentTabsActiveName"
+                         @changeCustomerName="changeCustomerName" />
           </keep-alive>
         </el-tab-pane>
       </el-tabs>
@@ -56,12 +57,16 @@ export default {
     }
   },
   methods: {
+    changeCustomerName (customerName) {
+      this.$emit('changeCustomerName', customerName)
+    },
     // tabs, 是否通过iframe展示
     tabIsIframe (url) {
       return isURL(url)
     },
     // tabs, 选中tab
     tabSelectedHandle (tab) {
+      alert(111)
       tab = this.$store.state.contentTabs.filter(item => item.name === tab.name)[0]
       if (tab) {
         this.$router.push({
diff --git a/epmet-oper-web/src/views/main-navbar.vue b/epmet-oper-web/src/views/main-navbar.vue
index d1fa10f..038b406 100644
--- a/epmet-oper-web/src/views/main-navbar.vue
+++ b/epmet-oper-web/src/views/main-navbar.vue
@@ -96,7 +96,10 @@ export default {
   data () {
     return {
       i18nMessages: messages,
-      updatePassowrdVisible: false
+      updatePassowrdVisible: false,
+      customerName: localStorage.getItem('customerName')
+
+
     }
   },
   components: {
@@ -107,13 +110,12 @@ export default {
       return localStorage.getItem('userType')
     },
 
-    customerName () {
-      // console.log(localStorage.getItem('userType'))
-      return localStorage.getItem('customerName')
 
-    }
   },
   methods: {
+    changeCustomerName (customerName) {
+      this.customerName = localStorage.getItem('customerName')
+    },
     // 全屏
     fullscreenHandle () {
       if (!screenfull.enabled) {
diff --git a/epmet-oper-web/src/views/main-sidebar.vue b/epmet-oper-web/src/views/main-sidebar.vue
index 4c6de80..c88a7c6 100644
--- a/epmet-oper-web/src/views/main-sidebar.vue
+++ b/epmet-oper-web/src/views/main-sidebar.vue
@@ -26,7 +26,6 @@ export default {
   },
   created () {
     this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
-    console.log(this.$store.state.sidebarMenuList)
   }
 }
 </script>
diff --git a/epmet-oper-web/src/views/main.vue b/epmet-oper-web/src/views/main.vue
index 13d2102..65888a5 100644
--- a/epmet-oper-web/src/views/main.vue
+++ b/epmet-oper-web/src/views/main.vue
@@ -3,10 +3,11 @@
        :element-loading-text="$t('loading')"
        :class="['aui-wrapper', { 'aui-sidebar--fold': $store.state.sidebarFold }]">
     <template v-if="!loading">
-      <main-navbar />
+      <main-navbar ref="ref_navbar" />
       <main-sidebar />
       <div class="aui-content__wrapper">
-        <main-content v-if="!$store.state.contentIsNeedRefresh" />
+        <main-content v-if="!$store.state.contentIsNeedRefresh"
+                      @changeCustomerName="changeCustomerName" />
       </div>
       <main-theme-tools />
     </template>
@@ -70,6 +71,10 @@ export default {
   computed: {
   },
   methods: {
+    changeCustomerName (customerName) {
+      this.$refs['ref_navbar'].changeCustomerName(customerName)
+
+    },
     // 窗口改变大小
     windowResizeHandle () {
       this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
diff --git a/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue
index fbde498..7292618 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue
@@ -1,6 +1,7 @@
 <template>
   <el-dialog :visible.sync="visible"
              :title="'修改定制功能'"
+             :width="diaWidth+'%'"
              :close-on-click-modal="false"
              :before-close="handleClose"
              :close-on-press-escape="false">
@@ -98,7 +99,7 @@
 </template>
 
 <script>
-
+import { mapGetters } from 'vuex'
 export default {
   data () {
     return {
@@ -135,7 +136,12 @@ export default {
         ]
 
       }
-    }
+    },
+    diaWidth () {
+      console.log(this.resolution)
+      return this.resolution === 'small' ? 60 : 40
+    },
+    ...mapGetters(['clientHeight', 'resolution']),
   },
   methods: {
     init (dataForm) {
diff --git a/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue
index 4ffe80f..63c5c03 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue
@@ -35,14 +35,14 @@
           <el-table-column label="默认名称"
                            header-align="center"
                            align="center"
-                           width="150"
+                           width="120"
                            prop="customizedName">
 
           </el-table-column>
           <el-table-column label="自定义名称"
                            header-align="center"
                            align="center"
-                           width="150"
+                           width="120"
                            prop="functionName">
 
           </el-table-column>
@@ -100,7 +100,7 @@
 
               <el-button type="text"
                          style="width=100px;height=100px"
-                         @click.stop="moveUp( scope.$index)"
+                         @click.stop="moveUpResi( scope.$index)"
                          icon="el-icon-top"></el-button>
 
             </template>
@@ -125,10 +125,8 @@
                          @click.stop="upOrDown(scope.row.functionId, '0')">下架</el-button>
               <el-button size="mini"
                          type="primary"
-                         @click.stop="editShow( scope.$index)">修改</el-button>
-              <!-- <el-button size="mini"
-                     type="primary"
-                     @click.stop="moveUp( scope.$index)">上移</el-button> -->
+                         @click.stop="editResiShow( scope.$index)">修改</el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -223,7 +221,7 @@
           <el-table-column label="大图标"
                            header-align="center"
                            align="center"
-                           width="150"
+                           min-width="100"
                            prop="iconLargeImg">
             <template slot-scope="scope">
               <el-image v-if="scope.row.iconLargeImg"
@@ -238,7 +236,7 @@
           <el-table-column label="小图标"
                            header-align="center"
                            align="center"
-                           width="110"
+                           min-width="100"
                            prop="iconSmallImg">
             <template slot-scope="scope">
               <el-image v-if="scope.row.iconSmallImg"
@@ -267,7 +265,7 @@
 
               <el-button type="text"
                          style="width=100px;height=100px"
-                         @click.stop="moveUp( scope.$index)"
+                         @click.stop="moveUpWork( scope.$index)"
                          icon="el-icon-top"></el-button>
 
             </template>
@@ -292,10 +290,8 @@
                          @click.stop="upOrDown(scope.row.functionId, '0')">下架</el-button>
               <el-button size="mini"
                          type="primary"
-                         @click.stop="editShow( scope.$index)">修改</el-button>
-              <!-- <el-button size="mini"
-                     type="primary"
-                     @click.stop="moveUp( scope.$index)">上移</el-button> -->
+                         @click.stop="editWorkShow( scope.$index)">修改</el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -439,7 +435,7 @@ export default {
     tableHeight2 () {
       return (this.clientHeight - 220) / 2 - 60
     },
-    ...mapGetters(['clientHeight']),
+    ...mapGetters(['clientHeight', 'resolution']),
     dataRule () {
       return {
         customizedName: [
@@ -557,9 +553,13 @@ export default {
       this.endLoading()
     },
     // 编辑
-    editShow (index) {
+    editResiShow (index) {
       this.$refs['ref_config_edit'].init(this.resiHaveList[index])
     },
+    // 编辑
+    editWorkShow (index) {
+      this.$refs['ref_config_edit'].init(this.workHaveList[index])
+    },
     editDiaOK () {
       this.loadTableData()
     },
@@ -576,37 +576,8 @@ export default {
       this.upOrDownDia.visible = true
     },
 
-    // 上传大图标成功
-    handleLargeSuccess (res, file, index) {
-      if (res.code === 0 && res.msg === 'success') {
-        this.resiHaveList[index].iconLargeImg = res.data.url
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    // 上传小图标成功
-    handleSmallSuccess (res, file, index) {
-      if (res.code === 0 && res.msg === 'success') {
-        this.resiHaveList[index].iconSmallImg = res.data.url
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    beforeAvatarUpload (file) {
-      // const isPNG = file.type === 'image/png'
-      // const isLt1M = file.size / 1024 / 1024 < 1
-
-      // if (!isPNG) {
-      //   this.$message.error('上传头像图片只能是 PNG 格式!')
-      // }
-      // if (!isLt1M) {
-      //   this.$message.error('上传头像图片大小不能超过 1MB!')
-      // }
-      // return isPNG && isLt1M
-    },
-
     // 上移
-    moveUp (index) {
+    moveUpResi (index) {
       if (index > 0) {
         console.log(this.resiHaveList)
         this.startLoading()
@@ -654,6 +625,55 @@ export default {
         return false
       }
     },
+    // 上移
+    moveUpWork (index) {
+      if (index > 0) {
+        console.log(this.workHaveList)
+        this.startLoading()
+        let resultList = []
+        let one = {}
+        for (let i = 0; i < this.workHaveList.length; i++) {
+          let obj = {}
+          // eslint-disable-next-line
+          // debugger
+          if (i === index - 1) {
+            one.customerId = this.workHaveList[i].customerId
+            one.functionId = this.workHaveList[i].functionId
+            one.displayOrder = index
+          } else if (i === index) {
+            obj.customerId = this.workHaveList[i].customerId
+            obj.functionId = this.workHaveList[i].functionId
+            obj.displayOrder = index - 1
+            resultList.push(obj)
+            resultList.push(one)
+          } else {
+            obj.customerId = this.workHaveList[i].customerId
+            obj.functionId = this.workHaveList[i].functionId
+            obj.displayOrder = i
+            resultList.push(obj)
+          }
+        }
+        console.log(resultList)
+
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfunctiondetail/updatedisplayorder'
+        const url = '/oper/customize/customerfunctiondetail/updatedisplayorder'
+        window.app.ajax.post(url, resultList,
+          (data, rspMsg) => {
+            this.endLoading()
+            // this.$message.success('操作成功')
+            this.loadTableData()
+          },
+          (rspMsg, data) => {
+            this.endLoading()
+            this.$message.error(rspMsg)
+          })
+
+      } else {
+        this.$message.warning('无法上移')
+
+        return false
+      }
+    },
 
     // 取消
     diaCancel () {
diff --git a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
index 209c2db..3db22d2 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue
@@ -38,7 +38,7 @@
                            fixed="right"
                            header-align="center"
                            align="center"
-                           width="350">
+                           width="400">
             <template slot-scope="scope">
               <el-button type="text"
                          size="small"
@@ -49,6 +49,9 @@
               <el-button type="text"
                          size="small"
                          @click="showConfigItem(scope.row.customerId,scope.row.customerName)">功能配置</el-button>
+              <el-button type="text"
+                         size="small"
+                         @click="showFootbar(scope.row.customerId,scope.row.customerName)">FootBar配置</el-button>
               <el-button type="text"
                          size="small"
                          @click="showLimitConfig(scope.row.customerId,scope.row.customerName)">角色权限</el-button>
@@ -71,6 +74,10 @@
         <config-item ref="ref_config_item"
                      @cancleBack="cancleBack"></config-item>
       </div>
+      <div v-show="showType==='footbar'">
+        <footbar-list ref="ref_footbar"
+                      @cancleBack="cancleBack"></footbar-list>
+      </div>
 
       <el-dialog :visible.sync="funcVisible"
                  title="功能列表"
@@ -88,6 +95,7 @@
 
 <script>
 import ConfigItem from './ConfigItem'
+import FootbarList from './FootbarList'
 import MiniHome from './MiniHome'
 import RoleList from './roleList'
 export default {
@@ -114,7 +122,8 @@ export default {
   components: {
     ConfigItem,
     MiniHome,
-    RoleList
+    RoleList,
+    FootbarList
   },
   created () {
 
@@ -172,6 +181,11 @@ export default {
       this.showType = 'config'
       this.$refs['ref_config_item'].initData(customerId, customerName)
     },
+    // footbar配置
+    showFootbar (customerId, customerName) {
+      this.showType = 'footbar'
+      this.$refs['ref_footbar'].initData(customerId, customerName)
+    },
 
     // 显示权限配置
     showLimitConfig (customerId, customerName) {
diff --git a/epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue b/epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue
new file mode 100644
index 0000000..e87948e
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue
@@ -0,0 +1,317 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="'修改Footbar'"
+             :close-on-click-modal="false"
+             :before-close="handleClose"
+             :close-on-press-escape="false"
+             :width="60+'%'"
+             :top="'30px'">
+    <el-form :inline="true"
+             :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             :label-width="'120px'">
+      <el-form-item label="默认导航栏名称"
+                    prop="defaultName">
+        <div class="item_width_1">
+          <span>{{dataForm.defaultName}}</span>
+        </div>
+      </el-form-item>
+      <el-form-item label="导航栏名称"
+                    prop="barName">
+        <el-tooltip class="item"
+                    effect="dark"
+                    content="请输入2-5个字"
+                    placement="top-start">
+          <el-input class="item_width_1"
+                    oninput="if(value.length>5)value=value.slice(0,5)"
+                    v-model="dataForm.barName"
+                    placeholder="导航栏名称"></el-input>
+        </el-tooltip>
+      </el-form-item>
+      <el-form-item label="页面标题"
+                    prop="pageTitle">
+        <el-tooltip class="item"
+                    effect="dark"
+                    content="请输入2-10个字"
+                    placement="top-start">
+          <el-input class="item_width_1"
+                    oninput="if(value.length>10)value=value.slice(0,10)"
+                    v-model="dataForm.pageTitle"
+                    placeholder="页面标题"></el-input>
+        </el-tooltip>
+      </el-form-item>
+
+      <el-form-item label="App类型"
+                    prop="appType">
+        <el-select :disabled="type==='U'"
+                   class="item_width_1"
+                   v-model="dataForm.appType"
+                   placeholder="请选择"
+                   clearable>
+          <el-option v-for="item in fromAppList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item prop="iconPath"
+                    label="图标">
+        <el-upload class="item_width_1 avatar-uploader"
+                   :action="uploadUlr"
+                   :show-file-list="false"
+                   :on-success="function (res, file) { return handleImgSuccess(res, file, '')}"
+                   :before-upload="beforeImgUpload">
+          <img v-if="dataForm.iconPath"
+               :src="dataForm.iconPath"
+               style="width:70px;height:70px"
+               class="function-icon">
+          <i v-else
+             class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item prop="selectedIconPath"
+                    label="选中图标">
+        <el-upload class="item_width_1 avatar-uploader"
+                   :action="uploadUlr"
+                   :show-file-list="false"
+                   :on-success="function (res, file) { return handleImgSuccess(res, file, 'sel')}"
+                   :before-upload="beforeImgUpload">
+          <img v-if="dataForm.selectedIconPath"
+               :src="dataForm.selectedIconPath"
+               style="width:70px;height:70px"
+               class="function-icon">
+          <i v-else
+             class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="saveForm()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading// 加载动画
+export default {
+  data () {
+    return {
+      visible: false,
+      type: '', // 操作类型A/U
+      id: '', // 父组件传来功能id
+      dataForm: {
+        customerId: '',
+        barName: '',
+        barKey: '',
+        appType: '',
+        pageTitle: '',
+        iconPath: '',
+        selectedIconPath: ''
+
+      },
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload',
+      fromAppList: [
+        {
+          'dictName': '工作端',
+          'dictValue': 'gov'
+        }, {
+          'dictName': '居民端',
+          'dictValue': 'resi'
+        }
+      ]
+    }
+  },
+  created () {
+    // this.queryFunctionList()
+  },
+  computed: {
+    dataRule () {
+      return {
+        barKey: [
+          { required: true, message: 'Key不能为空', trigger: 'blur' }
+        ],
+        barName: [
+          { required: true, message: '导航栏标题不能为空', trigger: 'blur' }
+        ],
+        appType: [
+          { required: true, message: '类型不能为空', trigger: 'blur' }
+        ],
+        pageTitle: [
+          { required: true, message: '页面标题不能为空', trigger: 'blur' }
+        ],
+        iconPath: [
+          { required: true, message: '图标不能为空', trigger: 'blur' }
+        ],
+        selectedIconPath: [
+          { required: true, message: '选中图标不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init (id, type, appType) {
+      this.type = type
+      this.visible = true
+      this.id = id
+
+      if (type === 'A') {
+        this.dataForm = {
+          customerId: '',
+          barName: '',
+          barKey: '',
+          appType: appType,
+          pageTitle: '',
+          iconPath: '',
+          selectedIconPath: ''
+        }
+
+      } else {
+        this.loadFormData()
+      }
+    },
+
+    loadFormData () {
+      const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/footbardetail'
+      // const url = '/oper/customize/customerfootbar/footbardetail'
+      let _data = {
+        id: this.id
+      }
+      this.startLoading()
+      window.app.ajax.post(url, _data,
+        (data, rspMsg) => {
+          this.endLoading()
+          this.dataForm = data
+
+        },
+        (rspMsg, data) => {
+          this.endLoading()
+          this.$message.error(rspMsg)
+        })
+    },
+
+    // 上传大图标成功
+    handleImgSuccess (res, file, type) {
+      if (res.code === 0 && res.msg === 'success') {
+        if (type === 'sel') {
+          this.dataForm.selectedIconPath = res.data.url
+        } else if (type === 'small') {
+          this.dataForm.iconPath = res.data.url
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+
+    beforeImgUpload (file) {
+      // const isPNG = file.type === 'image/png'
+      const isLt1M = file.size / 1024 < 20
+
+      // if (!isPNG) {
+      //   this.$message.error('上传图片只能是 PNG 格式!')
+      // }
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 1MB!')
+      }
+      // return isPNG && isLt1M
+      return isLt1M
+    },
+
+    saveForm () {
+      this.$refs['dataForm'].validate((valid, messageObj) => {
+
+        if (!valid) {
+          let message = ''
+          for (var oneObj in messageObj) {
+            // debugger
+            // console.log(messageObj[oneObj])
+            message = message + (messageObj[oneObj])[0].message + ' \n '
+          }
+          // message = message.substring(0, message.length - 1)
+          this.$message.error(message)
+        } else {
+          // if (this.dataForm.functionName.length > 5) {
+          //   this.$message.warning('功能名称长度不能大于5个字!')
+          //   return false
+          // } else if (this.dataForm.functionName.length < 2) {
+          //   this.$message.warning('功能名称长度不能小于2个字!')
+          //   return false
+          // }
+
+          let url = ''
+          if (this.type === 'U') {
+            // url = '/oper/customize/customerfootbar/updatefootbar'
+            url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/updatefootbar'
+          } else {
+            url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/createfootbar'
+            // url = '/oper/customize/customerfootbar/createfootbar'
+            this.dataForm.id = ''
+          }
+          window.app.ajax.post(url, this.dataForm,
+            (data, rspMsg) => {
+              this.$message({
+                type: 'success',
+                message: '保存成功'
+              })
+              this.$emit('editDiaOK')
+              this.visible = false
+            },
+            (rspMsg, data) => {
+              this.endLoading()
+              this.$message.error(rspMsg)
+            })
+        }
+      })
+    },
+    handleClose () {
+      this.visible = false
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+.function-icon {
+  width: 28px;
+}
+.item_width_1 {
+  width: 300px;
+}
+.item_width_2 {
+  width: 500px;
+}
+.block {
+  display: block;
+}
+.btn_serve {
+  float: left;
+  margin-top: 4px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
+</style>
diff --git a/epmet-oper-web/src/views/modules/customer/customize/FootbarList.vue b/epmet-oper-web/src/views/modules/customer/customize/FootbarList.vue
new file mode 100644
index 0000000..db0423d
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/customer/customize/FootbarList.vue
@@ -0,0 +1,321 @@
+<template>
+  <div>
+
+    <div class="div_btn">
+      <span style="margin-right:20px">{{customerName}}</span>
+      <el-button type="default"
+                 size="mini"
+                 @click="diaCancel">取消返回</el-button>
+      <el-button type="primary"
+                 size="mini"
+                 @click="addShow">自定义初始化</el-button>
+
+    </div>
+    <el-tabs v-model="activeName"
+             @tab-click="tabClick"
+             class="el-tabs">
+      <el-tab-pane label="居民端"
+                   name="resi">
+
+        <c-table column-type="index"
+                 ref="table_resi"
+                 :url="tableUrl"
+                 :params="tableParamsResi"
+                 :operationWidth="80"
+                 keyword="FootBarCustomize"
+                 :operations="operations"
+                 :orderOperations="orderOperations"
+                 :tableHeight="tableHeight"
+                 @editShow="editShow"
+                 @changeState="changeState"
+                 @moveUp="moveUp">
+        </c-table>
+      </el-tab-pane>
+      <el-tab-pane label="工作端"
+                   name="gov">
+        <c-table column-type="index"
+                 ref="table_work"
+                 :url="tableUrl"
+                 :params="tableParamsWork"
+                 :operationWidth="80"
+                 keyword="FootBar"
+                 :operations="operations"
+                 :orderOperations="orderOperations"
+                 :tableHeight="tableHeight"
+                 @editShow="editShow"
+                 @changeState="changeState"
+                 @moveUp="moveUp">
+        </c-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <edit ref="ref_edit"
+          @editDiaOK="editDiaOK">
+
+    </edit>
+
+  </div>
+</template>
+
+<script>
+import CDialog from '@c/CDialog'
+import CTable from '@c/CTableNoPage'
+import Edit from './FootbarEdit'
+
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading// 加载动画
+
+export default {
+  data () {
+    return {
+      activeName: 'resi',
+      customerId: '', // 客户id，父组件传
+      customerName: '', // 客户名称，父组件传
+
+      // 查询相关
+      tableParamsWork: {
+        appType: 'gov'
+      },
+      tableParamsResi: {
+        appType: 'resi'
+      },
+      tableData: [],
+      // 列表相关
+      tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/customerfootbars',
+      // tableUrl: '/oper/customize/customerfootbar/customerfootbars',
+
+      operations: [
+        {
+          lable: (display) => {
+            if (display === 0) {
+              return '隐藏'
+            } else {
+              return '显示'
+            }
+          }, // 按钮显示名称
+
+          size: 'mini',
+          style: 'margin: 0 6px;',
+          type: 'text',
+          slot: '',
+          plain: false,
+          methodName: 'changeState', // 回调方法名称
+          isShow: (row) => {
+            return true
+          }
+        },
+        {
+          lable: '修改', // 按钮显示名称
+          size: 'mini',
+          style: 'margin: 0 6px;',
+          type: 'text',
+          slot: '',
+          plain: false,
+          methodName: 'editShow', // 回调方法名称
+          isShow: (row) => {
+            return true
+          }
+        }
+      ],
+      orderOperations: [
+        //  <el-button type="text"
+        //              style="width=100px;height=100px"
+        //              @click.stop="moveUpResi( scope.$index)"
+        //              icon="el-icon-top"></el-button>
+        {
+          style: 'width=100px;height=100px',
+          type: 'text',
+          icon: "el-icon-top",
+          methodName: 'moveUp', // 回调方法名称
+          isShow: (row) => {
+            return true
+          }
+        },
+      ],
+
+      // 查询栏下拉框数据
+      form: {
+        dataUrl: [], // 下拉框/单选框/复选框等获取数据的url
+        data: { // 全部下拉框数据
+          fromApp: [
+            {
+              value: 'resi',
+              label: '居民端'
+            },
+            {
+              value: 'gov',
+              label: '工作端'
+            }
+          ]
+
+        }
+      }
+    }
+  },
+  components: {
+    CDialog, CTable, Edit
+  },
+
+  mounted () {
+
+  },
+  computed: {
+    tableHeight () {
+      return this.clientHeight - 60 - 80 - 80
+    },
+    ...mapGetters(['clientHeight', 'env'])
+  },
+  methods: {
+    initData (customerId, customerName) {
+      this.customerId = customerId
+      this.customerName = customerName
+      this.loadResiTableData()
+    },
+    // 刷新
+    refresh () {
+
+      if (this.activeName === 'gov') {
+        this.loadWorkTableData() // 获取表格数据
+      } else if (this.activeName === 'resi') {
+        this.loadResiTableData() // 获取表格数据
+      }
+    },
+    tabClick (tab) {
+      if (tab.name === 'gov') {
+        this.loadWorkTableData() // 获取表格数据
+      }
+      if (tab.name === 'resi') {
+        this.loadResiTableData() // 获取表格数据
+      }
+    },
+    // 加载列表数据
+    loadWorkTableData () {
+      this.$nextTick(() => {
+        this.$refs['table_work'].loadData() // 获取表格数据
+      })
+    },
+    // 加载列表数据
+    loadResiTableData () {
+      this.$nextTick(() => {
+        this.$refs['table_resi'].loadData() // 获取表格数据
+      })
+    },
+    // 新增
+    addShow () {
+      this.$refs['ref_edit'].init('', 'A', this.activeName)
+    },
+    // 编辑
+    editShow (row) {
+      this.$refs['ref_edit'].init(row.id, 'U')
+    },
+    // 改变状态
+    changeState (row, index) {
+      let display = row.display === 0 ? 1 : 0
+      const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/updatedisplaystatus'
+      // const url = '/oper/customize/customerfootbar/updatedisplaystatus'
+      const param = {
+        id: row.id,
+        display: display
+      }
+      window.app.ajax.post(url, param,
+        (data, rspMsg) => {
+          this.$message.success('操作成功' + rspMsg)
+          this.refresh()
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        })
+    },
+    // 上移
+    moveUp (row, index) {
+
+      if (index > 0) {
+        this.tableData = this.$refs.table.getTableData() // 获取表格数据
+        console.log(this.tableData)
+        this.startLoading()
+        let resultList = []
+        let one = {}
+        for (let i = 0; i < this.tableData.length; i++) {
+          let obj = {}
+          // eslint-disable-next-line
+          // debugger
+          if (i === index - 1) {
+            one.id = this.tableData[i].id
+            one.orderIndex = index
+          } else if (i === index) {
+            obj.id = this.tableData[i].id
+            obj.orderIndex = index - 1
+            resultList.push(obj)
+            resultList.push(one)
+          } else {
+            obj.id = this.tableData[i].id
+            obj.orderIndex = i
+            resultList.push(obj)
+          }
+        }
+        console.log(resultList)
+
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfunctiondetail/updatedisplayorder'
+        const url = '/oper/customize/customerfunctiondetail/updatedisplayorder'
+        window.app.ajax.post(url, resultList,
+          (data, rspMsg) => {
+            this.endLoading()
+            this.loadTableData()
+          },
+          (rspMsg, data) => {
+            this.endLoading()
+            this.$message.error(rspMsg)
+          })
+
+      } else {
+        this.$message.warning('无法上移')
+
+        return false
+      }
+    },
+
+    // 取消
+    diaCancel () {
+      this.$emit('cancleBack')
+    },
+
+    editDiaOK () {
+      this.refresh()
+    },
+    editDiaCancel () {
+
+    },
+
+    async renderSelData () { // 渲染下拉框/单选框/复选框等数据
+
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+<style>
+.div_btn {
+  z-index: 10;
+  position: absolute;
+  right: 40px;
+  top: 35px;
+  /* margin: 0 0 20px 0; */
+}
+</style>
diff --git a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue
index ef3971e..26bb2c3 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue
@@ -539,7 +539,6 @@ export default {
       return this.cptList.filter(item => this.checkCptRegion(item) === 'ban')
     },
     cntCptList () {
-      console.log('cntCpt发生了变化')
       let arr = this.cptList.filter(item => this.checkCptRegion(item) === 'cnt')
       arr.sort((f, s) => f.displayOrder - s.displayOrder)
       return arr
diff --git a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
index 40c1242..f60ad49 100644
--- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
+++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
@@ -31,7 +31,7 @@
       </div>
     </el-card>
     <c-dialog :showFooter='false'
-              :title="'客户列表'"
+              :title="'Token信息'"
               :isNest="false"
               :visible="diaVisible"
               :dialogHeight="1.1"
@@ -42,6 +42,11 @@
                ref="tokenForm"
                :label-width="'120px'">
         <div style="margin-top:20px">
+          <el-form-item label="客户名称"
+                        prop="customerName">
+            <div class="item_width_1">
+              <span>{{tokenForm.customerName}}</span></div>
+          </el-form-item>
           <el-form-item label="开发token"
                         prop="componentAccessToken">
             <div class="item_width_1">
@@ -205,32 +210,38 @@ export default {
 
     //删除客户，开发和体验服显示
     del (row) {
-      this.startLoading()
-      const url = 'https://epmet-cloud.elinkservice.cn/third/pacustomer/deletepubliccustomer'
-      const param = {
-        customerId: row.customerId,
-        source: this.env
-      }
-      window.app.ajax.post(
-        url,
-        param,
-        (data, rspMsg) => {
-          this.endLoading()
-          this.$message.success('删除成功')
-          this.loadData()
-          // eslint-disable-next-line
-        },
-        (rspMsg, data) => {
-          this.endLoading()
-          this.$message.error(rspMsg)
+      this.$confirm('确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.startLoading()
+        const url = 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/deletepubliccustomer'
+        const param = {
+          customerId: row.customerId,
+          source: this.env
         }
-      )
+        window.app.ajax.post(
+          url,
+          param,
+          (data, rspMsg) => {
+            this.endLoading()
+            this.$message.success('删除成功')
+            this.loadData()
+            // eslint-disable-next-line
+          },
+          (rspMsg, data) => {
+            this.endLoading()
+            this.$message.error(rspMsg)
+          }
+        )
+      })
     },
 
     //获取token，开发和体验服显示
     showToken (row) {
       this.startLoading()
-      const url = 'https://epmet-cloud.elinkservice.cn/third/pacustomer/tokenlist'
+      const url = 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/tokenlist'
       const param = {
         customerId: row.customerId
       }
@@ -239,7 +250,6 @@ export default {
         param,
         (data, rspMsg) => {
           this.endLoading()
-          this.$message.success('初始化成功')
           this.diaVisible = true
           this.$nextTick(() => {
             this.tokenForm = data
@@ -255,7 +265,6 @@ export default {
 
     // 取消
     diaCancel () {
-
       this.diaVisible = false
     },
 
diff --git a/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue b/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue
index 341416d..b86eead 100644
--- a/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue
+++ b/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue
@@ -80,7 +80,7 @@
         <el-tag type="info"
                 class="eltag"
                 size="medium"
-                style="width:100%;margin-top:10px">跟管理员信息
+                style="width:100%;margin-top:10px">根管理员信息
         </el-tag><br /><br />
         <el-form :inline="false"
                  :model="dataForm.managers[0]"
@@ -228,6 +228,9 @@ export default {
       window.app.ajax.post(url, params,
         (data, rspMsg) => {
           this.endLoading()
+          localStorage.setItem('customerName', this.dataForm.customerInfoDTO.customerName)
+          this.$emit('changeCustomerName', this.dataForm.customerInfoDTO.customerName)
+
           this.$message.success('修改成功')
           this.loadData()
         },
diff --git a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue
index 4953006..456de81 100644
--- a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue
@@ -149,9 +149,9 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.clientHeight - 60 - 80 - 80 - 90
+      return this.clientHeight - 60 - 80 - 80 - 45
     },
-    ...mapGetters(['clientHeight', 'env'])
+    ...mapGetters(['clientHeight'])
   },
   methods: {
     // 刷新
diff --git a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
index 4b49e99..a674db9 100644
--- a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
@@ -13,9 +13,18 @@
              :label-width="'120px'">
       <el-form-item label="功能名称"
                     prop="functionName">
-        <el-input class="item_width_1"
-                  v-model="dataForm.functionName"
-                  placeholder="功能名称"></el-input>
+        <el-tooltip class="item"
+                    effect="dark"
+                    content="请输入2-5个字"
+                    placement="top-start">
+          <el-input class="item_width_1"
+                    oninput="if(value.length>5)value=value.slice(0,5)"
+                    v-model="dataForm.functionName"
+                    placeholder="功能名称"></el-input>
+        </el-tooltip>
+
+        <div slot="tip"
+             class="el-upload__tip">2-5个字</div>
       </el-form-item>
       <el-form-item label="来源"
                     prop="fromApp">
@@ -184,28 +193,28 @@ export default {
     dataRule () {
       return {
         functionName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: '功能名称不能为空', trigger: 'blur' }
+        ],
+        domainName: [
+          { required: true, message: '业务域名不能为空', trigger: 'blur' }
         ],
-        // domainName: [
-        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        // ],
         iconLargeImg: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: '大图标不能为空', trigger: 'blur' }
         ],
         iconSmallImg: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: '小图标不能为空', trigger: 'blur' }
         ],
         fromApp: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: '来源不能为空', trigger: 'blur' }
         ],
         shoppingStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: '上架状态不能为空', trigger: 'blur' }
         ],
         functionExplain: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: '功能描述不能为空', trigger: 'blur' }
         ],
         targetLink: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -290,9 +299,17 @@ export default {
     },
 
     saveForm () {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs['dataForm'].validate((valid, messageObj) => {
+
         if (!valid) {
-          this.$message.error('表单验证失败!')
+          let message = ''
+          for (var oneObj in messageObj) {
+            // debugger
+            // console.log(messageObj[oneObj])
+            message = message + (messageObj[oneObj])[0].message + ' \n '
+          }
+          // message = message.substring(0, message.length - 1)
+          this.$message.error(message)
         } else {
           if (this.dataForm.functionName.length > 5) {
             this.$message.warning('功能名称长度不能大于5个字!')
diff --git a/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue
new file mode 100644
index 0000000..49d9200
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue
@@ -0,0 +1,320 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="'修改Footbar'"
+             :close-on-click-modal="false"
+             :before-close="handleClose"
+             :close-on-press-escape="false"
+             :width="60+'%'"
+             :top="'30px'">
+    <el-form :inline="false"
+             :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             :label-width="'120px'">
+      <el-form-item label="Key"
+                    prop="barKey">
+
+        <el-input :disabled="type==='U'"
+                  class="item_width_1"
+                  v-model="dataForm.barKey"
+                  placeholder="Key"></el-input>
+
+      </el-form-item>
+      <el-form-item label="导航栏名称"
+                    prop="barName">
+        <el-tooltip class="item"
+                    effect="dark"
+                    content="请输入2-5个字"
+                    placement="top-start">
+          <el-input class="item_width_1"
+                    oninput="if(value.length>5)value=value.slice(0,5)"
+                    v-model="dataForm.barName"
+                    placeholder="导航栏名称"></el-input>
+        </el-tooltip>
+      </el-form-item>
+      <el-form-item label="页面标题"
+                    prop="pageTitle">
+        <el-tooltip class="item"
+                    effect="dark"
+                    content="请输入2-10个字"
+                    placement="top-start">
+          <el-input class="item_width_1"
+                    oninput="if(value.length>10)value=value.slice(0,10)"
+                    v-model="dataForm.pageTitle"
+                    placeholder="页面标题"></el-input>
+        </el-tooltip>
+      </el-form-item>
+
+      <el-form-item label="App类型"
+                    prop="appType">
+        <el-select :disabled="type==='U'"
+                   class="item_width_1"
+                   v-model="dataForm.appType"
+                   placeholder="请选择"
+                   clearable>
+          <el-option v-for="item in fromAppList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item prop="iconPath"
+                    label="图标">
+        <el-upload class="item_width_1 avatar-uploader"
+                   :action="uploadUlr"
+                   :show-file-list="false"
+                   :on-success="function (res, file) { return handleImgSuccess(res, file, '')}"
+                   :before-upload="beforeImgUpload">
+          <img v-if="dataForm.iconPath"
+               :src="dataForm.iconPath"
+               style="width:70px;height:70px"
+               class="function-icon">
+          <i v-else
+             class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item prop="selectedIconPath"
+                    label="选中图标">
+        <el-upload class="item_width_1 avatar-uploader"
+                   :action="uploadUlr"
+                   :show-file-list="false"
+                   :on-success="function (res, file) { return handleImgSuccess(res, file, 'sel')}"
+                   :before-upload="beforeImgUpload">
+          <img v-if="dataForm.selectedIconPath"
+               :src="dataForm.selectedIconPath"
+               style="width:70px;height:70px"
+               class="function-icon">
+          <i v-else
+             class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="saveForm()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading// 加载动画
+export default {
+  data () {
+    return {
+      visible: false,
+      type: '', // 操作类型A/U
+      id: '', // 父组件传来功能id
+      dataForm: {
+        customerId: '',
+        barName: '',
+        barKey: '',
+        appType: '',
+        pageTitle: '',
+        iconPath: '',
+        selectedIconPath: ''
+
+      },
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload',
+      fromAppList: [
+        {
+          'dictName': '工作端',
+          'dictValue': 'gov'
+        }, {
+          'dictName': '居民端',
+          'dictValue': 'resi'
+        }
+      ]
+    }
+  },
+  created () {
+    // this.queryFunctionList()
+  },
+  computed: {
+    dataRule () {
+      return {
+        barKey: [
+          { required: true, message: 'Key不能为空', trigger: 'blur' }
+        ],
+        barName: [
+          { required: true, message: '导航栏标题不能为空', trigger: 'blur' }
+        ],
+        appType: [
+          { required: true, message: '类型不能为空', trigger: 'blur' }
+        ],
+        pageTitle: [
+          { required: true, message: '页面标题不能为空', trigger: 'blur' }
+        ],
+        iconPath: [
+          { required: true, message: '图标不能为空', trigger: 'blur' }
+        ],
+        selectedIconPath: [
+          { required: true, message: '选中图标不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init (id, type, appType) {
+      this.type = type
+      this.visible = true
+      this.id = id
+
+      if (type === 'A') {
+        this.dataForm = {
+          customerId: '',
+          barName: '',
+          barKey: '',
+          appType: appType,
+          pageTitle: '',
+          iconPath: '',
+          selectedIconPath: ''
+        }
+
+      } else {
+        this.loadFormData()
+      }
+    },
+
+    loadFormData () {
+      const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/footbardetail'
+      // const url = '/oper/customize/customerfootbar/footbardetail'
+      let _data = {
+        id: this.id
+      }
+      this.startLoading()
+      window.app.ajax.post(url, _data,
+        (data, rspMsg) => {
+          this.endLoading()
+          this.dataForm = data
+
+        },
+        (rspMsg, data) => {
+          this.endLoading()
+          this.$message.error(rspMsg)
+        })
+    },
+
+    // 上传大图标成功
+    handleImgSuccess (res, file, type) {
+      if (res.code === 0 && res.msg === 'success') {
+        if (type === 'sel') {
+          this.dataForm.selectedIconPath = res.data.url
+        } else if (type === 'small') {
+          this.dataForm.iconPath = res.data.url
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+
+    beforeImgUpload (file) {
+      // const isPNG = file.type === 'image/png'
+      const isLt1M = file.size / 1024 < 20
+
+      // if (!isPNG) {
+      //   this.$message.error('上传图片只能是 PNG 格式!')
+      // }
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 1MB!')
+      }
+      // return isPNG && isLt1M
+      return isLt1M
+    },
+
+    saveForm () {
+      this.$refs['dataForm'].validate((valid, messageObj) => {
+
+        if (!valid) {
+          let message = ''
+          for (var oneObj in messageObj) {
+            // debugger
+            // console.log(messageObj[oneObj])
+            message = message + (messageObj[oneObj])[0].message + ' \n '
+          }
+          // message = message.substring(0, message.length - 1)
+          this.$message.error(message)
+        } else {
+          // if (this.dataForm.functionName.length > 5) {
+          //   this.$message.warning('功能名称长度不能大于5个字!')
+          //   return false
+          // } else if (this.dataForm.functionName.length < 2) {
+          //   this.$message.warning('功能名称长度不能小于2个字!')
+          //   return false
+          // }
+
+          let url = ''
+          if (this.type === 'U') {
+            // url = '/oper/customize/customerfootbar/updatefootbar'
+            url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/updatefootbar'
+          } else {
+            url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/createfootbar'
+            // url = '/oper/customize/customerfootbar/createfootbar'
+            this.dataForm.id = ''
+          }
+          window.app.ajax.post(url, this.dataForm,
+            (data, rspMsg) => {
+              this.$message({
+                type: 'success',
+                message: '保存成功'
+              })
+              this.$emit('editDiaOK')
+              this.visible = false
+            },
+            (rspMsg, data) => {
+              this.endLoading()
+              this.$message.error(rspMsg)
+            })
+        }
+      })
+    },
+    handleClose () {
+      this.visible = false
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+.function-icon {
+  width: 28px;
+}
+.item_width_1 {
+  width: 300px;
+}
+.item_width_2 {
+  width: 500px;
+}
+.block {
+  display: block;
+}
+.btn_serve {
+  float: left;
+  margin-top: 4px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
+</style>
diff --git a/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarList.vue b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarList.vue
new file mode 100644
index 0000000..dbbe539
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarList.vue
@@ -0,0 +1,352 @@
+<template>
+  <div>
+    <el-card shadow="never"
+             class="aui-card--fill">
+      <div class="div_btn">
+
+        <el-button type="primary"
+                   size="mini"
+                   @click="addShow">新增</el-button>
+
+      </div>
+      <el-tabs v-model="activeName"
+               @tab-click="tabClick"
+               class="el-tabs">
+        <el-tab-pane label="居民端"
+                     name="resi">
+
+          <c-table column-type="index"
+                   ref="table_resi"
+                   :url="tableUrl"
+                   :params="tableParamsResi"
+                   :operationWidth="80"
+                   keyword="FootBar"
+                   :operations="operations"
+                   :orderOperations="orderOperations"
+                   :tableHeight="tableHeight"
+                   @editShow="editShow"
+                   @changeState="changeState"
+                   @moveUp="moveUp"
+                   @del="del">
+          </c-table>
+        </el-tab-pane>
+        <el-tab-pane label="工作端"
+                     name="gov">
+          <c-table column-type="index"
+                   ref="table_work"
+                   :url="tableUrl"
+                   :params="tableParamsWork"
+                   :operationWidth="80"
+                   keyword="FootBar"
+                   :operations="operations"
+                   :orderOperations="orderOperations"
+                   :tableHeight="tableHeight"
+                   @editShow="editShow"
+                   @changeState="changeState"
+                   @moveUp="moveUp"
+                   @del="del">
+          </c-table>
+        </el-tab-pane>
+      </el-tabs>
+
+    </el-card>
+
+    <edit ref="ref_edit"
+          @editDiaOK="editDiaOK">
+
+    </edit>
+
+  </div>
+</template>
+
+<script>
+import CDialog from '@c/CDialog'
+import CTable from '@c/CTableNoPage'
+import Edit from './FootbarEdit'
+
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading// 加载动画
+
+export default {
+  data () {
+    return {
+      activeName: 'resi',
+      // 查询相关
+      tableParamsWork: {
+        appType: 'gov'
+      },
+      tableParamsResi: {
+        appType: 'resi'
+      },
+      tableData: [],
+      // 列表相关
+      tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/customerfootbars',
+      // tableUrl: '/oper/customize/customerfootbar/customerfootbars',
+
+      operations: [
+        {
+          lable: (display) => {
+            if (display === 0) {
+              return '隐藏'
+            } else {
+              return '显示'
+            }
+          }, // 按钮显示名称
+
+          size: 'mini',
+          style: 'margin: 0 6px;',
+          type: 'text',
+          slot: '',
+          plain: false,
+          methodName: 'changeState', // 回调方法名称
+          isShow: (row) => {
+            return true
+          }
+        },
+        {
+          lable: '修改', // 按钮显示名称
+          size: 'mini',
+          style: 'margin: 0 6px;',
+          type: 'text',
+          slot: '',
+          plain: false,
+          methodName: 'editShow', // 回调方法名称
+          isShow: (row) => {
+            return true
+          }
+        },
+        {
+          lable: '删除', // 按钮显示名称
+          size: 'mini',
+          style: 'margin: 0 6px;',
+          type: 'text',
+          slot: '',
+          plain: false,
+          methodName: 'del', // 回调方法名称
+          isShow: (row) => {
+            if (env === 'prod') {
+              return false
+            } else {
+              return true
+            }
+          }
+        }
+      ],
+      orderOperations: [
+        //  <el-button type="text"
+        //              style="width=100px;height=100px"
+        //              @click.stop="moveUpResi( scope.$index)"
+        //              icon="el-icon-top"></el-button>
+        {
+          style: 'width=100px;height=100px',
+          type: 'text',
+          icon: "el-icon-top",
+          methodName: 'moveUp', // 回调方法名称
+          isShow: (row) => {
+            return true
+          }
+        },
+      ],
+
+      // 查询栏下拉框数据
+      form: {
+        dataUrl: [], // 下拉框/单选框/复选框等获取数据的url
+        data: { // 全部下拉框数据
+          fromApp: [
+            {
+              value: 'resi',
+              label: '居民端'
+            },
+            {
+              value: 'gov',
+              label: '工作端'
+            }
+          ]
+
+        }
+      }
+    }
+  },
+  components: {
+    CDialog, CTable, Edit
+  },
+
+  mounted () {
+    this.renderSelData()
+    this.loadResiTableData()
+  },
+  computed: {
+    tableHeight () {
+      return this.clientHeight - 60 - 80 - 80
+    },
+    ...mapGetters(['clientHeight', 'env'])
+  },
+  methods: {
+    // 刷新
+    refresh () {
+
+      if (this.activeName === 'gov') {
+        this.loadWorkTableData() // 获取表格数据
+      } else if (this.activeName === 'resi') {
+        this.loadResiTableData() // 获取表格数据
+      }
+    },
+    tabClick (tab) {
+      if (tab.name === 'gov') {
+        this.loadWorkTableData() // 获取表格数据
+      }
+      if (tab.name === 'resi') {
+        this.loadResiTableData() // 获取表格数据
+      }
+    },
+    // 加载列表数据
+    loadWorkTableData () {
+      this.$nextTick(() => {
+        this.$refs['table_work'].loadData() // 获取表格数据
+      })
+    },
+    // 加载列表数据
+    loadResiTableData () {
+      this.$nextTick(() => {
+        this.$refs['table_resi'].loadData() // 获取表格数据
+      })
+    },
+    // 新增
+    addShow () {
+      this.$refs['ref_edit'].init('', 'A', this.activeName)
+    },
+    // 编辑
+    editShow (row) {
+      this.$refs['ref_edit'].init(row.id, 'U')
+    },
+    // 改变状态
+    changeState (row, index) {
+      let display = row.display === 0 ? 1 : 0
+      const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/updatedisplaystatus'
+      // const url = '/oper/customize/customerfootbar/updatedisplaystatus'
+      const param = {
+        id: row.id,
+        display: display
+      }
+      window.app.ajax.post(url, param,
+        (data, rspMsg) => {
+          this.$message.success('操作成功' + rspMsg)
+          this.refresh()
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        })
+    },
+    // 上移
+    moveUp (row, index) {
+
+      if (index > 0) {
+        this.tableData = this.$refs.table.getTableData() // 获取表格数据
+        console.log(this.tableData)
+        this.startLoading()
+        let resultList = []
+        let one = {}
+        for (let i = 0; i < this.tableData.length; i++) {
+          let obj = {}
+          // eslint-disable-next-line
+          // debugger
+          if (i === index - 1) {
+            one.id = this.tableData[i].id
+            one.orderIndex = index
+          } else if (i === index) {
+            obj.id = this.tableData[i].id
+            obj.orderIndex = index - 1
+            resultList.push(obj)
+            resultList.push(one)
+          } else {
+            obj.id = this.tableData[i].id
+            obj.orderIndex = i
+            resultList.push(obj)
+          }
+        }
+        console.log(resultList)
+
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfunctiondetail/updatedisplayorder'
+        const url = '/oper/customize/customerfunctiondetail/updatedisplayorder'
+        window.app.ajax.post(url, resultList,
+          (data, rspMsg) => {
+            this.endLoading()
+            this.loadTableData()
+          },
+          (rspMsg, data) => {
+            this.endLoading()
+            this.$message.error(rspMsg)
+          })
+
+      } else {
+        this.$message.warning('无法上移')
+
+        return false
+      }
+    },
+
+    // 删除
+    del (row) {
+      this.$confirm('确认删除当前导航', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/deletefootbar'
+        // const url = '/oper/customize/customerfootbar/deletefootbar'
+        const param = {
+          id: row.id
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            this.$message.success('删除成功' + rspMsg)
+            this.refresh()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+
+    editDiaOK () {
+      this.refresh()
+    },
+    editDiaCancel () {
+
+    },
+
+    async renderSelData () { // 渲染下拉框/单选框/复选框等数据
+
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+<style>
+.div_btn {
+  z-index: 10;
+  position: absolute;
+  right: 40px;
+  top: 35px;
+  /* margin: 0 0 20px 0; */
+}
+</style>
diff --git a/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue b/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
index 5d8ede7..d548c4f 100644
--- a/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
@@ -4,11 +4,11 @@
              shadow="never"
              class="aui-card--fill">
       <el-button type="text"
-            size="small"
-            @click="startSetWxIndex('', '', 0)">居民端</el-button>
+                 size="small"
+                 @click="startSetWxIndex('', '', 0)">居民端</el-button>
       <el-button type="text"
-            size="small"
-            @click="startSetWxIndex('', '', 1)">工作端</el-button>
+                 size="small"
+                 @click="startSetWxIndex('', '', 1)">工作端</el-button>
     </el-card>
 
     <div class="m-wx_index"
@@ -543,7 +543,6 @@ export default {
       return this.cptList.filter(item => this.checkCptRegion(item) === 'ban')
     },
     cntCptList () {
-      console.log('cntCpt发生了变化')
       let arr = this.cptList.filter(item => this.checkCptRegion(item) === 'cnt')
       arr.sort((f, s) => f.displayOrder - s.displayOrder)
       return arr
diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue
index 1f30650..2ca0b4f 100644
--- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue
+++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue
@@ -562,7 +562,6 @@ export default {
       return this.cptList.filter(item => this.checkCptRegion(item) === 'ban')
     },
     cntCptList () {
-      console.log('cntCpt发生了变化')
       let arr = this.cptList.filter(item => this.checkCptRegion(item) === 'cnt')
       arr.sort((f, s) => f.displayOrder - s.displayOrder)
       return arr
diff --git a/epmet-oper-web/src/views/pages/login.vue b/epmet-oper-web/src/views/pages/login.vue
index df5a429..3d15bc6 100644
--- a/epmet-oper-web/src/views/pages/login.vue
+++ b/epmet-oper-web/src/views/pages/login.vue
@@ -12,7 +12,7 @@
                    ref="dataForm"
                    @keyup.enter.native="dataFormSubmitHandle()"
                    status-icon>
-            <el-form-item>
+            <!-- <el-form-item>
               <el-select v-model="$i18n.locale"
                          class="w-percent-100">
                 <el-option v-for="(val, key) in i18nMessages"
@@ -20,7 +20,7 @@
                            :label="val._lang"
                            :value="key"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item prop="phone">
               <el-input v-model="dataForm.phone"
                         placeholder="手机号">
diff --git a/epmet-oper-web/src/views/pages/loginWork.vue b/epmet-oper-web/src/views/pages/loginWork.vue
index a65bac1..f5350b0 100644
--- a/epmet-oper-web/src/views/pages/loginWork.vue
+++ b/epmet-oper-web/src/views/pages/loginWork.vue
@@ -13,7 +13,7 @@
                    ref="dataForm"
                    @keyup.enter.native="dataFormSubmitHandle()"
                    status-icon>
-            <el-form-item>
+            <!-- <el-form-item>
               <el-select v-model="$i18n.locale"
                          class="w-percent-100">
                 <el-option v-for="(val, key) in i18nMessages"
@@ -21,7 +21,7 @@
                            :label="val._lang"
                            :value="key"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item prop="phone">
               <el-input v-model="dataForm.phone"
                         placeholder="手机号">