diff --git a/view/admin/src/views/merchant/list/index.vue b/view/admin/src/views/merchant/list/index.vue
index da534e2..5597297 100644
--- a/view/admin/src/views/merchant/list/index.vue
+++ b/view/admin/src/views/merchant/list/index.vue
@@ -191,6 +191,12 @@
               size="small"
               @click="handleTimes(scope.row.mer_id)"
             >设置第三方平台商品复制次数</el-button>
+            <el-button
+             
+              type="text"
+              size="small"
+              @click="handleTimes(scope.row.mer_id)"
+            >详情</el-button>
             <!-- <el-button
               v-if="tableFrom.status === '1'"
               type="text"
@@ -212,6 +218,38 @@
         />
       </div>
     </el-card>
+    <el-dialog  title="商户详情" :visible.sync="dialogVisible"  width="80%">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="基本信息" name="first">
+          <el-descriptions class="margin-top"  :column="12" direction="vertical">
+            <el-descriptions-item label="商户名称">kooriookami</el-descriptions-item>
+            <el-descriptions-item label="商户负责人手机号">18100000000</el-descriptions-item>
+            <el-descriptions-item label="商户分类">苏州市</el-descriptions-item>
+            <el-descriptions-item label="商户类别">苏州市</el-descriptions-item>
+            <el-descriptions-item label="商户负责人姓名">苏州市</el-descriptions-item>
+            <el-descriptions-item label="商户入驻时间">苏州市</el-descriptions-item>
+            <el-descriptions-item label="是否开启商户">
+               <div>
+                  <el-switch
+                    v-model="isUse"
+                    active-text="开启"
+                    inactive-text="关闭">
+                  </el-switch>
+                  <span>开启,店铺即可展示在移动端</span>
+               </div>
+            </el-descriptions-item>
+            
+          </el-descriptions>
+          <el-button type="primary">提交</el-button>
+        </el-tab-pane>
+        <el-tab-pane label="商家账户信息" name="second">配置管理</el-tab-pane>
+       
+      </el-tabs>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -280,7 +318,10 @@ export default {
         type_id: ""
       },
       autoUpdate: true,
-      timeVal: []
+      timeVal: [],
+      dialogVisible:false,
+      activeName:'first',
+      isUse:true,
     };
   },
   mounted() {