diff --git a/src/router/modules/merchant.js b/src/router/modules/merchant.js
index 44ae576..ab69d30 100644
--- a/src/router/modules/merchant.js
+++ b/src/router/modules/merchant.js
@@ -75,6 +75,24 @@ const merchantRouter =
         },
         component: () => import('@/views/merchant/application/smoke_apply')
       },
+      {
+        path: 'hall',
+        name: 'hallShopList',
+        meta: {
+          title: '城市会客厅',
+          noCache: true
+        },
+        component: () => import('@/views/merchant/list/hall')
+      },
+      {
+        path: 'hall_apply',
+        name: 'hallApplyList',
+        meta: {
+          title: '入驻申请审核',
+          noCache: true
+        },
+        component: () => import('@/views/merchant/application/hall_apply')
+      },
       {
         path: 'supermarket',
         name: 'supermarketShopList',
diff --git a/src/views/merchant/application/hall_apply.vue b/src/views/merchant/application/hall_apply.vue
new file mode 100644
index 0000000..0150e79
--- /dev/null
+++ b/src/views/merchant/application/hall_apply.vue
@@ -0,0 +1,375 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <!--顶部搜索-->
+      <div slot="header" class="clearfix">
+        <div class="container">
+          <el-form size="small" label-width="100px" :inline="true">
+            <el-form-item label="选择时间：" style="width: 100%">
+              <el-radio-group
+                v-model="tableFrom.date"
+                size="small"
+                @change="selectChange(tableFrom.date)"
+              >
+                <el-radio-button
+                  v-for="(itemn, indexn) in fromList.fromTxt"
+                  :key="indexn"
+                  :label="itemn.val"
+                  >{{ itemn.text }}</el-radio-button
+                >
+              </el-radio-group>
+              <el-date-picker
+                v-model="timeVal"
+                type="daterange"
+                placeholder="选择日期"
+                format="yyyy/MM/dd"
+                value-format="yyyy/MM/dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                @change="onchangeTime"
+              />
+            </el-form-item>
+            <el-form-item label="状态：">
+              <el-radio-group
+                v-model="tableFrom.status"
+                size="small"
+                @change="statusChange(tableFrom.status)"
+              >
+                <el-radio-button
+                  v-for="(itemn, indexn) in statusList.fromTxt"
+                  :key="indexn"
+                  :label="itemn.val"
+                  >{{ itemn.text }}</el-radio-button
+                >
+              </el-radio-group>
+            </el-form-item>
+            <!--<el-form-item label="商户分类：">
+                <el-select
+                v-model="tableFrom.category_id"
+                clearable
+                placeholder="请选择"
+                class="selWidth"
+                @change="getList(1)"
+              >
+                 <el-option
+                    v-for="item in merCateList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="店铺类型：">
+              <el-select
+                v-model="tableFrom.type_id"
+                clearable
+                placeholder="请选择"
+                class="selWidth"
+                @change="getList(1)"
+              >
+                 <el-option
+                    v-for="item in storeType"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </el-form-item>-->
+            <el-form-item label="关键字：">
+              <el-input
+                v-model="tableFrom.keyword"
+                @keyup.enter.native="getList(1)"
+                placeholder="请输入商户名称关键字/联系电话"
+                class="selWidth"
+              >
+                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <!--表单-->
+      <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" highlight-current-row class="switchTable">
+        <el-table-column prop="mer_intention_id" label="ID" min-width="60" align="center"/>
+        <el-table-column label="申请人" min-width="230" align="center">
+          <template slot-scope="scope">
+            <div class="user-content" v-if="scope.row.applicant">
+              <div class="user-avatar" v-if="scope.row.applicant.avatar && scope.row.applicant.avatar != 1">
+                <img :src="scope.row.applicant.avatar" />
+              </div>
+              <div class="user-info">
+                <div class="nickname">{{ scope.row.applicant.nickname }}</div>
+                <div class="user-id">ID：{{ scope.row.applicant.uid }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="管理员" min-width="230" align="center">
+          <template slot-scope="scope">
+            <div class="user-content" v-if="scope.row.manage">
+              <div class="user-avatar" v-if="scope.row.manage.avatar && scope.row.manage.avatar != 1">
+                <img :src="scope.row.manage.avatar" />
+              </div>
+              <div class="user-info">
+                <div class="nickname">{{ scope.row.manage.nickname }}</div>
+                <div class="user-id">ID：{{ scope.row.manage.uid }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商户名称" min-width="100" align="left">
+          <template slot-scope="scope">
+            {{scope.row.mer_name || ''}}
+            <!--名称：{{scope.row.mer_name || ''}}<br />-->
+            <!--分类 ：{{scope.row.category_name || ''}}<br />-->
+            <!--类型：{{scope.row.type_name || ''}}<br />-->
+          </template>
+        </el-table-column>
+        <el-table-column label="联系人信息" min-width="100" align="center">
+          <template slot-scope="scope">
+            {{scope.row.name || ''}}<br />
+            {{scope.row.phone || ''}}<br />
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="申请时间" min-width="150" align="center"/>
+        <el-table-column label="资质图片" min-width="110">
+          <template slot-scope="scope">
+            <div class="qualification-image">
+              <el-image v-for="(item, index) in scope.row.images" :key="index" :src="item" class="mr5" :preview-src-list="[item]" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="80" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status == 1" type="success">通过</el-tag>
+            <el-tag v-if="scope.row.status == 0" type="info">未处理</el-tag>
+            <el-tag v-if="scope.row.status == 2" type="warning">未通过</el-tag>
+            <div v-if="scope.row.status == 2">{{ scope.row.fail_msg }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="mark" label="备注" min-width="150" />
+        <el-table-column label="操作" min-width="150" fixed="right" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.status == 0" type="text" size="small" @click="onchangeIsShow(scope.row.mer_intention_id)">审核</el-button>
+            <el-button type="text" size="small" @click="onEdit(scope.row.mer_intention_id)">备注</el-button>
+            <el-button type="text" size="small" @click="handleDelete(scope.row.mer_intention_id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+
+import {intentionLstApi, auditApi, intentionDelte, intentionStatusApi, getstoreTypeApi, getMerCateApi} from "@/api/merchant";
+import { fromList, statusList } from "@/libs/constants.js";
+import { roterPre } from "@/settings";
+export default {
+  name: "MerchantApplication",
+  data() {
+    return {
+      props: {
+        emitPath: false
+      },
+      fromList: fromList,
+      statusList: statusList, //筛选状态列表
+      roterPre: roterPre,
+      isChecked: false,
+      listLoading: true,
+      merCateList: [],
+      storeType: [],
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        date: "",
+        status: this.$route.query.status ? this.$route.query.status : "",
+        keyword: "",
+        mer_intention_id: this.$route.query.id ? this.$route.query.id : "",
+        category_id: "",
+        type_id: "",
+        merchant_type: 6,
+      },
+      mer_id: this.$route.query.id ? this.$route.query.id : "",
+      autoUpdate: true,
+      timeVal: [],
+    };
+  },
+  watch: {
+    mer_id(newName, oldName) {
+     this.getList("");
+    }
+  },
+  mounted() {
+    this.getMerCategory();
+    this.getStoreType();
+    this.getList("");
+  },
+  methods: {
+    // 选择时间
+    selectChange(tab) {
+      this.tableFrom.date = tab;
+      this.timeVal = [];
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    statusChange(tab) {
+      this.tableFrom.status = tab;
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 商户分类；
+    getMerCategory() {
+        getMerCateApi().then(res => {
+            this.merCateList = res.data
+        }).catch(res => {
+            this.$message.error(res.message)
+        })
+    },
+    /**获取店铺类型 */
+    getStoreType(){
+        getstoreTypeApi().then(res => {
+            this.storeType = res.data
+        }).catch(res => {
+            this.$message.error(res.message)
+        })
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      intentionLstApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList(1);
+    },
+    // 修改状态
+    onchangeIsShow(id) {
+      this.$modalForm(intentionStatusApi(id)).then(() => this.getList(""));
+    },
+    // 添加
+
+    // 编辑
+    onEdit(id) {
+      this.$modalForm(auditApi(id)).then(() => this.getList(""));
+    },
+    // 删除
+    handleDelete(id) {
+      this.$deleteSure().then(() => {
+        intentionDelte(id)
+          .then(({ message }) => {
+            this.$message.success(message);
+            this.getList("");
+          })
+          .catch(({ message }) => {
+            this.$message.error(message);
+          });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ .cell{
+  padding: 0!important;
+}
+.qualification-image{
+  width: 100%;
+  display: inline-flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+}
+/deep/ table .el-image {
+  display: inline-block !important;
+}
+.user-content{
+  --user-content-height-: 80px;
+
+  height: var(--user-content-height-);
+  width: 100%;
+  display: inline-flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: center;
+  align-items: center;
+  .user-avatar{
+    height: var(--user-content-height-);
+    width: var(--user-content-height-);
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: center;
+    align-items: center;
+    img{
+      height: 80%!important;
+      width: 80%!important;
+      border-radius: 50% !important;
+    }
+  }
+  .user-info{
+    width: calc(100% - var(--user-content-height-));
+    height: var(--user-content-height-);
+    display: inline-flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    justify-content: center;
+    align-items: flex-start;
+    .nickname{
+      width: 100%;
+      text-align: left;
+      font-size: 15px;
+      font-weight: bold;
+      line-height: calc(var(--user-content-height- * 65%));
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .user-id{
+      width: 100%;
+      text-align: left;
+      font-size: 13px;
+      line-height: calc(var(--user-content-height- * 35%));
+    }
+  }
+}
+</style>
diff --git a/src/views/merchant/list/hall.vue b/src/views/merchant/list/hall.vue
new file mode 100644
index 0000000..75da22b
--- /dev/null
+++ b/src/views/merchant/list/hall.vue
@@ -0,0 +1,378 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <div class="container">
+          <el-form size="small" label-width="100px" :inline="true">
+            <el-form-item label="选择时间：" style="display: inline-block">
+              <el-radio-group
+                v-model="tableFrom.date"
+                size="small"
+                @change="selectChange(tableFrom.date)"
+              >
+                <el-radio-button
+                  v-for="(itemn,indexn) in fromList.fromTxt"
+                  :key="indexn"
+                  :label="itemn.val"
+                >{{ itemn.text }}</el-radio-button>
+              </el-radio-group>
+              <el-date-picker
+                v-model="timeVal"
+                type="daterange"
+                placeholder="选择日期"
+                format="yyyy/MM/dd"
+                value-format="yyyy/MM/dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                @change="onchangeTime"
+              />
+            </el-form-item>
+            <el-form-item label="关键字：" label-width="80px" style="display: inline-block;">
+              <el-input
+                v-model="tableFrom.keyword"
+                @keyup.enter.native="getList(1)"
+                placeholder="请输入店铺关键字/店铺名/联系电话"
+                class="selWidth"
+              >
+                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
+              </el-input>
+            </el-form-item>
+            <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
+              <el-tab-pane
+                v-for="(item,index) in headeNum"
+                :key="index"
+                :name="item.type.toString()"
+                :label="item.title +'('+item.count +')' "
+              />
+            </el-tabs>
+          </el-form>
+        </div>
+        <el-button size="small" type="primary" @click="onAdd">添加城市会客厅</el-button>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="small"
+        highlight-current-row
+        class="switchTable"
+      >
+        <el-table-column prop="mer_id" label="ID" min-width="60" />
+        <el-table-column prop="mer_name" label="城市会客厅名称" min-width="150" />
+        <el-table-column prop="real_name" label="城市会客厅姓名" min-width="150" />
+
+        <el-table-column prop="status" label="推荐" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_best"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="是"
+              inactive-text="否"
+              disabled
+              @click.native="onchangeIsShow(scope.row)"
+            />
+          </template>
+        </el-table-column>
+         <el-table-column prop="status" label="开启/关闭" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.status"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="开启"
+              inactive-text="关闭"
+              disabled
+              @click.native="onchangeIsClose(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="创建时间" min-width="150" />
+        <el-table-column prop="margin" label="保证金" min-width="150">
+          <template slot-scope="scope">
+            <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>
+
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" label="排序" min-width="100" />
+        <el-table-column prop="mark" label="备注" min-width="200" />
+
+        <el-table-column label="操作" min-width="150" fixed="right" align="center">
+          <template slot-scope="scope">
+            <!-- <router-link
+              v-if="tableFrom.status === '1'"
+              :to="{path: roterPre+ '/merchant/list/reconciliation/' + scope.row.mer_id + '/1' }"
+            >
+              <el-button type="text" size="small" class="mr10">对账</el-button>
+            </router-link> -->
+            <el-button
+              v-if="tableFrom.status === '1'"
+              type="text"
+              size="small"
+              @click="onLogo(scope.row.mer_id)"
+            >登录</el-button>
+            <el-button type="text" size="small" @click="onEdit(scope.row.mer_id)">编辑</el-button>
+            <el-button type="text" size="small" @click="onDetails(scope.row.mer_id)">详情</el-button>
+            <el-button
+              v-if="tableFrom.status === '0'"
+              type="text"
+              size="small"
+              @click="handleDelete(scope.row.mer_id, scope.$index)"
+            >删除</el-button>
+            <!-- <el-button
+              v-if="tableFrom.status === '1'"
+              type="text"
+              size="small"
+              @click="onDeduct(scope.row.mer_id)"
+            >扣除保证金</el-button> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <!--城市会客厅详情-->
+    <mer-detail
+      ref="merDetail"
+      :merId="merId"
+      @closeDrawer="closeDrawer"
+      @changeDrawer="changeDrawer"
+      @onPassword="onPassword"
+      @handleTimes="handleTimes"
+      @getList="getList"
+      :drawer="drawer"
+      :defaultMerchantType="6"
+    ></mer-detail>
+  </div>
+</template>
+<script>
+
+import {
+  merchantListApi,
+  merchantCreateApi,
+  merchantUpdateApi,
+  merchantDeleteForm,
+  merchantStatuseApi,
+  merchantPasswordApi,
+  merchantLoginApi,
+  changeCopyApi,
+  merchantCountApi,
+  merchantIsCloseApi,
+  getstoreTypeApi,
+  getMerCateApi, marginDeductionForm
+} from "@/api/merchant";
+import merDetail from './handle/merDetails.vue';
+import { fromList } from "@/libs/constants.js";
+import { roterPre } from "@/settings";
+import SettingMer from "@/libs/settingMer";
+import Cookies from "js-cookie";
+export default {
+  name: "MerchantList",
+  components: { merDetail },
+  data() {
+    return {
+      fromList: fromList,
+      roterPre: roterPre,
+      isChecked: false,
+      listLoading: true,
+      merCateList: [],
+      storeType: [],
+      headeNum: [
+        {
+          count: '',
+          type: "1",
+          title: "正常开启的城市会客厅"
+        },
+        {
+          count: '',
+          type: "0",
+          title: "已关闭城市会客厅"
+        }
+      ],
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        date: "",
+        status: "1",
+        keyword: "",
+        is_trader: "",
+        is_best: "",
+        category_id: '',
+        type_id: "",
+        merchant_type: 6
+      },
+      autoUpdate: true,
+      merId: "",
+      drawer: false,
+      timeVal: []
+    };
+  },
+  mounted() {
+    this.getHeadNum();
+    this.getMerCategory();
+    this.getStoreType();
+    this.getList("");
+  },
+  methods: {
+    onLogo(id) {
+      merchantLoginApi(id)
+        .then(res => {
+          Cookies.set("merchantToken", res.data.token);
+          window.open(SettingMer.httpUrl + res.data.url);
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 选择时间
+    selectChange(tab) {
+      this.tableFrom.date = tab;
+      this.timeVal = [];
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
+    // 获取开启城市会客厅数
+    getHeadNum() {
+      merchantCountApi(this.tableFrom)
+        .then(res => {
+          this.headeNum[0]["count"] = res.data.valid;
+          this.headeNum[1]["count"] = res.data.invalid;
+        })
+        .catch(res => {});
+    },
+    // 城市会客厅分类；
+    getMerCategory() {
+        getMerCateApi().then(res => {
+            this.merCateList = res.data
+        }).catch(res => {
+            this.$message.error(res.message)
+        })
+    },
+    getStoreType(){
+        getstoreTypeApi().then(res => {
+            this.storeType = res.data
+        }).catch(res => {
+            this.$message.error(res.message)
+        })
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      merchantListApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch(res => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList(1);
+    },
+    // 修改状态
+    onchangeIsShow(row) {
+      const title = row.is_best === 0 ? "是否开启推荐城市会客厅" : "是否关闭推荐城市会客厅";
+      this.$modalSure(title).then(() => {
+        merchantStatuseApi(row.mer_id, row.is_best === 1 ? 0 : 1)
+          .then(({ message }) => {
+            this.$message.success(message);
+            this.getList("");
+          })
+          .catch(({ message }) => {
+            this.$message.error(message);
+          });
+      });
+    },
+    // 开启关闭
+    onchangeIsClose(row) {
+      merchantIsCloseApi(row.mer_id, row.status === 1 ? 0 : 1)
+        .then(({ message }) => {
+          this.$message.success(message);
+          this.getList("");
+        })
+        .catch(({ message }) => {
+          this.$message.error(message);
+        });
+    },
+    // 添加
+    onAdd() {
+      // this.$modalForm(merchantCreateApi()).then(() => this.getList(""));
+      this.drawer = true;
+      this.$refs.merDetail.initData();
+
+
+    },
+    // 编辑
+    onEdit(id) {
+      this.merId = id;
+      this.$refs.merDetail.isEdit = true;
+      this.$refs.merDetail.getInfo(id);
+      this.drawer = true;
+
+    },
+    // 详情
+    onDetails(id) {
+      this.merId = id;
+      this.$refs.merDetail.isEdit = false;
+      this.$refs.merDetail.getInfo(id);
+      this.drawer = true;
+    },
+    changeDrawer(v) {
+      this.drawer = v;
+    },
+    closeDrawer() {
+      this.drawer = false;
+    },
+    // 删除
+    handleDelete(id) {
+      this.$modalForm(merchantDeleteForm(id)).then(() => this.getList(""));
+    },
+    // 扣除保证金
+    onDeduct(id) {
+      this.$modalForm(marginDeductionForm(id)).then(() => this.getList(""));
+    },
+    // 设置复制次数
+    handleTimes(id) {
+      this.$modalForm(changeCopyApi(id)).then(() => this.getList(""));
+    },
+
+    // 修改密码表单
+    onPassword(id) {
+      this.$modalForm(merchantPasswordApi(id));
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 1d8f220..f0697b2 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -534,6 +534,7 @@ export default {
         else if(this.defaultMerchantType == 3) this.mar_type_name = '烟酒店';
         else if(this.defaultMerchantType == 4) this.mar_type_name = '超市';
         else if(this.defaultMerchantType == 5) this.mar_type_name = '门店';
+        else if(this.defaultMerchantType == 6) this.mar_type_name = '城市会客厅';
         else this.mar_type_name = '商户';
 
 
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 118f973..682b6fb 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -272,6 +272,7 @@ export default {
         else if(this.defaultMerchantType == 3) this.mar_type_name = '烟酒店';
         else if(this.defaultMerchantType == 4) this.mar_type_name = '超市';
         else if(this.defaultMerchantType == 5) this.mar_type_name = '门店';
+        else if(this.defaultMerchantType == 6) this.mar_type_name = '城市会客厅';
         else this.mar_type_name = '商户';
       },
       deep: true
diff --git a/src/views/merchant/list/province.vue b/src/views/merchant/list/province.vue
index cdee5e2..e3016a7 100644
--- a/src/views/merchant/list/province.vue
+++ b/src/views/merchant/list/province.vue
@@ -38,62 +38,6 @@
                 <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
               </el-input>
             </el-form-item>
-            <el-form-item label="门店类别：">
-              <el-select
-                v-model="tableFrom.is_trader"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option label="自营" value="1" />
-                <el-option label="非自营" value="0" />
-              </el-select>
-            </el-form-item>
-             <el-form-item label="门店分类：">
-                <el-select
-                v-model="tableFrom.category_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in merCateList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="店铺类型：">
-              <el-select
-                v-model="tableFrom.type_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in storeType"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否推荐：">
-              <el-select
-                v-model="tableFrom.is_best"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option key="1" label="是" value="1"/>
-                <el-option key="0" label="否" value="0"/>
-              </el-select>
-            </el-form-item>
             <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
               <el-tab-pane
                 v-for="(item,index) in headeNum"
diff --git a/src/views/merchant/list/shop.vue b/src/views/merchant/list/shop.vue
index f199fcf..2aac02a 100644
--- a/src/views/merchant/list/shop.vue
+++ b/src/views/merchant/list/shop.vue
@@ -38,62 +38,6 @@
                 <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
               </el-input>
             </el-form-item>
-            <el-form-item label="酒道馆类别：">
-              <el-select
-                v-model="tableFrom.is_trader"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option label="自营" value="1" />
-                <el-option label="非自营" value="0" />
-              </el-select>
-            </el-form-item>
-             <el-form-item label="酒道馆分类：">
-                <el-select
-                v-model="tableFrom.category_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in merCateList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="店铺类型：">
-              <el-select
-                v-model="tableFrom.type_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in storeType"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否推荐：">
-              <el-select
-                v-model="tableFrom.is_best"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option key="1" label="是" value="1"/>
-                <el-option key="0" label="否" value="0"/>
-              </el-select>
-            </el-form-item>
             <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
               <el-tab-pane
                 v-for="(item,index) in headeNum"
diff --git a/src/views/merchant/list/smoke.vue b/src/views/merchant/list/smoke.vue
index d774aee..6530306 100644
--- a/src/views/merchant/list/smoke.vue
+++ b/src/views/merchant/list/smoke.vue
@@ -38,62 +38,6 @@
                 <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
               </el-input>
             </el-form-item>
-            <el-form-item label="烟酒店类别：">
-              <el-select
-                v-model="tableFrom.is_trader"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option label="自营" value="1" />
-                <el-option label="非自营" value="0" />
-              </el-select>
-            </el-form-item>
-             <el-form-item label="烟酒店分类：">
-                <el-select
-                v-model="tableFrom.category_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in merCateList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="店铺类型：">
-              <el-select
-                v-model="tableFrom.type_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in storeType"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否推荐：">
-              <el-select
-                v-model="tableFrom.is_best"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option key="1" label="是" value="1"/>
-                <el-option key="0" label="否" value="0"/>
-              </el-select>
-            </el-form-item>
             <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
               <el-tab-pane
                 v-for="(item,index) in headeNum"
diff --git a/src/views/merchant/list/supermarket.vue b/src/views/merchant/list/supermarket.vue
index 8201415..3702fc7 100644
--- a/src/views/merchant/list/supermarket.vue
+++ b/src/views/merchant/list/supermarket.vue
@@ -38,62 +38,6 @@
                 <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
               </el-input>
             </el-form-item>
-            <el-form-item label="超市类别：">
-              <el-select
-                v-model="tableFrom.is_trader"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option label="自营" value="1" />
-                <el-option label="非自营" value="0" />
-              </el-select>
-            </el-form-item>
-             <el-form-item label="超市分类：">
-                <el-select
-                v-model="tableFrom.category_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in merCateList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="店铺类型：">
-              <el-select
-                v-model="tableFrom.type_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in storeType"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否推荐：">
-              <el-select
-                v-model="tableFrom.is_best"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option key="1" label="是" value="1"/>
-                <el-option key="0" label="否" value="0"/>
-              </el-select>
-            </el-form-item>
             <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
               <el-tab-pane
                 v-for="(item,index) in headeNum"
diff --git a/src/views/merchant/list/supplier.vue b/src/views/merchant/list/supplier.vue
index de08aff..16779e0 100644
--- a/src/views/merchant/list/supplier.vue
+++ b/src/views/merchant/list/supplier.vue
@@ -38,62 +38,6 @@
                 <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
               </el-input>
             </el-form-item>
-            <el-form-item label="供应商类别：">
-              <el-select
-                v-model="tableFrom.is_trader"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option label="自营" value="1" />
-                <el-option label="非自营" value="0" />
-              </el-select>
-            </el-form-item>
-             <el-form-item label="供应商分类：">
-                <el-select
-                v-model="tableFrom.category_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in merCateList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="店铺类型：">
-              <el-select
-                v-model="tableFrom.type_id"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                 <el-option
-                    v-for="item in storeType"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否推荐：">
-              <el-select
-                v-model="tableFrom.is_best"
-                clearable
-                placeholder="请选择"
-                class="selWidth"
-                @change="getList(1)"
-              >
-                <el-option key="1" label="是" value="1"/>
-                <el-option key="0" label="否" value="0"/>
-              </el-select>
-            </el-form-item>
             <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
               <el-tab-pane
                 v-for="(item,index) in headeNum"