diff --git a/src/api/productService/commonService.js b/src/api/productService/commonService.js
new file mode 100644
index 0000000..5bbfac1
--- /dev/null
+++ b/src/api/productService/commonService.js
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+export function index(params,isLoading=true){
+  return request({
+    isLoading,
+    method:'get',
+    url:'/api/admin/common-service/index',
+    params
+  })
+}
+
+export function show(params){
+  return request({
+    method:'get',
+    url:'/api/admin/common-service/show',
+    params
+  })
+}
+
+export function store(data){
+  return request({
+    method:'post',
+    url:'/api/admin/common-service/store',
+    data
+  })
+}
+
+export function save(data){
+  return request({
+    method:'post',
+    url:'/api/admin/common-service/save',
+    data
+  })
+}
+
+export function destroy(data){
+  return request({
+    method:'post',
+    url:'/api/admin/common-service/destroy',
+    data
+  })
+}
+
+
+export function getMerchantItems(params){
+  return request({
+    method:'get',
+    url:'/api/admin/common-service/get-merchant-items',
+    params
+  })
+}
+
+export function getPicture(params){
+  return request({
+    method:'get',
+    url:'/api/admin/common-service/get-picture',
+    params
+  })
+}
diff --git a/src/api/productService/commonServiceProduct.js b/src/api/productService/commonServiceProduct.js
new file mode 100644
index 0000000..8cdd860
--- /dev/null
+++ b/src/api/productService/commonServiceProduct.js
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+export function index(params){
+  return request({
+    method:'get',
+    url:'/api/admin/common-product/index',
+    params
+  })
+}
+
+export function show(params){
+  return request({
+    method:'get',
+    url:'/api/admin/common-product/show',
+    params
+  })
+}
+
+export function store(data){
+  return request({
+    method:'post',
+    url:'/api/admin/common-product/store',
+    data
+  })
+}
+
+export function save(data){
+  return request({
+    method:'post',
+    url:'/api/admin/common-product/save',
+    data
+  })
+}
+
+export function destroy(data){
+  return request({
+    method:'post',
+    url:'/api/admin/common-product/destroy',
+    data
+  })
+}
+
+export function getPicture(params){
+  return request({
+    method:'get',
+    url:'/api/admin/common-product/get-picture',
+    params
+  })
+}
+
+export function getCombo(params){
+  return request({
+    method:'get',
+    url:'/api/admin/common-product/get-combo',
+    params
+  })
+}
+
diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 42a165d..08ace0f 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -1,90 +1,106 @@
 <script>
 export default {
-  props:{
-    height:{
-      type:Number
+  props: {
+    height: {
+      type: Number
     },
-    list:{
-      type:Array,
-      default:()=> []
+    list: {
+      type: Array,
+      default: () => []
     },
-    tableItem:{
-      type:Array,
-      default:()=> []
+    tableItem: {
+      type: Array,
+      default: () => []
     },
-    indent:{
-      type:Number,
-      default:18
+    indent: {
+      type: Number,
+      default: 18
     },
-    cellStyle:{
-      type:Function,
-      default:()=>{}
+    cellStyle: {
+      type: Function,
+      default: () => {
+      }
     },
-    rowStyle:{
-      type:Function,
-      default:()=>{}
+    rowStyle: {
+      type: Function,
+      default: () => {
+      }
     },
-    headerRowStyle:{
-      type:Function,
-      default:()=>{}
+    headerRowStyle: {
+      type: Function,
+      default: () => {
+      }
     },
-    headerCellStyle:{
-      type:Function,
-      default:()=>{}
+    headerCellStyle: {
+      type: Function,
+      default: () => {
+      }
     },
-    defaultExpandAll:{
-      type:Boolean,
-      default:true
+    defaultExpandAll: {
+      type: Boolean,
+      default: true
     },
-    showIndex:{
-      type:Boolean,
-      default:true
+    expandRowKeys:{
+      type: Array,
+      default: ()=>[]
     },
-    showHeader:{
-      type:Boolean,
-      default:true
+    rowKey:{
+      type:[String,Function],
+      default:'id'
     },
-    showSummary:{
-      type:Boolean,
-      default:false
+    showHeader: {
+      type: Boolean,
+      default: true
     },
-    summaryMethod:{
-      type:Function
+    showSummary: {
+      type: Boolean,
+      default: false
     },
-    treeProps:{
-      type:Object,
-      default:()=> {
-        return { children: 'children', hasChildren: 'hasChildren' }
+    summaryMethod: {
+      type: Function
+    },
+    treeProps: {
+      type: Object,
+      default: () => {
+        return {children: 'children', hasChildren: 'hasChildren'}
       }
     },
-    tableStyle:{
-      type:Object,
-      default:()=>{
-        return { width: '100%', marginBottom: "20px"}
+    tableStyle: {
+      type: Object,
+      default: () => {
+        return {width: '100%', marginBottom: "20px"}
       }
     },
-    btnWidth:{
-      type:Number,
-      default:190
+    btnWidth: {
+      type: Number,
+      default: 190
     },
 
-  //  分页相关
-    isPage:{
-      type:Boolean,
-      default:true
+    //  分页相关
+    isPage: {
+      type: Boolean,
+      default: true
+    },
+    total: {
+      type: Number,
+      default: 0
     },
-    total:{
-      type:Number,
-      default:0
+    pageSize: {
+      type: Number
     },
-    pageSize:{
-      type:Number
+    pageSizeOpts:{
+      type:Array,
+      default:()=>[10, 20, 30, 40]
+    },
+    showSizer:{
+      type:Boolean,
+      default:true
     }
   },
   data() {
     return {
       tableHeight: 0,
-      isShowPage:true
+      isShowPage: true
     }
   },
   methods: {
@@ -94,63 +110,64 @@ export default {
       var lxHeader_height = 96.5; //查询 头部
       var paginationHeight = 37; //分页的高度
       var topHeight = 50; //页面 头部
-      let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+      let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20 - 25;
       that.tableHeight = tableHeight;
     },
-    deleteClick(row){
-      this.$emit('delete',row)
+    doLayout(){
+      this.$refs.table.doLayout()
     },
-    editorClick(row){
-      this.$emit('editor',row)
+    deleteClick(row) {
+      this.$emit('delete', row)
     },
-    selectClick(selection, row){
-      this.$emit('select',selection, row)
+    editorClick(row) {
+      this.$emit('editor', row)
     },
-    cellClick(row, column, cell){
-      this.$emit('cellClick',row, column, cell)
+    selectClick(selection, row) {
+      this.$emit('select', selection, row)
     },
-    createIndexRow(){
-      return <el-table-column type="index" align="center" fixed="left"></el-table-column>
+    selectAllClick(selection){
+      this.$emit('select-all',selection)
     },
-    createPage(){
-      if(this.isPage)
-      return(
-        <div>
-          <Icon
-            color='#fff'
-            class={this.isShowPage ? 'xy-table-page__close icon-recover' : 'xy-table-page__close icon-scale-left'}
-            type='ios-arrow-down'
-            size={22}
-            on={{['click']:()=>this.isShowPage=!this.isShowPage}}></Icon>
-          <transition
-            enter-active-class="slide-in-bottom"
-            leave-to-class="slide-out-down">
-            <Page
-              show-total={true}
-              page-size={this.pageSize}
-              v-show={this.isShowPage}
-              total={this.total}
-              size="small"
-              show-elevator={true}
-              show-sizer={true}
-              class="xy-table-page"
-              on={{
-                ['on-page-size-change']:(e)=>this.$emit('pageSizeChange',e),
-                ['on-change']:(e)=>this.$emit('pageIndexChange',e)
-              }}></Page>
-          </transition>
-        </div>
-      )
+    cellClick(row, column, cell) {
+      this.$emit('cellClick', row, column, cell)
     },
-    toggleRowSelection(row){
-      this.$nextTick(()=>{
+
+    createPage() {
+      if (this.isPage)
+        return (
+          <div>
+
+            <transition
+              enter-active-class="slide-in-bottom"
+              leave-to-class="slide-out-down">
+              <Page
+                page-size-opts={this.pageSizeOpts}
+                show-total={true}
+                page-size={this.pageSize}
+                v-show={this.isShowPage}
+                total={this.total}
+                size="small"
+                show-elevator={true}
+                show-sizer={this.showSizer}
+                class="xy-table-page"
+                on={{
+                  ['on-page-size-change']: (e) => this.$emit('pageSizeChange', e),
+                  ['on-change']: (e) => this.$emit('pageIndexChange', e)
+                }}>
+              </Page>
+            </transition>
+          </div>
+        )
+    },
+    toggleRowSelection(row) {
+      this.$nextTick(() => {
         this.$refs.table.toggleRowSelection(row);
       })
     },
-    clearSelection(){
+    clearSelection() {
       this.$refs.table.clearSelection();
     },
-    toggleAllSelection(){
+    toggleAllSelection() {
       this.$refs.table.toggleAllSelection()
     }
   },
@@ -160,10 +177,37 @@ export default {
   mounted() {
   },
   render(h) {
-    let {createPage,summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick} = this
+    let {
+      createPage,
+      summaryMethod,
+      cellClick,
+      btnWidth,
+      selectClick,
+      selectAllClick,
+      height,
+      createIndexRow,
+      tableStyle,
+      treeProps,
+      showSummary,
+      showHeader,
+      $scopedSlots,
+      showIndex,
+      defaultExpandAll,
+      headerCellStyle,
+      headerRowStyle,
+      rowStyle,
+      cellStyle,
+      indent,
+      tableHeight,
+      tableItem,
+      list,
+      rowKey,
+      deleteClick,
+      editorClick
+    } = this
     return (
-      <div class="table-tree" style={{ 'position': 'relative' }}>
-        { tableItem && tableItem.length>0 ?
+      <div class="table-tree" style={{'position': 'relative'}}>
+        {tableItem && tableItem.length > 0 ?
           (<el-table
             ref="table"
             show-summary={showSummary}
@@ -178,100 +222,109 @@ export default {
             height={height ?? tableHeight}
             class="v-table"
             style={tableStyle}
-            row-key="id"
-            border
+            row-key={rowKey}
+            border={true}
             default-expand-all={defaultExpandAll}
             tree-props={treeProps}
             fit={true}
-            on={{['select']:selectClick,['cell-click']:cellClick}}>
-            {
-              //序号
-              showIndex ? createIndexRow() : ''
-            }
+            on={{
+              ['select']: selectClick,
+              ['cell-click']: cellClick,
+              ['select-all']: selectAllClick}}>
+
 
             {
-              tableItem.map((item,index)=>{
-              //自定义表格内容
-              if(item.customFn){
-                return (
-                  <el-table-column
-                    align={item.align ?? 'center'}
-                    sortable={item.sortable ?? true}
-                    width={item.width ?? 'auto'}
-                    min-width={item.minWidth ?? item.width}
-                    header-align={item.headerAlign ?? 'center'}
-                    label={item.label}
-                    prop={item.prop}
-                    scopedSlots={{
-                      default( scope ){
-                        return item.customFn(scope.row)
-                      }
-                    }}>
-                  </el-table-column>
-                )
-              }
-              else if(item.multiHd){
-                //二级表头结构表格内容
-                return (
-                  <el-table-column
-                    header-align={item.headerAlign ?? 'center'}
-                    label={item.label}>
-                    {item.multiHd.map((item1,index1)=>{
-                      if(item1.customFn){
-                        return (
-                          <el-table-column
-                            align={item1.align ?? 'center'}
-                            header-align={item1.headerAlign ?? 'center'}
-                            label={item1.label}
-                            width={item1.width ?? 'auto'}
-                            min-width={item1.minWidth ?? item1.width}
-                            sortable={item1.sortable ?? true}
-                            scopedSlots={{
-                              default( scope ){
-                                return item1.customFn(scope.row)
-                              }
-                            }}>
-                          </el-table-column>
-                        )
-                      }else{
-                        return (
-                          <el-table-column
-                            fixed={item1.fixed ?? false}
-                            align={item1.align ?? 'center'}
-                            header-align={item1.headerAlign ?? 'center'}
-                            prop={`${item.Fprop?item.Fprop+'.' : ''}${item1.prop}`}
-                            label={item1.label}
-                            width={item1.width ?? 'auto'}
-                            min-width={item1.minWidth ?? item1.width}
-                            sortable={item1.sortable ?? true}
-                            type={item1.type ?? ''}
-                            formatter={item1.formatter}>
-                          </el-table-column>
-                        )
-                      }
-                    })}
-                </el-table-column>
-                )
-              }
-              else{
-                //默认内容
-                return (
-                  <el-table-column
-                    fixed={item.fixed ?? false}
-                    formatter={item.formatter}
-                    width={item.width ?? 'auto'}
-                    min-width={item.minWidth ?? item.width}
-                    header-align={item.headerAlign ?? 'center'}
-                    align={item.align ?? 'center'}
-                    label={item.label}
-                    prop={item.prop}
-                    sortable={item.sortable ?? true}
-                    type={item.type}
-                    selectable={item.selectable}>
-                  </el-table-column>
-                )
-              }
-            })}
+              tableItem.map((item, index) => {
+                //自定义表格内容
+                if (item.customFn) {
+                  return (
+                    <el-table-column
+                      fixed={item.fixed ?? false}
+                      render-header={item.renderHeader ?? undefined}
+                      align={item.align ?? 'center'}
+                      sortable={item.sortable ?? false}
+                      width={item.width ?? 'auto'}
+                      min-width={item.minWidth ?? item.width}
+                      header-align={item.headerAlign ?? 'center'}
+                      label={item.label}
+                      prop={item.prop}
+                      scopedSlots={{
+                        default(scope) {
+                          return item.customFn(scope.row,scope)
+                        }
+                      }}>
+                    </el-table-column>
+                  )
+                } else if (item.multiHd) {
+                  //二级表头结构表格内容
+                  return (
+                    <el-table-column
+                      render-header={item.renderHeader ?? undefined}
+                      header-align={item.headerAlign ?? 'center'}
+                      label={item.label}>
+                      {item.multiHd.map((item1, index1) => {
+                        if (item1.customFn) {
+                          return (
+                            <el-table-column
+                              render-header={item1.renderHeader ?? undefined}
+                              align={item1.align ?? 'center'}
+                              header-align={item1.headerAlign ?? 'center'}
+                              label={item1.label}
+                              width={item1.width ?? 'auto'}
+                              min-width={item1.minWidth ?? item1.width}
+                              sortable={item1.sortable ?? false}
+                              scopedSlots={{
+                                default(scope) {
+                                  return item1.customFn(scope.row)
+                                }
+                              }}>
+                            </el-table-column>
+                          )
+                        } else {
+                          return (
+                            <el-table-column
+                              render-header={item1.renderHeader ?? undefined}
+                              fixed={item1.fixed ?? false}
+                              align={item1.align ?? 'center'}
+                              header-align={item1.headerAlign ?? 'center'}
+                              prop={`${item.Fprop ? item.Fprop + '.' : ''}${item1.prop}`}
+                              label={item1.label}
+                              width={item1.width ?? 'auto'}
+                              min-width={item1.minWidth ?? item1.width}
+                              sortable={item1.sortable ?? false}
+                              type={item1.type ?? ''}
+                              formatter={item1.formatter}>
+                            </el-table-column>
+                          )
+                        }
+                      })}
+                    </el-table-column>
+                  )
+                } else {
+                  //默认内容
+                  return (
+                    <el-table-column
+                      render-header={item.renderHeader ?? undefined}
+                      fixed={item.fixed ?? false}
+                      formatter={item.formatter}
+                      width={item.width ?? 'auto'}
+                      min-width={item.minWidth ?? item.width}
+                      header-align={item.headerAlign ?? 'center'}
+                      align={item.align ?? 'center'}
+                      label={item.label}
+                      prop={item.prop}
+                      sortable={item.sortable ?? false}
+                      type={item.type}
+                      selectable={item.selectable}
+                      scopedSlots={item.type === 'expand' ? {
+                        default(props){
+                          return item.expandFn(props)
+                        }
+                      } : ''}>
+                    </el-table-column>
+                  )
+                }
+              })}
 
             {
               $scopedSlots.btns ? $scopedSlots.btns() :
@@ -281,19 +334,20 @@ export default {
                   width={btnWidth}
                   header-align="center"
                   scopedSlots={{
-                    default( scope ){
+                    default(scope) {
                       return (
                         <div>
                           <Poptip
                             transfer={true}
                             confirm
                             title="确认要删除吗"
-                            on={{['on-ok']:()=>deleteClick(scope.row)}}>
+                            on={{['on-ok']: () => deleteClick(scope.row)}}>
                             <i-button
                               type="error"
                               size="small"
                               style="margin-left: 10px;"
-                              ghost>删除</i-button>
+                              ghost>删除
+                            </i-button>
                           </Poptip>
 
                           <i-button
@@ -301,16 +355,17 @@ export default {
                             size="small"
                             style="margin-left: 10px;"
                             ghost
-                            onClick={()=>editorClick(scope.row)}>编辑</i-button>
+                            onClick={() => editorClick(scope.row)}>编辑
+                          </i-button>
                         </div>
                       )
                     }
                   }}>
-              </el-table-column>)
+                </el-table-column>)
             }
           </el-table>)
           :
-          <el-table height={height ?? tableHeight}/> }
+          <el-table height={height ?? tableHeight}/>}
 
         <el-backtop
           target=".el-table__body-wrapper"
@@ -318,30 +373,34 @@ export default {
           bottom={100}
           right={36}>
         </el-backtop>
-        { createPage() }
+        {createPage()}
       </div>
     )
   }
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 @import "../../styles/variables.scss";
-.xy-table-page{
+
+::v-deep .el-table{
+  margin-bottom: 0!important;
+}
+.xy-table-page {
   display: flex;
   justify-content: right;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
-  background: rgba(140,140,140,0.6);
+  background: rgba(140, 140, 140, 0.6);
 
   z-index: 10;
   padding: 6px 10px !important;
-  position: absolute;
-  bottom: 0;
+  position: relative;
+  top: 0;
   left: 0;
   right: 0;
 
-  &__close{
+  &__close {
     cursor: pointer;
     border-radius: 100%;
 
@@ -351,27 +410,33 @@ export default {
     bottom: 2px;
     left: 8px;
 
-    &:hover{
-      transform: scale(1.1,1.1);
+    &:hover {
+      transform: scale(1.1, 1.1);
     }
   }
-  ::v-deep .ivu-page-item,.ivu-page-options{
+
+  ::v-deep .ivu-page-item, .ivu-page-options {
     background: transparent !important;
   }
-  ::v-deep .ivu-page-item a{
+
+  ::v-deep .ivu-page-item a {
     color: #fff;
   }
-  ::v-deep .ivu-page-item-active a{
+
+  ::v-deep .ivu-page-item-active a {
     color: $primaryColor;
   }
-  ::v-deep .ivu-page-total{
+
+  ::v-deep .ivu-page-total {
     color: #fff !important;
   }
-  ::v-deep .ivu-page-options-elevator{
+
+  ::v-deep .ivu-page-options-elevator {
     color: #fff !important;
   }
+
   @media (max-width: 600px) {
-    ::v-deep .ivu-page-options{
+    ::v-deep .ivu-page-options {
       display: none !important;
     }
   }
@@ -382,6 +447,7 @@ export default {
   transform-origin: 0 100%;
   animation: slide-in-bottom 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
 }
+
 @keyframes slide-in-bottom {
   0% {
     transform: scaleY(0);
@@ -392,10 +458,12 @@ export default {
     opacity: 1;
   }
 }
+
 .slide-out-down {
   transform-origin: 0 100%;
   animation: slide-out-down 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
 }
+
 @keyframes slide-out-down {
   0% {
     transform: scaleY(1);
@@ -406,27 +474,29 @@ export default {
     opacity: 0;
   }
 }
-.icon-scale-left{
+
+.icon-scale-left {
   animation: icon-scale-left 0.5s forwards ease-out;
   @keyframes icon-scale-left {
-    from{
+    from {
 
     }
-    to{
-      clip-path: polygon(0 30%,100% 30%,100% 100%,0 100%);
-      background: rgba(140,140,140,0.7);
-      transform: scale(0.8,0.8) translateX(-22px) translateY(-10px) rotate(-90deg);
+    to {
+      clip-path: polygon(0 30%, 100% 30%, 100% 100%, 0 100%);
+      background: rgba(140, 140, 140, 0.7);
+      transform: scale(0.8, 0.8) translateX(-22px) translateY(-10px) rotate(-90deg);
     }
   }
 }
-.icon-recover{
+
+.icon-recover {
   animation: icon-recover 0.5s forwards ease-out;
   @keyframes icon-recover {
-    from{
-      background: rgba(120,120,120,0.8);
-      transform: scale(0.8,0.8) translateX(-30px) rotate(-90deg);
+    from {
+      background: rgba(120, 120, 120, 0.8);
+      transform: scale(0.8, 0.8) translateX(-30px) rotate(-90deg);
     }
-    to{
+    to {
     }
   }
 }
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index abf21b4..9471547 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -26,7 +26,7 @@ export default {
       }
       else if(icon.includes("iconfont")){
         let _icon=icon.split("/")[1];
-        vnodes.push(<Icon custom={[_icon, 'iconfont','sub-el-icon']} size="18" />)
+        vnodes.push(<i class={[_icon, 'iconfont','sub-el-icon']} size="18" />)
       }
       else {
         if(icon.includes("fa")){
diff --git a/src/styles/iconfont.css b/src/styles/iconfont.css
index 581971c..5c41797 100644
--- a/src/styles/iconfont.css
+++ b/src/styles/iconfont.css
@@ -1,10 +1,10 @@
+/* CDN 服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
-  font-family: 'iconfont';  /* Project id 3289311 */
-  src: url('//at.alicdn.com/t/font_3289311_1kjben9l2ui.woff2?t=1650868484740') format('woff2'),
-       url('//at.alicdn.com/t/font_3289311_1kjben9l2ui.woff?t=1650868484740') format('woff'),
-       url('//at.alicdn.com/t/font_3289311_1kjben9l2ui.ttf?t=1650868484740') format('truetype');
+  font-family: 'iconfont';  /* Project id 3367829 */
+  src: url('//at.alicdn.com/t/c/font_3367829_p7a25fhbhrr.woff2?t=1665733888546') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3367829_p7a25fhbhrr.woff?t=1665733888546') format('woff'),
+       url('//at.alicdn.com/t/c/font_3367829_p7a25fhbhrr.ttf?t=1665733888546') format('truetype');
 }
-
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -13,587 +13,959 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-tongbu:before {
-  content: "\e694";
+.icon-shubiaoshou:before {
+  content: "\e702";
+}
+
+.icon-hehuoren2:before {
+  content: "\e703";
+}
+
+.icon-tubiaozhizuomoban:before {
+  content: "\e704";
+}
+
+.icon-gengduo:before {
+  content: "\e705";
+}
+
+.icon-sousuo1:before {
+  content: "\e706";
+}
+
+.icon-xiangying:before {
+  content: "\e707";
+}
+
+.icon-dianzan:before {
+  content: "\e708";
+}
+
+.icon-haoqi:before {
+  content: "\e709";
+}
+
+.icon-xindejingyou:before {
+  content: "\e70a";
+}
+
+.icon-qunliao2:before {
+  content: "\e70b";
+}
+
+.icon-hudong:before {
+  content: "\e70c";
+}
+
+.icon-lishisousuo:before {
+  content: "\e70d";
+}
+
+.icon-lishisousuo1:before {
+  content: "\e70e";
+}
+
+.icon-saoyisao:before {
+  content: "\e70f";
+}
+
+.icon-tianjiazhaopian:before {
+  content: "\e710";
+}
+
+.icon-tongxue:before {
+  content: "\e711";
 }
 
-.icon-add:before {
+.icon-shangdian1:before {
   content: "\e605";
 }
 
-.icon-arrow-down:before {
+.icon-shangdianxian1:before {
   content: "\e606";
 }
 
-.icon-archive:before {
+.icon-womenchengnuo:before {
   content: "\e607";
 }
 
-.icon-arrow-left:before {
+.icon-kefudianhua:before {
   content: "\e608";
 }
 
-.icon-zoom-out:before {
+.icon-namai:before {
   content: "\e609";
 }
 
-.icon-arrow-right:before {
+.icon-xianpaizhao:before {
   content: "\e60a";
 }
 
-.icon-arrow-left-up:before {
-  content: "\e60b";
-}
-
-.icon-arrow-right-down:before {
+.icon-wodexian:before {
   content: "\e60c";
 }
 
-.icon-arrow-up:before {
+.icon-bangwotiaomian:before {
   content: "\e60d";
 }
 
-.icon-arrow-right-up:before {
-  content: "\e60e";
-}
-
-.icon-backspace:before {
+.icon-wodemian2:before {
   content: "\e60f";
 }
 
-.icon-bar-chart:before {
+.icon-bangwotiaoxian:before {
   content: "\e610";
 }
 
-.icon-bar-chart-alt:before {
+.icon-fenlei:before {
+  content: "\e611";
+}
+
+.icon-shaixuan:before {
+  content: "\e612";
+}
+
+.icon-xin:before {
   content: "\e613";
 }
 
-.icon-caret-left:before {
+.icon-huanbeijing:before {
   content: "\e614";
 }
 
-.icon-calendar:before {
+.icon-qingdan:before {
   content: "\e615";
 }
 
-.icon-caret-right:before {
+.icon-fenxiang:before {
   content: "\e616";
 }
 
-.icon-chevron-double-left:before {
-  content: "\e617";
-}
-
-.icon-caret-down:before {
+.icon-xiangshang:before {
   content: "\e618";
 }
 
-.icon-chevron-double-down:before {
+.icon-xiangxia:before {
   content: "\e619";
 }
 
-.icon-book:before {
+.icon-shanchu:before {
   content: "\e61a";
 }
 
-.icon-arrow-left-down:before {
+.icon-fuzhi:before {
   content: "\e61b";
 }
 
-.icon-bookmark:before {
+.icon-shangmenfuwu:before {
   content: "\e61c";
 }
 
-.icon-circle-add:before {
+.icon-shangxianjieda:before {
   content: "\e61d";
 }
 
-.icon-circle:before {
+.icon-zuodapei:before {
   content: "\e61e";
 }
 
-.icon-chevron-up:before {
+.icon-tianjiatupian:before {
   content: "\e61f";
 }
 
-.icon-caret-up:before {
+.icon-zaixianjiedan:before {
   content: "\e620";
 }
 
-.icon-check:before {
+.icon-zaixianjiedanxian:before {
   content: "\e621";
 }
 
-.icon-camera:before {
+.icon-jiedanjilumian:before {
   content: "\e622";
 }
 
-.icon-circle-arrow-up:before {
+.icon-jiedanjiluxian:before {
   content: "\e623";
 }
 
-.icon-circle-arrow-right:before {
+.icon-zaixianfuwuxian:before {
   content: "\e624";
 }
 
-.icon-circle-arrow-left:before {
+.icon-zaixianfuwumian:before {
   content: "\e625";
 }
 
-.icon-chevron-double-up:before {
+.icon-xiangqing:before {
   content: "\e626";
 }
 
-.icon-circle-arrow-down:before {
+.icon-shangmenfuwu1:before {
   content: "\e627";
 }
 
-.icon-chevron-down:before {
+.icon-shangmenfuwuxian:before {
   content: "\e628";
 }
 
-.icon-circle-error:before {
+.icon-qianjin:before {
   content: "\e629";
 }
 
-.icon-call:before {
+.icon-chenggong:before {
   content: "\e62a";
 }
 
-.icon-circle-warning:before {
+.icon-jiaru:before {
   content: "\e62b";
 }
 
-.icon-clock:before {
+.icon-gouwuche:before {
   content: "\e62c";
 }
 
-.icon-cloud:before {
+.icon-shejishizaixianbang:before {
   content: "\e62d";
 }
 
-.icon-clipboard:before {
+.icon-shangmenfuwu2:before {
   content: "\e62e";
 }
 
-.icon-circle-remove:before {
+.icon-zuodapeimian:before {
   content: "\e62f";
 }
 
-.icon-circle-help:before {
+.icon-zuodapeixian:before {
   content: "\e630";
 }
 
-.icon-cloud-upload:before {
+.icon-guanbi:before {
   content: "\e631";
 }
 
-.icon-computer:before {
+.icon-xingxing:before {
   content: "\e632";
 }
 
-.icon-circle-information:before {
+.icon-jingxiang:before {
   content: "\e633";
 }
 
-.icon-close:before {
+.icon-shangmencishu:before {
   content: "\e634";
 }
 
-.icon-document-check:before {
+.icon-bantianneihuiying:before {
   content: "\e635";
 }
 
-.icon-document-download:before {
+.icon-biaoqian:before {
+  content: "\e636";
+}
+
+.icon-yueta:before {
+  content: "\e637";
+}
+
+.icon-mianfeibangwozhaohuo:before {
   content: "\e638";
 }
 
-.icon-credit-card:before {
+.icon-bubeiluansaorao:before {
   content: "\e639";
 }
 
-.icon-document:before {
+.icon-bumanyizhongzuo:before {
   content: "\e63a";
 }
 
-.icon-drag:before {
+.icon-bumanyizhongzuo1:before {
   content: "\e63b";
 }
 
-.icon-clipboard-check:before {
+.icon-mianfeishangmendapei:before {
   content: "\e63c";
 }
 
-.icon-email:before {
+.icon-daodiantiyan:before {
   content: "\e63d";
 }
 
-.icon-delete-alt:before {
+.icon-tongchengshangjiabangnizhao:before {
   content: "\e63e";
 }
 
-.icon-chevron-double-right:before {
+.icon-fatuzhaohuo:before {
   content: "\e63f";
 }
 
-.icon-chevron-left:before {
+.icon-tongcheng:before {
   content: "\e640";
 }
 
-.icon-chevron-right:before {
+.icon-xiala:before {
   content: "\e641";
 }
 
-.icon-external-link:before {
+.icon-yezhu:before {
   content: "\e642";
 }
 
-.icon-eye:before {
+.icon-yezhuxian:before {
+  content: "\e643";
+}
+
+.icon-zijitiaomian:before {
   content: "\e644";
 }
 
-.icon-filter-alt:before {
+.icon-zijitiaoxian:before {
   content: "\e645";
 }
 
-.icon-cloud-download:before {
+.icon-jilu:before {
   content: "\e646";
 }
 
-.icon-circle-check:before {
+.icon-jilumian:before {
   content: "\e647";
 }
 
-.icon-filter:before {
+.icon-huanzhaopianxiangji:before {
   content: "\e648";
 }
 
-.icon-folder-check:before {
+.icon-zaixianfuwu2mian:before {
   content: "\e649";
 }
 
-.icon-document-remove:before {
+.icon-zaixianfuwu2xian:before {
   content: "\e64a";
 }
 
-.icon-folder:before {
+.icon-zaixianjiedan2xian:before {
   content: "\e64b";
 }
 
-.icon-edit-alt:before {
+.icon-zaixianjiedan2mian:before {
   content: "\e64c";
 }
 
-.icon-expand:before {
+.icon-qiugou2:before {
   content: "\e64d";
 }
 
-.icon-enter:before {
+.icon-nanengmai:before {
   content: "\e64e";
 }
 
-.icon-copy:before {
+.icon-dingdanmian:before {
   content: "\e64f";
 }
 
-.icon-laptop:before {
+.icon-dingdanxian:before {
   content: "\e650";
 }
 
-.icon-document-empty:before {
+.icon-nanengmai1:before {
   content: "\e651";
 }
 
-.icon-heart:before {
+.icon-qiugou21:before {
   content: "\e652";
 }
 
-.icon-folder-download:before {
+.icon-zijitiaoxian1:before {
   content: "\e653";
 }
 
-.icon-folder-add:before {
+.icon-0yuanfeiyong:before {
   content: "\e654";
 }
 
-.icon-image:before {
+.icon-0tuixiaoshoufei:before {
   content: "\e655";
 }
 
-.icon-link:before {
+.icon-0saoraodianhua:before {
   content: "\e656";
 }
 
-.icon-home:before {
+.icon-fatuzhaohuo1:before {
   content: "\e657";
 }
 
-.icon-location:before {
+.icon-tongchengshangjiabangnizhao1:before {
   content: "\e658";
 }
 
-.icon-inbox:before {
+.icon-daodiantiyan1:before {
   content: "\e659";
 }
 
-.icon-megaphone:before {
+.icon-dapeigongju:before {
   content: "\e65a";
 }
 
-.icon-menu:before {
+.icon-jingxuanchanpinku:before {
   content: "\e65b";
 }
 
-.icon-folder-remove:before {
+.icon-quanwangfenxiang:before {
   content: "\e65c";
 }
 
-.icon-eye-off:before {
+.icon-weishipin:before {
   content: "\e65d";
 }
 
-.icon-moon:before {
+.icon-zhuye:before {
   content: "\e65e";
 }
 
-.icon-mobile:before {
+.icon-zidingfuwufei:before {
   content: "\e65f";
 }
 
-.icon-lock:before {
-  content: "\e660";
+.icon-bianxie:before {
+  content: "\e67b";
+}
+
+.icon-wifi:before {
+  content: "\e67c";
+}
+
+.icon-caigoudan:before {
+  content: "\e67d";
+}
+
+.icon-chakan:before {
+  content: "\e67e";
+}
+
+.icon-chengshihehuoren:before {
+  content: "\e67f";
+}
+
+.icon-cuowu:before {
+  content: "\e680";
 }
 
-.icon-list:before {
-  content: "\e661";
+.icon-cuowu1:before {
+  content: "\e681";
 }
 
-.icon-log-out:before {
-  content: "\e662";
+.icon-daifukuan:before {
+  content: "\e682";
 }
 
-.icon-message-alt:before {
-  content: "\e663";
+.icon-daifahuo:before {
+  content: "\e683";
 }
 
-.icon-notification-off:before {
-  content: "\e664";
+.icon-daituihuo:before {
+  content: "\e684";
 }
 
-.icon-options-horizontal:before {
-  content: "\e665";
+.icon-baojia:before {
+  content: "\e685";
 }
 
-.icon-percentage:before {
-  content: "\e666";
+.icon-dizhi:before {
+  content: "\e686";
 }
 
-.icon-next:before {
-  content: "\e668";
+.icon-dianhua:before {
+  content: "\e687";
 }
 
-.icon-pin:before {
-  content: "\e669";
+.icon-daishouhuo:before {
+  content: "\e688";
 }
 
-.icon-favorite:before {
-  content: "\e66a";
+.icon-dianhua1:before {
+  content: "\e689";
 }
 
-.icon-remove:before {
-  content: "\e66b";
+.icon-dingwei:before {
+  content: "\e68a";
 }
 
-.icon-link-alt:before {
-  content: "\e66c";
+.icon-duihao:before {
+  content: "\e68b";
 }
 
-.icon-refresh:before {
-  content: "\e66d";
+.icon-fapiao:before {
+  content: "\e68c";
 }
 
-.icon-play:before {
-  content: "\e66e";
+.icon-fapiaoxinxi:before {
+  content: "\e68d";
 }
 
-.icon-search:before {
-  content: "\e66f";
+.icon-duihao1:before {
+  content: "\e68e";
 }
 
-.icon-send:before {
-  content: "\e670";
+.icon-fanhui:before {
+  content: "\e68f";
 }
 
-.icon-settings:before {
-  content: "\e671";
+.icon-fenxiang1:before {
+  content: "\e690";
 }
 
-.icon-notification:before {
-  content: "\e672";
+.icon-fenxiang2:before {
+  content: "\e691";
 }
 
-.icon-select:before {
-  content: "\e673";
+.icon-fangda:before {
+  content: "\e692";
 }
 
-.icon-message:before {
-  content: "\e674";
+.icon-fenxiang3:before {
+  content: "\e693";
 }
 
-.icon-options-vertical:before {
-  content: "\e675";
+.icon-fuzeren:before {
+  content: "\e694";
 }
 
-.icon-shopping-cart:before {
-  content: "\e676";
+.icon-fenxiang4:before {
+  content: "\e695";
 }
 
-.icon-shopping-cart-add:before {
-  content: "\e677";
+.icon-gonggao:before {
+  content: "\e696";
 }
 
-.icon-grid:before {
-  content: "\e678";
+.icon-gouwuche1:before {
+  content: "\e697";
 }
 
-.icon-stop:before {
-  content: "\e679";
+.icon-fapiaodayin:before {
+  content: "\e698";
 }
 
-.icon-speakers:before {
-  content: "\e67a";
+.icon-gouwuche2:before {
+  content: "\e699";
 }
 
-.icon-previous:before {
-  content: "\e67b";
+.icon-guanliyuan:before {
+  content: "\e69a";
 }
 
-.icon-table:before {
-  content: "\e67c";
+.icon-hehuoren:before {
+  content: "\e69b";
 }
 
-.icon-repeat:before {
-  content: "\e67d";
+.icon-gouwuche3:before {
+  content: "\e69c";
 }
 
-.icon-switch:before {
-  content: "\e67e";
+.icon-jingyin:before {
+  content: "\e69d";
 }
 
-.icon-map:before {
-  content: "\e67f";
+.icon-mima:before {
+  content: "\e69e";
 }
 
-.icon-undo:before {
-  content: "\e680";
+.icon-lingshoucaigou:before {
+  content: "\e69f";
 }
 
-.icon-user:before {
-  content: "\e681";
+.icon-piliangcaigou:before {
+  content: "\e6a0";
 }
 
-.icon-unlock:before {
-  content: "\e682";
+.icon-pinpaizhuanqu:before {
+  content: "\e6a1";
 }
 
-.icon-tablet:before {
-  content: "\e683";
+.icon-qunliao:before {
+  content: "\e6a2";
 }
 
-.icon-share:before {
-  content: "\e684";
+.icon-wo:before {
+  content: "\e6a3";
 }
 
-.icon-user-remove:before {
-  content: "\e685";
+.icon-shanchu1:before {
+  content: "\e6a4";
 }
 
-.icon-user-add:before {
-  content: "\e686";
+.icon-rili:before {
+  content: "\e6a5";
 }
 
-.icon-sunrise:before {
-  content: "\e687";
+.icon-shangjia:before {
+  content: "\e6a6";
 }
 
-.icon-sun:before {
-  content: "\e688";
+.icon-qunliao1:before {
+  content: "\e6a7";
 }
 
-.icon-sort:before {
-  content: "\e689";
+.icon-shangchuan:before {
+  content: "\e6a8";
 }
 
-.icon-user-check:before {
-  content: "\e68a";
+.icon-shangjiantou:before {
+  content: "\e6a9";
 }
 
-.icon-warning:before {
-  content: "\e68b";
+.icon-shangjiantou1:before {
+  content: "\e6aa";
 }
 
-.icon-volume-off:before {
-  content: "\e68c";
+.icon-shibai:before {
+  content: "\e6ab";
 }
 
-.icon-tag:before {
-  content: "\e68d";
+.icon-shangchuan1:before {
+  content: "\e6ac";
 }
 
-.icon-shuffle:before {
-  content: "\e68e";
+.icon-shouye:before {
+  content: "\e6ad";
 }
 
-.icon-users:before {
-  content: "\e68f";
+.icon-shezhi:before {
+  content: "\e6ae";
 }
 
-.icon-webcam:before {
-  content: "\e690";
+.icon-shouye1:before {
+  content: "\e6af";
 }
 
-.icon-volume-up:before {
-  content: "\e691";
+.icon-sousuo:before {
+  content: "\e6b0";
 }
 
-.icon-zoom-in:before {
-  content: "\e692";
+.icon-tijiaodingdan:before {
+  content: "\e6b1";
 }
 
-.icon-pause:before {
-  content: "\e693";
+.icon-suoxiao:before {
+  content: "\e6b2";
 }
 
-.icon-daochu:before {
-  content: "\e636";
+.icon-tishi:before {
+  content: "\e6b3";
 }
 
-.icon-daoru:before {
-  content: "\e637";
+.icon-wancheng:before {
+  content: "\e6b4";
+}
+
+.icon-wode:before {
+  content: "\e6b5";
+}
+
+.icon-xiajiantou:before {
+  content: "\e6b6";
+}
+
+.icon-xiadingdan:before {
+  content: "\e6b7";
+}
+
+.icon-xiajiantou1:before {
+  content: "\e6b8";
+}
+
+.icon-xiazai:before {
+  content: "\e6b9";
+}
+
+.icon-wodeyeji:before {
+  content: "\e6ba";
+}
+
+.icon-xiaoxi:before {
+  content: "\e6bb";
+}
+
+.icon-xiaoxi1:before {
+  content: "\e6bc";
+}
+
+.icon-xinjiandizhi:before {
+  content: "\e6bd";
+}
+
+.icon-xinwen:before {
+  content: "\e6be";
+}
+
+.icon-xinwen1:before {
+  content: "\e6bf";
+}
+
+.icon-xuanzhong:before {
+  content: "\e6c0";
+}
+
+.icon-xunjia:before {
+  content: "\e6c1";
+}
+
+.icon-xinzengshangpin:before {
+  content: "\e6c2";
+}
+
+.icon-yinle:before {
+  content: "\e6c3";
+}
+
+.icon-xunjiadan:before {
+  content: "\e6c4";
+}
+
+.icon-yiwancheng:before {
+  content: "\e6c5";
+}
+
+.icon-youjian:before {
+  content: "\e6c6";
+}
+
+.icon-youjiantou:before {
+  content: "\e6c7";
+}
+
+.icon-yincang:before {
+  content: "\e6c8";
+}
+
+.icon-zaixianxunjia:before {
+  content: "\e6c9";
+}
+
+.icon-youjiantou1:before {
+  content: "\e6ca";
+}
+
+.icon-zanwuxiaoxi:before {
+  content: "\e6cb";
+}
+
+.icon-zhangdan:before {
+  content: "\e6cc";
+}
+
+.icon-zanwuxiaoxi1:before {
+  content: "\e6cd";
+}
+
+.icon-zuojiantou:before {
+  content: "\e6ce";
+}
+
+.icon-zhanghuguanli:before {
+  content: "\e6cf";
+}
+
+.icon-zuojiantou1:before {
+  content: "\e6d0";
+}
+
+.icon-fenlei1:before {
+  content: "\e6d1";
+}
+
+.icon-fenlei2:before {
+  content: "\e6d2";
+}
+
+.icon-fangda1:before {
+  content: "\e6d3";
+}
+
+.icon-fangda2:before {
+  content: "\e6d4";
+}
+
+.icon-dizhi1:before {
+  content: "\e6d5";
+}
+
+.icon-fabu:before {
+  content: "\e6d6";
+}
+
+.icon-dingdan:before {
+  content: "\e6d7";
+}
+
+.icon-fapiao1:before {
+  content: "\e6d8";
+}
+
+.icon-hehuoren1:before {
+  content: "\e6d9";
+}
+
+.icon-qianbao:before {
+  content: "\e6da";
+}
+
+.icon-shanchu2:before {
+  content: "\e6db";
+}
+
+.icon-shoucang:before {
+  content: "\e6dc";
+}
+
+.icon-gongyingshang:before {
+  content: "\e6dd";
+}
+
+.icon-tuxingma:before {
+  content: "\e6de";
+}
+
+.icon-shaixuan1:before {
+  content: "\e6df";
+}
+
+.icon-xiaoxi2:before {
+  content: "\e6e0";
+}
+
+.icon-chenggong1:before {
+  content: "\e6e1";
+}
+
+.icon-xieyiguanli:before {
+  content: "\e6e2";
+}
+
+.icon-zhanghuguanli1:before {
+  content: "\e6e3";
+}
+
+.icon-piliangcaigouguanli:before {
+  content: "\e6e4";
+}
+
+.icon-xinzengpinpai:before {
+  content: "\e6e5";
+}
+
+.icon-tianxieziliao:before {
+  content: "\e6e6";
+}
+
+.icon-chenggongjiaru:before {
+  content: "\e6e7";
+}
+
+.icon-shenqingjiaru:before {
+  content: "\e6e8";
+}
+
+.icon-pingtaishenhe:before {
+  content: "\e6e9";
+}
+
+.icon-remen:before {
+  content: "\e6ea";
+}
+
+.icon-fuxuankuang_xuanzhong:before {
+  content: "\e6eb";
+}
+
+.icon-fuxuankuang_xuanzhong1:before {
+  content: "\e6ec";
+}
+
+.icon-fuxuankuang_weixuanzhong:before {
+  content: "\e6ed";
+}
+
+.icon-fuxuankuang_xuanzhong2:before {
+  content: "\e6ee";
+}
+
+.icon-fuxuankuang_weixuanzhong1:before {
+  content: "\e6ef";
+}
+
+.icon-fuxuankuang_xuanzhong3:before {
+  content: "\e6f0";
+}
+
+.icon-fuxuankuang_xuanzhong4:before {
+  content: "\e6f1";
+}
+
+.icon-fuxuankuang_weixuanzhong2:before {
+  content: "\e6f2";
+}
+
+.icon-fuxuankuang_xuanzhong5:before {
+  content: "\e6f3";
+}
+
+.icon-fuxuankuang_xuanzhong6:before {
+  content: "\e6f4";
+}
+
+.icon-fuxuankuang_weixuanzhong3:before {
+  content: "\e6f5";
+}
+
+.icon-shanchu3:before {
+  content: "\e6f6";
+}
+
+.icon-xinzeng:before {
+  content: "\e6f7";
+}
+
+.icon-tuihuozhong:before {
+  content: "\e6f8";
+}
+
+.icon-tuihuozhong1:before {
+  content: "\e6f9";
+}
+
+.icon-jian:before {
+  content: "\e6fa";
+}
+
+.icon-jia:before {
+  content: "\e6fb";
 }
 
-.icon-attachment:before {
-  content: "\e602";
+.icon-LOGO:before {
+  content: "\e6fc";
 }
 
-.icon-board:before {
-  content: "\e603";
+.icon-yishixiao:before {
+  content: "\e6fd";
 }
 
-.icon-iconset0204:before {
-  content: "\e667";
+.icon-shenfenxuanze:before {
+  content: "\e6fe";
 }
 
-.icon-serialnumber:before {
-  content: "\e604";
+.icon-lingshoucaigou1:before {
+  content: "\e6ff";
 }
 
-.icon-delete:before {
-  content: "\e600";
+.icon-fuxuankuang:before {
+  content: "\e700";
 }
 
-.icon-edit:before {
-  content: "\e601";
+.icon-fuxuankuang1:before {
+  content: "\e701";
 }
 
diff --git a/src/views/business/merchantManage.vue b/src/views/business/merchantManage.vue
index 7469495..6856aba 100644
--- a/src/views/business/merchantManage.vue
+++ b/src/views/business/merchantManage.vue
@@ -52,14 +52,17 @@ export default {
           prop:'username',
           label:'简称/用户名',
           width:150,
-          sortable:false
+          sortable:false,
+          align:'left',
+          fixed:"left"
         },
         {
           prop:'name',
           label:'全名',
           width: 200,
           sortable:false,
-          align:'left'
+          align:'left',
+          fixed:"left"
         },
         {
           prop:'business_number',
diff --git a/src/views/productService/commonService.vue b/src/views/productService/commonService.vue
new file mode 100644
index 0000000..ba8147c
--- /dev/null
+++ b/src/views/productService/commonService.vue
@@ -0,0 +1,168 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" :text="pageTitle" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <div slot="content"></div>
+        <slot>
+          <div style="display: flex">
+            <Input clearable v-model="select.keywords" style="width: 200px; margin-right: 10px" placeholder="关键字搜索" />
+
+
+            <Button type="primary" @click="getClubs">查询</Button>
+            <Button type="primary" style="margin-left: 10px" @click="$refs['addCommonService'].type = 'add',$refs['addCommonService'].isShow = true">新增</Button>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table
+      :total="total"
+      :list="list"
+      :table-item="table"
+      @pageSizeChange="e => select.pageSize = e"
+      @pageIndexChange="pageChange">
+      <template v-slot:btns>
+        <el-table-column fixed="right" label="操作" :width="130" align="left" header-align="center">
+          <template slot-scope="scope">
+                <Button  size="small" type="primary" @click="editorClub(scope.row)" style="margin: 0 6px 4px 0">编辑</Button>
+            <Poptip confirm transfer title="确认要删除吗" @on-ok="clubDelete(scope.row)">
+              <Button ghost size="small" type="primary" style="margin: 0 6px 4px 0">删除</Button>
+            </Poptip>
+
+          </template>
+        </el-table-column>
+      </template>
+    </xy-table>
+
+    <addCommonService ref="addCommonService" @refresh="getClubs"></addCommonService>
+  </div>
+</template>
+
+<script>
+import {index,destroy} from '@/api/productService/commonService'
+import {parseTime} from '@/utils'
+import { Message } from 'element-ui'
+
+import addCommonService from '@/views/productService/components/common/addCommonService'
+export default {
+  components:{
+    addCommonService
+  },
+  data() {
+    return {
+      pageTitle:"",
+      select:{
+        page:1,
+        page_size:10,
+        keywords:'',
+        type:'maternity'
+      },
+      total:0,
+      list:[],
+      table:[
+        {
+          prop:'name',
+          label:'名称',
+          minWidth:220,
+          align:'left'
+        },
+        {
+          prop:'reach',
+          label:'是否到店',
+          width: 120,
+          customFn:(row)=>{
+            return (
+              <div style={{'color': row.reach === 1 ? 'green' : 'red'}}>{row.reach === 1 ? '已到店' : '未到店'}</div>
+            )
+          }
+        },
+        {
+          label:'特色标签',
+          width: 260,
+          align:'left',
+          prop:'featured_label',
+          customFn:(row) => {
+            return (
+              <div>
+                {
+                  row.featured_label ?
+                  row.featured_label?.split(',').map(item => {
+                    return <el-tag type="border" style={{'margin':'0 6px 4px 0'}}>{item}</el-tag>
+                  }) :  <div style={{'text-align':'center'}}>无</div>
+                }
+              </div>
+            )
+          }
+        },
+        {
+          label:'排序',
+          width: 90,
+          prop:'sort_number'
+        },
+        {
+          label:'提交人',
+          prop:'admin.name',
+          width:180
+        },
+        {
+          label:'提交日期',
+          prop:'created_at',
+          width: 140,
+          formatter:(cell,data,value)=>{
+            return parseTime(new Date(value),'{y}-{m}-{d}')
+          }
+        }
+      ],
+
+    }
+  },
+  methods: {
+    async getClubs(){
+      const res = await index(this.select)
+      console.log(res)
+      this.list = res.data
+      this.total = res.total
+    },
+    pageChange(e){
+      this.select.page = e
+      this.getClubs()
+    },
+
+    clubDelete(row){
+      destroy({
+        id:row.id
+      }).then(res => {
+        Message({
+          type:'success',
+          message:'删除成功'
+        })
+        this.getClubs()
+      })
+    },
+    editorClub(row){
+      this.$refs['addCommonService'].type = 'editor'
+      this.$refs['addCommonService'].id = row.id
+      this.$refs['addCommonService'].isShow = true
+      this.$refs['addCommonService'].form.type= this.select.type
+
+
+    },
+    showInfo(row){
+      this.$refs['addClubInfo'].id = row.id
+      this.$refs['addClubInfo'].isShow = true
+    },
+    showPic(row){
+      this.$refs['addClubPic'].id = row.id
+      this.$refs['addClubPic'].isShow = true
+    }
+  },
+  mounted() {
+    this.getClubs();
+
+    this.pageTitle=this.$route.meta.title;
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/productService/commonServiceProduct.vue b/src/views/productService/commonServiceProduct.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/src/views/productService/commonServiceProduct.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/productService/components/common/addCommonService.vue b/src/views/productService/components/common/addCommonService.vue
new file mode 100644
index 0000000..3d7bbfa
--- /dev/null
+++ b/src/views/productService/components/common/addCommonService.vue
@@ -0,0 +1,676 @@
+<template>
+  <div>
+    <xy-dialog :width="74" ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增机构' : '编辑机构'"
+      :form="form" :rules="rules" @submit="submit">
+      <template v-slot:name>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>机构名称：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.name" placeholder="请输入机构名称" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:subheading>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            副标题：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.subheading" placeholder="请输入副标题" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:area>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>所在区域：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.area" placeholder="所在区域" style="width: 300px">
+              <el-option v-for="item in areas" :value="item.value" :key="item.value" :label="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:merchantId>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>所属商户：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.merchantId" placeholder="请选择所属商户" style="width: 300px">
+              <el-option v-for="item in merchants" :value="item.id" :key="item.id" :label="item.name"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:featuredLabel>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            特色标签：
+          </div>
+          <div class="xy-table-item-content">
+            <div class="xy-table-item-content-label">
+              <template v-for="(item,index) in form.featuredLabel">
+                <el-tag type="primary" closable @close="labelClose(index)"
+                  style="margin-right: 6px;margin-bottom: 4px;">{{item}}</el-tag>
+              </template>
+              <div style="margin-top: 15px;">
+                <el-input clearable placeholder="请填写并添加特色标签" style="width: 300px" ref="labelInput" v-model="labelText">
+                  <el-button type="primary" slot="append" icon="el-icon-plus" @click="appendLabel"></el-button>
+                </el-input>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:relLabel>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            关联标签：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select multiple v-model="form.relLabel" placeholder="请选择关联标签" style="width: 300px">
+              <el-option v-for="item in labels" :value="item.id" :key="item.id" :label="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:reach>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否到店：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.reach" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:state>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否启用：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.state" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:sortNumber>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            排序：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :precision="0" :controls="false" v-model="form.sortNumber" placeholder="请输入排序" clearable
+              style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:content>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>内容：
+          </div>
+          <div class="xy-table-item-content">
+            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:recommend>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否推荐主页：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.recommend" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:videoFile>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            宣传视频：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.videoFile" style="position: relative;">
+              <video :src="form.videoFile" class="avatar" />
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.videoFile = ''"></Button>
+            </div>
+            <el-upload v-else :limit="1" accept="video/*" class="avatar-uploader" list-type="picture-card"
+              :action="action" :show-file-list="true" :on-error="uploadFailVideo" :on-success="uploadSuccessVideo"
+              :before-upload="uploadBeforeVideo">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:coverPicture>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            封面图：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.coverPicture" style="position: relative;">
+              <img :src="form.coverPicture" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.coverPicture = ''"></Button>
+            </div>
+            <el-upload v-else accept="picture" :limit="1" class="avatar-uploader" list-type="picture-card"
+              :action="action" :show-file-list="true" :on-error="uploadFailPic" :on-success="uploadSuccessPic"
+              :before-upload="uploadBeforePic">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:address>
+        <div style="display: flex;flex-wrap: wrap">
+          <div class="xy-table-item" style="margin-bottom: 20px;">
+            <div class="xy-table-item-label">
+              地址选择
+            </div>
+            <div class="xy-table-item-content">
+              <avue-input-map style="width: 300px;" :params="option" placeholder="请选择地图" v-model="map"></avue-input-map>
+            </div>
+          </div>
+
+          <div class="xy-table-item">
+            <div class="xy-table-item-label">
+              地址：
+            </div>
+            <div class="xy-table-item-content">
+              <el-input clearable placeholder="请填写地址" v-model="form.address" style="width: 300px;" />
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:lng>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            经度：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input readonly v-model="form.lng" placeholder="请输入经度" clearable style="width: 120px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:lat>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            纬度：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input readonly v-model="form.lat" placeholder="请输入纬度" clearable style="width: 120px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:functionary>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            负责人：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.functionary" placeholder="请输入负责人" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:functionaryPhone>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            负责人电话：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.functionaryPhone" placeholder="请输入负责人电话" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:linkman>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            联系人：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.linkman" placeholder="请输入联系人" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:linkmanPhone>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            联系人电话：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.linkmanPhone" placeholder="请输入联系人电话" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:workTime>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            工作时间：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.workTime" placeholder="请输入工作时间" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:online_customer_services_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            客服：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.online_customer_services_id" placeholder="请选择">
+              <el-option v-for="item in listService" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    store,
+    show,
+    save,
+    getMerchantItems,
+    getPicture
+  } from '@/api/productService/commonService'
+  import {
+    index as merchantIndex
+  } from '@/api/merchant'
+  import {
+    getparameter
+  } from "@/api/system/dictionary"
+
+  import {
+    index as serviceIndex
+  } from "@/api/marketing/service"
+  import {
+    Message
+  } from 'element-ui'
+
+  import tinymce from '@/components/Tinymce'
+  export default {
+    components: {
+      tinymce
+    },
+    data() {
+      return {
+
+        listService: [],
+        id: '',
+        isShow: false,
+        type: '',
+        merchants: [],
+        areas: [],
+        labels: [],
+        action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
+
+        labelText: '',
+        map: {
+
+        },
+        option: {
+          column: [{
+            label: '坐标',
+            prop: 'map',
+            type: 'map',
+            //高德初始化参数
+            params: {
+              zoom: 10,
+              // zoomEnable: false,
+              // dragEnable: false,
+            }
+          }]
+        },
+        form: {
+          name: '',
+          type: "maternity",
+          subheading: '',
+          area: "",
+          merchantId: '',
+          featuredLabel: [], //特色标签
+          relLabel: '', //关联标签
+          reach: false, //是否到店,
+          state: true, //状态
+          sortNumber: 0,
+          content: '',
+          recommend: true,
+          videoFile: '',
+          coverPicture: '',
+          address: '',
+          lat: '', //纬度
+          lng: '', //经度
+          functionary: '', //负责人
+          functionaryPhone: '',
+          linkman: '',
+          linkmanPhone: '',
+          workTime: '',
+          online_customer_services_id: ""
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请填写机构名称'
+          }],
+          content: [{
+            required: true,
+            message: '请填写内容'
+          }],
+          functionaryPhone: [{
+            pattern: /^[1][3-9][\d]{9}/,
+            message: '手机号格式错误'
+          }],
+          linkmanPhone: [{
+            pattern: /^[1][3-9][\d]{9}/,
+            message: '手机号格式错误'
+          }],
+          merchantId: [{
+            required: true,
+            message: '请选择所属商户'
+          }]
+        }
+      }
+    },
+    methods: {
+      loadService() {
+        serviceIndex({
+          page: 1,
+          page_size: 999
+        }).then(res => {
+          this.listService = res.data;
+        })
+      },
+      //上传
+      uploadFailVideo(err) {
+        console.log(err)
+      },
+      uploadSuccessVideo(response) {
+        console.log(response)
+        this.form.videoFile = response.url
+      },
+      uploadBeforeVideo(file) {
+        if ((file.size / 1000) > 10240) {
+          Message({
+            type: 'warning',
+            message: '上传视频大小超过10M！'
+          })
+          return false
+        }
+      },
+      uploadFailPic(err) {
+        console.log(err)
+      },
+      uploadSuccessPic(response) {
+        console.log(response)
+        this.form.coverPicture = response.url
+      },
+      uploadBeforePic(file) {
+        if ((file.size / 1000) > 2048) {
+          Message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+
+      //特色标签添加
+      appendLabel() {
+        if (!this.$refs['labelInput'].getInput().value) return
+        this.form.featuredLabel.push(this.$refs['labelInput'].getInput().value)
+        this.labelText = ''
+      },
+      //特色标签删除
+      labelClose(index) {
+        this.form.featuredLabel.splice(index, 1)
+      },
+
+      async getLabels(number) {
+        const res = await getparameter({
+          number: number
+        })
+        if (number == "label") {
+          this.labels = res?.detail
+        } else if (number == "area") {
+          this.areas = res?.detail
+        }
+      },
+      async getMerchants() {
+        const res = await merchantIndex({
+          page: 1,
+          pageSize: 999
+        })
+        //console.log(res)
+        this.merchants = res?.data
+      },
+
+      //show
+      async getDetail() {
+        const res = await show({
+          id: this.id
+        })
+        console.log(res)
+        this.form = {
+          name: res?.name,
+          subheading: res?.subheading,
+          area: res?.area,
+          merchantId: res?.merchant_id,
+          featuredLabel: res?.featured_label?.split(',') || [], //特色标签
+          relLabel: res?.rel_label?.split(',').map(item => Number(item)), //关联标签
+          reach: !!res?.reach, //是否到店,
+          state: !!res?.state, //状态
+          sortNumber: res?.sort_number,
+          content: res?.content,
+          recommend: !!res?.recommend,
+          videoFile: res?.video_file,
+          coverPicture: res?.cover_picture,
+          address: res?.address,
+          lat: res?.latitude, //纬度
+          lng: res?.longitude, //经度
+          functionary: res?.functionary, //负责人
+          functionaryPhone: res?.functionary_phone,
+          linkman: res?.linkman,
+          linkmanPhone: res?.linkman_phone,
+          workTime: res?.work_time,
+          online_customer_services_id: res?.online_customer_services_id,
+          type: res?.type
+        }
+        console.log(this.form)
+        this.$refs['tinymce'].setContent(this.form.content)
+      },
+
+      submit() {
+        if (this.type === 'add') {
+          console.log(this.form)
+          store({
+            name: this.form.name,
+            merchant_id: this.form.merchantId,
+            state: this.form.state ? 1 : 0,
+            reach: this.form.reach ? 1 : 0,
+            sort_number: this.form.sortNumber,
+            featured_label: this.form.featuredLabel?.toString(),
+            rel_label: this.form.relLabel?.toString(),
+            content: this.form.content,
+            subheading: this.form.subheading,
+            recommend: this.form.recommend,
+            video_file: this.form.videoFile,
+            cover_picture: this.form.coverPicture,
+            latitude: this.form.lat,
+            longitude: this.form.lng,
+            address: this.form.address,
+            functionary: this.form.functionary,
+            functionary_phone: this.form.functionaryPhone,
+            linkman: this.form.linkman,
+            linkman_phone: this.form.linkmanPhone,
+            work_time: this.form.workTime,
+            area: this.form.area,
+            online_customer_services_id: this.form.online_customer_services_id,
+            type: this.form.type,
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '新增机构商户成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+          })
+        }
+
+        if (this.type === 'editor') {
+          save({
+            id: this.id,
+            name: this.form.name,
+            merchant_id: this.form.merchantId,
+            state: this.form.state ? 1 : 0,
+            reach: this.form.reach ? 1 : 0,
+            sort_number: this.form.sortNumber,
+            featured_label: this.form.featuredLabel?.toString(),
+            rel_label: this.form.relLabel?.toString(),
+            content: this.form.content,
+            subheading: this.form.subheading,
+            recommend: this.form.recommend,
+            video_file: this.form.videoFile,
+            cover_picture: this.form.coverPicture,
+            latitude: this.form.lat,
+            longitude: this.form.lng,
+            address: this.form.address,
+            functionary: this.form.functionary,
+            functionary_phone: this.form.functionaryPhone,
+            linkman: this.form.linkman,
+            linkman_phone: this.form.linkmanPhone,
+            work_time: this.form.workTime,
+            area: this.form.area,
+            online_customer_services_id: this.form.online_customer_services_id,
+            type: this.form.type,
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '编辑机构商户成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+          })
+        }
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.pictures = []
+          this.getMerchants()
+          this.getLabels("label")
+          this.getLabels("area")
+          this.loadService()
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.id = ''
+          this.type = ''
+          this.labelText = ''
+          this.$refs['dialog'].reset()
+          this.$refs['tinymce'].setContent(' ')
+        }
+        this.map = {}
+      },
+      map(newVal) {
+        this.form.lng = newVal[0]
+        this.form.lat = newVal[1]
+        //this.form.address = newVal[2]
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .xy-table-item {
+    &-label {
+      width: 160px;
+    }
+
+    &-content {
+      &-label {
+        width: 300px;
+        display: flex;
+        flex-wrap: wrap;
+        flex: 0;
+      }
+    }
+  }
+
+  ::v-deep .el-input__inner {
+    text-align: left;
+  }
+</style>
+<style>
+  .avatar-uploader .el-upload {
+    width: 110px;
+    height: 110px;
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .avatar-uploader .el-upload:hover {
+    border-color: #BF617C;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 110px;
+    height: 110px;
+    line-height: 110px;
+    text-align: center;
+  }
+
+  .avatar {
+    width: 110px;
+    display: block;
+    border-radius: 6px;
+  }
+
+  .img__delete {
+    transform: scale(0.7, 0.7);
+
+    position: absolute;
+    top: 1px;
+    left: 4%;
+  }
+</style>
diff --git a/src/views/productService/components/common/addCommonServiceProduct.vue b/src/views/productService/components/common/addCommonServiceProduct.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/src/views/productService/components/common/addCommonServiceProduct.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/productService/index.html b/src/views/productService/index.html
new file mode 100644
index 0000000..610440a
--- /dev/null
+++ b/src/views/productService/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=0">
+		<title>温馨提示</title>
+	</head>
+	<body>
+    <div style="text-align: center;margin-top: 100px;font-size:18px ;line-height: 40px;">
+      您的手机暂时不支持小程序的显示
+      <br/>请更换设备重新尝试
+      </div>
+	</body>
+</html>