From 23fa716c5ce49d4a4891475c5c70333661d6e5b1 Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Thu, 1 Jun 2023 16:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/router/index.js                | 13 +++++++++
 jsowell-ui/src/views/pile/merchant/detail.vue | 28 +++++++++++++++++++
 jsowell-ui/src/views/pile/merchant/index.vue  | 11 +++++++-
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 jsowell-ui/src/views/pile/merchant/detail.vue

diff --git a/jsowell-ui/src/router/index.js b/jsowell-ui/src/router/index.js
index 02cce77a8..61f3cefd9 100644
--- a/jsowell-ui/src/router/index.js
+++ b/jsowell-ui/src/router/index.js
@@ -114,6 +114,19 @@ export const constantRoutes = [
       },
     ],
   },
+  {
+    path: "/merchant/detail",
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: "index/:id",
+        component: () => import("@/views/pile/merchant/detail"),
+        name: "merchantDetail",
+        meta: { title: "运营商详情", activeMenu: "/merchant/merchant" },
+      },
+    ],
+  },
   {
     path: "/order/index",
     component: Layout,
diff --git a/jsowell-ui/src/views/pile/merchant/detail.vue b/jsowell-ui/src/views/pile/merchant/detail.vue
new file mode 100644
index 000000000..8fb7a08e0
--- /dev/null
+++ b/jsowell-ui/src/views/pile/merchant/detail.vue
@@ -0,0 +1,28 @@
+<template>
+   <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+    <el-tab-pane label="用户管理" name="first">用户管理</el-tab-pane>
+    <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
+    <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>
+    <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+export default {
+ data() {
+      return {
+        activeName: 'first',
+        merchantId:this.$route.params.id
+      };
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event);
+      }
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue
index 6677709c6..c90f5a579 100644
--- a/jsowell-ui/src/views/pile/merchant/index.vue
+++ b/jsowell-ui/src/views/pile/merchant/index.vue
@@ -90,7 +90,16 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!--<el-table-column label="" align="center" prop="id" />-->
-      <el-table-column label="运营商名称" align="center" prop="merchantName" />
+      <el-table-column label="运营商名称" align="center" prop="merchantName" >
+         <template slot-scope="scope">
+          <router-link
+            :to="'/merchant/detail/index/'+scope.row.id"
+            class="link-type"
+          >
+            <span>{{ scope.row.merchantName }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column label="地址" align="center" prop="address" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column