diff --git a/src/api/merchant.js b/src/api/merchant.js
index 47dd3a9..cad095d 100644
--- a/src/api/merchant.js
+++ b/src/api/merchant.js
@@ -9,11 +9,23 @@
 // +----------------------------------------------------------------------
 import request from './request'
 
+
 // 新增修改状态
 export function updateStatus(mer_id, data) {
   return request.post(`merchant/intention/status/${mer_id}`, data)
 }
 
+// 商户变更申请列表
+export function shopChangeList(data) {
+  return request.get(`merchant/intention/list`, data)
+}
+
+
+// 商户变更审核
+export function shoptypeAudit(data) {
+  return request.post(`merchant/intention/change/` + data.mer_intention_id, data)
+}
+
 /**
  * @description 商户权限管理 -- 列表
  */
diff --git a/src/router/modules/merchant.js b/src/router/modules/merchant.js
index 6cb88a0..3f83798 100644
--- a/src/router/modules/merchant.js
+++ b/src/router/modules/merchant.js
@@ -10,135 +10,144 @@
 import Layout from '@/layout'
 import { roterPre } from '@/settings'
 const merchantRouter =
+{
+  path: `${roterPre}/merchant`,
+  name: 'merchant',
+  meta: {
+    icon: 'dashboard',
+    title: '商户管理'
+  },
+  alwaysShow: true,
+  component: Layout,
+  children: [
     {
-      path: `${roterPre}/merchant`,
-      name: 'merchant',
+      path: 'system',
+      name: 'MerchantSystem',
       meta: {
-        icon: 'dashboard',
-        title: '商户管理'
+        title: '商户权限管理',
+        noCache: true
       },
-      alwaysShow: true,
-      component: Layout,
-      children: [
-        {
-          path: 'system',
-          name: 'MerchantSystem',
-          meta: {
-            title: '商户权限管理',
-            noCache: true
-          },
-          component: () => import('@/views/merchant/system/index')
-        },
-        {
-          path: 'list',
-          name: 'MerchantList',
-          meta: {
-            title: '商户列表',
-            noCache: true
-          },
-          component: () => import('@/views/merchant/list/index')
-        },
-        {
-          path: 'list/reconciliation/:id/:type?',
-          name: 'MerchantRecord',
-          component: () => import('@/views/merchant/list/record'),
-          meta: {
-            title: '商户对账',
-            noCache: true,
-            activeMenu: `${roterPre}/merchant/list`
-          },
-          hidden: true
-        },
-        {
-          path: 'classify',
-          name: 'MerchantClassify',
-          meta: {
-            title: '商户分类',
-            noCache: true
-          },
-          component: () => import('@/views/merchant/classify')
-        },
-        {
-          path: 'application',
-          name: 'MerchantApplication',
-          meta: {
-            title: '商户申请',
-            noCache: true
-          },
-          component: () => import('@/views/merchant/application')
-        },
-        {
-          path: 'wholesaleApply',
-          name: 'wholesaleApply',
-          meta: {
-            title: '商户批发申请',
-            noCache: true
-          },
-          component: () => import('@/views/merchant/wholesaleApply')
-        },
-        {
-          path: 'agree',
-          name: 'MerchantAgreement',
-          meta: {
-            title: '入驻协议',
-            noCache: true
-          },
-          component: () => import('@/views/merchant/agreement')
-        },
-        {
-            path: 'type',
-            name: 'storeType',
-            meta: {
-              title: '店铺类型',
-              noCache: true
-            },
-            component: () => import('@/views/merchant/type/index')
-          },
-          {
-            path: 'applyMents',
-            name: 'MerchantApplyMents',
-            meta: {
-              title: '服务申请',
-              noCache: true
-            },
-            component: () => import('@/views/merchant/applyments/index')
-          },
-          {
-            path: 'applyList',
-            name: 'ApplyList',
-            meta: {
-              title: '分账商户列表'
-            },
-            component: () => import('@/views/merchant/applyments/list')
-          },
-          {
-            path: 'type/description',
-            name: 'MerTypeDesc',
-            meta: {
-              title: '店铺类型说明',
-              noCache: true,
-            },
-            component: () => import('@/views/merchant/type/description')
-          },
-          {
-            path: 'deposit_list',
-            name: 'DepositList',
-            meta: {
-              title: '店铺保证金管理',
-              noCache: true
-            },
-            component: () => import('@/views/merchant/deposit/index')
-          },
-          {
-            path: 'recharge_record',
-            name: 'RechargeRecord',
-            meta: {
-              title: '商户充值记录',
-              noCache: true
-            },
-            component: () => import('@/views/merchant/rechargeRecord/index')
-          },
-      ]
-    }
+      component: () => import('@/views/merchant/system/index')
+    },
+    {
+      path: 'list',
+      name: 'MerchantList',
+      meta: {
+        title: '商户列表',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/list/index')
+    },
+    {
+      path: 'list/reconciliation/:id/:type?',
+      name: 'MerchantRecord',
+      component: () => import('@/views/merchant/list/record'),
+      meta: {
+        title: '商户对账',
+        noCache: true,
+        activeMenu: `${roterPre}/merchant/list`
+      },
+      hidden: true
+    },
+    {
+      path: 'classify',
+      name: 'MerchantClassify',
+      meta: {
+        title: '商户分类',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/classify')
+    },
+    {
+      path: 'application',
+      name: 'MerchantApplication',
+      meta: {
+        title: '商户申请',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/application')
+    },
+    {
+      path: 'wholesaleApply',
+      name: 'wholesaleApply',
+      meta: {
+        title: '商户批发申请',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/wholesaleApply')
+    },
+    {
+      path: 'shoptype',
+      name: 'MerchantShoptype',
+      meta: {
+        title: '商户申请',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/shoptype')
+    },
+    {
+      path: 'agree',
+      name: 'MerchantAgreement',
+      meta: {
+        title: '入驻协议',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/agreement')
+    },
+    {
+      path: 'type',
+      name: 'storeType',
+      meta: {
+        title: '店铺类型',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/type/index')
+    },
+    {
+      path: 'applyMents',
+      name: 'MerchantApplyMents',
+      meta: {
+        title: '服务申请',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/applyments/index')
+    },
+    {
+      path: 'applyList',
+      name: 'ApplyList',
+      meta: {
+        title: '分账商户列表'
+      },
+      component: () => import('@/views/merchant/applyments/list')
+    },
+    {
+      path: 'type/description',
+      name: 'MerTypeDesc',
+      meta: {
+        title: '店铺类型说明',
+        noCache: true,
+      },
+      component: () => import('@/views/merchant/type/description')
+    },
+    {
+      path: 'deposit_list',
+      name: 'DepositList',
+      meta: {
+        title: '店铺保证金管理',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/deposit/index')
+    },
+    {
+      path: 'recharge_record',
+      name: 'RechargeRecord',
+      meta: {
+        title: '商户充值记录',
+        noCache: true
+      },
+      component: () => import('@/views/merchant/rechargeRecord/index')
+    },
+  ]
+}
 
 export default merchantRouter
diff --git a/src/views/accounts/subsidy/index.vue b/src/views/accounts/subsidy/index.vue
index 78b5aac..f6392ed 100644
--- a/src/views/accounts/subsidy/index.vue
+++ b/src/views/accounts/subsidy/index.vue
@@ -43,17 +43,19 @@
         <el-table-column prop="extra.sale_target" label="销售目标金额" min-width="120" />
         <el-table-column prop="extra.official_purchase_target" label="里海云仓采购目标金额" min-width="150" />
         <el-table-column prop="extra.purchase_target" label="其他店铺采购目标金额" min-width="150" />
-        <!-- <el-table-column prop="extra.purchase_target" label="春耕采购余额" min-width="150" /> -->
         <el-table-column prop="create_time" label="创建时间" min-width="150" sortable />
         <el-table-column label="操作" min-width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
-              v-if="scope.row.send_status == 0"
               type="text"
               size="small"
               @click="handleStatus(scope.row.id, scope.$index)"
             >审核</el-button>
-            <el-button type="text" size="small" class="mr10" @click="showDialog(scope.row)">修改</el-button>
+          </template>
+          <template slot-scope="scope">
+            <router-link v-if="scope.row.send_status == 0" :to=" { path:`${roterPre}` + '/order/list?order_sn='+scope.row.order_sn } ">
+              <el-button type="text" size="small" class="mr10">修改</el-button>
+            </router-link>
           </template>
         </el-table-column>
       </el-table>
@@ -69,53 +71,6 @@
         />
       </div>
     </el-card>
-    <el-dialog title="修改数据" :visible.sync="dialogVisible">
-      <el-form ref="editForm" :model="formData" label-width="160px" :rules="rules">
-        <el-form-item label="销售目标金额">
-          <el-input
-            type="number"
-            readonly
-            v-model="formData.extra.sale_target"
-            placeholder="销售目标金额"
-          />
-        </el-form-item>
-        <el-form-item label="里海云仓采购目标金额">
-          <el-input
-            type="number"
-            readonly
-            v-model="formData.extra.official_purchase_target"
-            placeholder="里海云仓采购目标金额"
-          />
-        </el-form-item>
-        <el-form-item label="其他店铺采购目标金额">
-          <el-input
-            type="number"
-            readonly
-            v-model="formData.extra.purchase_target"
-            placeholder="其他店铺采购目标金额"
-          />
-        </el-form-item>
-        <el-form-item label="重新审核说明">
-          <el-input
-            type="number"
-            readonly
-            v-model="formData.reason"
-            placeholder="重新审核说明"
-          />
-        </el-form-item>
-        <el-form-item label="补贴金额" prop="amount">
-          <el-input
-            type="number"
-            v-model="formData.amount"
-            placeholder="请输入补贴金额"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button @click="updateInfo" type="primary">确 认</el-button>
-      </div>
-    </el-dialog>
     <!-- <editForm ref="editForm" @complete="fetchData"></editForm> -->
   </div>
 </template>
@@ -139,7 +94,6 @@ export default {
         data: [],
         total: 0
       },
-      dialogVisible: false,
       roterPre: roterPre,
       listLoading: true,
       tableFrom: {
@@ -152,39 +106,12 @@ export default {
       fromList: fromList,
       options: [],
       cardLists: [],
-      formData: {
-        extra: {}
-      },
-      rules:{
-        amount: [{
-          required: true,
-          message: '请输入补贴金额',
-          tigger: 'blur'
-        }]
-      }
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
-    showDialog(row){
-      this.formData = {...row};
-      this.dialogVisible = true;
-    },
-    updateInfo(){
-      this.$refs.editForm.validate((valid) => {
-        if (valid) {
-          subsidyUpdateApi(this.formData).then(res => {
-            this.$message.success(res.message);
-            this.dialogVisible = false;
-            this.getList()
-          }).catch(res => {
-            this.$message.error(res.message);
-          })
-        }
-      })
-    },
     /**重置 */
     searchReset(){
       this.timeVal = []
diff --git a/src/views/merchant/shoptype/index.vue b/src/views/merchant/shoptype/index.vue
new file mode 100644
index 0000000..6058083
--- /dev/null
+++ b/src/views/merchant/shoptype/index.vue
@@ -0,0 +1,295 @@
+<template>
+    <div class="divBox">
+        <div class="selCard">
+            <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
+                <el-form-item label="审核状态：" prop="category_id">
+                    <el-select v-model="tableFrom.status" clearable placeholder="请选择" class="selWidth"
+                        @change="getList(1)">
+                        <el-option label="全部" value="" />
+                        <el-option label="待审核" :value="0" />
+                        <el-option label="审核通过" :value="1" />
+                        <el-option label="审核不通过" :value="2" />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="关键字：" prop="keyword">
+                    <el-input v-model="tableFrom.keyword" @keyup.enter.native="getList(1)"
+                        placeholder="请输入店铺关键字/店铺名/联系电话" class="selWidth" clearable />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
+                    <el-button size="small" @click="searchReset()">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+
+        <el-card class="mt14">
+            <el-table v-loading="listLoading" :data="tableData.data" size="small" highlight-current-row>
+                <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="type_name" label="商户类型" min-width="150" />
+                <el-table-column prop="status" label="审核状态" min-width="100">
+                    <template slot-scope="scope">
+                        <span class="t-color gray" v-if="scope.row.status == 0">待审核</span>
+                        <span class="t-color green" v-if="scope.row.status == 1">审核通过</span>
+                        <span class="t-color red" v-if="scope.row.status == 2">审核不通过</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="审核人姓名" min-width="150" />
+                <el-table-column prop="phone" label="审核人手机号" min-width="150" />
+                <el-table-column prop="create_time" label="申请时间" min-width="150" />
+                <el-table-column prop="update_time" label="审核时间" min-width="150">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.update_time">{{ scope.row.update_time }}</span>
+                        <span v-else>{{ "-" }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="fail_msg" label="备注" min-width="150" />
+                <el-table-column label="操作" min-width="150" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button v-if="scope.row.status == 0" type="text" size="small"
+                            @click="handleAudit(scope.row)">审核</el-button>
+                        <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="block">
+                <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
+                    layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+                    @current-change="pageChange" />
+            </div>
+        </el-card>
+
+        <!-- 审核状态 -->
+        <el-dialog :title="title" :visible.sync="statusAuditVisible" width="60%">
+            <el-form ref="auditForm" :model="auditForm" label-width="120px" @submit.native.prevent>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="审核状态：" prop="status">
+                            <el-select v-model="auditForm.status" placeholder="请选择审核状态" style="width:100%;" :disabled="title=='详情'?true:false">
+                                <el-option label="审核中" :value="0" v-if="title == '详情'"></el-option>
+                                <el-option label="同意" :value="1"></el-option>
+                                <el-option label="拒绝" :value="2"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注：" prop="fail_msg"
+                            :rules="{ required: auditForm.status == 2 ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
+                            <el-input type="textarea" :rows="2" placeholder="请输入备注:" v-model="auditForm.fail_msg"
+                                style="width:100%;" :disabled="title=='详情'?true:false">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="商户姓名：">
+                            <el-input v-model="auditForm.mer_name" style="width:100%;" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="申请类型：">
+                            <el-input v-model="auditForm.type_name" style="width:100%;" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="申请时间：">
+                            <el-input v-model="auditForm.create_time" style="width:100%;" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="审核时间：">
+                            <el-input v-model="auditForm.update_time" style="width:100%;" disabled></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer">
+                <el-button type="primary" size="small" plain @click="statusAuditVisible = false">取消</el-button>
+                <el-button type="primary" class="submission" size="small" @click="handleSubmit()" v-if="title != '详情'">提交</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import {
+    merchantStatuseApi,
+    merchantIsCloseApi,
+    shopChangeList,
+    shoptypeAudit
+} from "@/api/merchant";
+export default {
+    name: "MerchantList",
+    data() {
+        return {
+            statusAuditVisible: false,
+            auditForm: {
+                status: '',
+                id: '',
+                fail_msg: ''
+            },
+            listLoading: true,
+            merCateList: [],
+            storeType: [],
+            tableData: {
+                data: [],
+                total: 0
+            },
+            tableFrom: {
+                page: 1,
+                limit: 20,
+                date: "",
+                status: '',
+                keyword: "",
+                is_trader: "",
+                is_best: "",
+                category_id: '',
+                type_id: ""
+            },
+            autoUpdate: true,
+            merId: "",
+            drawer: false,
+            timeVal: [],
+            title: ''
+        };
+    },
+    mounted() {
+        this.getList("");
+    },
+    methods: {
+
+        // 审核
+        handleAudit(e) {
+            this.auditForm = e;
+            this.auditForm.status =1;
+            this.statusAuditVisible = true;
+            this.title = '修改审核状态';
+        },
+
+        handleDetail(e) {
+            this.title = '详情';
+            this.statusAuditVisible = true;
+            this.auditForm = e;
+        },
+
+        /**重置 */
+        searchReset() {
+            this.timeVal = []
+            this.tableFrom.date = ""
+            this.$refs.searchForm.resetFields()
+            this.getList(1)
+        },
+
+        // 提交状态修改
+        handleSubmit() {
+            this.$refs.auditForm.validate((valid) => {
+                if (valid) {
+                    shoptypeAudit(this.auditForm).then(res => {
+                        this.statusAuditVisible = false;
+                        this.$message.success(res.message);
+                        this.getList(1);
+                    }).catch(({ message }) => {
+                        this.$message.error(message);
+                    });
+                }
+            })
+        },
+
+        // 列表
+        getList(num) {
+            this.listLoading = true;
+            this.tableFrom.page = num ? num : this.tableFrom.page;
+            shopChangeList(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 === 1 ? "是否开启推荐商户" : "是否关闭推荐商户";
+            this.$modalSure(title).then(() => {
+                merchantStatuseApi(row.mer_id, row.is_best)
+                    .then(({ message }) => {
+                        this.$message.success(message);
+                        this.getList("");
+                    })
+                    .catch(({ message }) => {
+                        this.getList("");
+                        this.$message.error(message);
+                    });
+            });
+        },
+
+        // 开启关闭
+        onchangeIsClose(row) {
+            merchantIsCloseApi(row.mer_id, row.status)
+                .then(({ message }) => {
+                    this.$message.success(message);
+                    this.getList("");
+                    this.getHeadNum();
+                })
+                .catch(({ message }) => {
+                    this.$message.error(message);
+                });
+        },
+
+        // 详情
+        onDetails(id) {
+            this.merId = id;
+            this.$refs.merDetail.isEdit = false;
+            this.$refs.merDetail.getInfo(id);
+            this.drawer = true;
+        },
+    }
+};
+</script>
+
+<style scoped lang="scss">
+.t-color {
+
+    display: inline-block;
+    height: 32px;
+    padding: 0 10px;
+    line-height: 30px;
+    font-size: 12px;
+
+    border-radius: 4px;
+    box-sizing: border-box;
+    white-space: nowrap;
+}
+
+.gray {
+    background-color: #f4f4f5;
+    border-color: #e9e9eb;
+    color: #909399;
+}
+
+.red {
+    background-color: #fef0f0;
+    border-color: #fde2e2;
+    color: #f56c6c;
+}
+
+.green {
+    background-color: #f0f9eb;
+    border-color: #e1f3d8;
+    color: #67c23a;
+}
+</style>
\ No newline at end of file