diff --git a/src/api/shop_merchant.ts b/src/api/shop_merchant.ts
new file mode 100644
index 0000000..e64bccb
--- /dev/null
+++ b/src/api/shop_merchant.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 商城商户列表
+export function apiShopMerchantLists(params: any) {
+    return request.get({ url: '/shop_merchant/lists', params })
+}
+
+// 添加商城商户
+export function apiShopMerchantAdd(params: any) {
+    return request.post({ url: '/shop_merchant/add', params })
+}
+
+// 编辑商城商户
+export function apiShopMerchantEdit(params: any) {
+    return request.post({ url: '/shop_merchant/edit', params })
+}
+
+// 删除商城商户
+export function apiShopMerchantDelete(params: any) {
+    return request.post({ url: '/shop_merchant/delete', params })
+}
+
+// 商城商户详情
+export function apiShopMerchantDetail(params: any) {
+    return request.get({ url: '/shop_merchant/detail', params })
+}
\ No newline at end of file
diff --git a/src/views/shop_merchant/edit.vue b/src/views/shop_merchant/edit.vue
new file mode 100644
index 0000000..e1746d3
--- /dev/null
+++ b/src/views/shop_merchant/edit.vue
@@ -0,0 +1,103 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="shopMerchantEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiShopMerchantAdd, apiShopMerchantEdit, apiShopMerchantDetail } from '@/api/shop_merchant'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑商城商户' : '新增商城商户'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiShopMerchantDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiShopMerchantEdit(data) 
+        : await apiShopMerchantAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/shop_merchant/index.vue b/src/views/shop_merchant/index.vue
new file mode 100644
index 0000000..e9fa9a3
--- /dev/null
+++ b/src/views/shop_merchant/index.vue
@@ -0,0 +1,136 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="公司名称" prop="company_name">
+                    <el-input class="w-[280px]" v-model="queryParams.company_name" clearable placeholder="请输入公司名称" />
+                </el-form-item>
+                <el-form-item label="主联系人姓名" prop="master_name">
+                    <el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入主联系人姓名" />
+                </el-form-item>
+                <el-form-item label="主联系人手机" prop="master_phone">
+                    <el-input class="w-[280px]" v-model="queryParams.master_phone" clearable placeholder="请输入主联系人手机" />
+                </el-form-item>

+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['shop_merchant/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['shop_merchant/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
+                    <el-table-column label="组织机构代码" prop="organization_code" show-overflow-tooltip />
+                    <el-table-column label="主联系人姓名" prop="master_name" show-overflow-tooltip />
+                    <el-table-column label="主联系人手机" prop="master_phone" show-overflow-tooltip />

+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                             <el-button
+                                v-perms="['shop_merchant/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['shop_merchant/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="shopMerchantLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiShopMerchantLists, apiShopMerchantDelete } from '@/api/shop_merchant'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    company_name: '',
+    master_name: '',
+    master_phone: '',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiShopMerchantLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiShopMerchantDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+