From c0328fa23e8cd4b3388bc1bad35eb47ba58e35f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 23 Sep 2024 01:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=9B=BE=E5=BD=A2?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=A4=A7=E5=86=99=E4=B8=8D=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=8C=89=E5=95=86?=
 =?UTF-8?q?=E6=88=B7ID=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E3=80=81=E5=88=86=E7=B1=BB=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shop/goodsSpec/model/index.ts         |   1 +
 src/api/shop/spec/model/index.ts              |   2 +
 src/views/shop/goods/components/goodsEdit.vue |   4 +-
 src/views/shop/goods/index.vue                |   6 +-
 src/views/shop/goodsSpec/index.vue            |  16 +-
 .../shop/merchant/components/merchantEdit.vue |   1 -
 src/views/shop/merchant/components/search.vue |   5 +-
 src/views/shop/merchant/index.vue             |  11 +-
 .../merchant/user/components/org-select.vue   |  39 --
 .../merchant/user/components/role-select.vue  |  71 ---
 .../shop/merchant/user/components/search.vue  |  42 --
 .../merchant/user/components/sex-select.vue   |  45 --
 .../merchant/user/components/user-edit.vue    | 361 -----------
 .../merchant/user/components/user-import.vue  |  88 ---
 .../merchant/user/components/user-info.vue    | 143 -----
 .../merchant/user/components/user-search.vue  | 111 ----
 .../merchant/user/components/userEdit.vue     | 274 ---------
 .../shop/merchant/user/details/index.vue      | 130 ----
 src/views/shop/merchant/user/index.vue        | 562 ------------------
 src/views/shop/merchantAccount/index.vue      |   7 -
 src/views/shop/spec/components/specEdit.vue   |   1 +
 src/views/shop/spec/index.vue                 |   2 +
 22 files changed, 28 insertions(+), 1894 deletions(-)
 delete mode 100644 src/views/shop/merchant/user/components/org-select.vue
 delete mode 100644 src/views/shop/merchant/user/components/role-select.vue
 delete mode 100644 src/views/shop/merchant/user/components/search.vue
 delete mode 100644 src/views/shop/merchant/user/components/sex-select.vue
 delete mode 100644 src/views/shop/merchant/user/components/user-edit.vue
 delete mode 100644 src/views/shop/merchant/user/components/user-import.vue
 delete mode 100644 src/views/shop/merchant/user/components/user-info.vue
 delete mode 100644 src/views/shop/merchant/user/components/user-search.vue
 delete mode 100644 src/views/shop/merchant/user/components/userEdit.vue
 delete mode 100644 src/views/shop/merchant/user/details/index.vue
 delete mode 100644 src/views/shop/merchant/user/index.vue

diff --git a/src/api/shop/goodsSpec/model/index.ts b/src/api/shop/goodsSpec/model/index.ts
index 0d4cfd5..3f8c026 100644
--- a/src/api/shop/goodsSpec/model/index.ts
+++ b/src/api/shop/goodsSpec/model/index.ts
@@ -27,5 +27,6 @@ export interface GoodsSpec {
 export interface GoodsSpecParam extends PageParam {
   id?: number;
   goodsId: number;
+  merchantId?: number;
   keywords?: string;
 }
diff --git a/src/api/shop/spec/model/index.ts b/src/api/shop/spec/model/index.ts
index 800c169..52ba8dc 100644
--- a/src/api/shop/spec/model/index.ts
+++ b/src/api/shop/spec/model/index.ts
@@ -14,6 +14,8 @@ export interface Spec {
   userId?: number;
   // 更新者
   updater?: number;
+  // 商户ID
+  merchantId?: number;
   // 备注
   comments?: string;
   // 状态, 0正常, 1待修,2异常已修，3异常未修
diff --git a/src/views/shop/goods/components/goodsEdit.vue b/src/views/shop/goods/components/goodsEdit.vue
index 0ee8473..bf54daa 100644
--- a/src/views/shop/goods/components/goodsEdit.vue
+++ b/src/views/shop/goods/components/goodsEdit.vue
@@ -375,6 +375,7 @@
   import { listGoodsSpec } from "@/api/shop/goodsSpec";
   import { GoodsCategory } from "@/api/shop/goodsCategory/model";
   import { listGoodsCategory } from "@/api/shop/goodsCategory";
+  import { getMerchantId } from "@/utils/merchant";
 
   // 是否是修改
   const isUpdate = ref(false);
@@ -388,8 +389,6 @@
     visible: boolean;
     // 修改回显的数据
     data?: Goods | null;
-    // 商户ID
-    merchantId?: number;
   }>();
 
   const emit = defineEmits<{
@@ -418,6 +417,7 @@
   const goodsSpec = ref<GoodsSpec>();
   const category = ref<string[]>([]);
   const takeaway = ref<GoodsCategory[]>([]);
+  const merchantId = getMerchantId();
 
   const columns = [
     {
diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index 9c9be4f..621ad72 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -81,11 +81,7 @@
       </a-card>
 
       <!-- 编辑弹窗 -->
-      <GoodsEdit
-        v-model:visible="showEdit"
-        :data="current"
-        @done="reload"
-      />
+      <GoodsEdit v-model:visible="showEdit" :data="current" @done="reload" />
     </div>
   </div>
 </template>
diff --git a/src/views/shop/goodsSpec/index.vue b/src/views/shop/goodsSpec/index.vue
index 5ccbd19..63db0be 100644
--- a/src/views/shop/goodsSpec/index.vue
+++ b/src/views/shop/goodsSpec/index.vue
@@ -4,7 +4,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="goodsSpecId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -42,7 +42,11 @@
       </a-card>
 
       <!-- 编辑弹窗 -->
-      <GoodsSpecEdit v-model:visible="showEdit" :data="current" @done="reload" />
+      <GoodsSpecEdit
+        v-model:visible="showEdit"
+        :data="current"
+        @done="reload"
+      />
     </div>
   </div>
 </template>
@@ -58,8 +62,13 @@
   } from 'ele-admin-pro/es/ele-pro-table/types';
   import Search from './components/search.vue';
   import GoodsSpecEdit from './components/goodsSpecEdit.vue';
-  import { pageGoodsSpec, removeGoodsSpec, removeBatchGoodsSpec } from '@/api/shop/goodsSpec';
+  import {
+    pageGoodsSpec,
+    removeGoodsSpec,
+    removeBatchGoodsSpec
+  } from '@/api/shop/goodsSpec';
   import type { GoodsSpec, GoodsSpecParam } from '@/api/shop/goodsSpec/model';
+  import { getMerchantId } from '@/utils/merchant';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -86,6 +95,7 @@
     if (filters) {
       where.status = filters.status;
     }
+    where.merchantId = getMerchantId();
     return pageGoodsSpec({
       ...where,
       ...orders,
diff --git a/src/views/shop/merchant/components/merchantEdit.vue b/src/views/shop/merchant/components/merchantEdit.vue
index a1438db..1427a0a 100644
--- a/src/views/shop/merchant/components/merchantEdit.vue
+++ b/src/views/shop/merchant/components/merchantEdit.vue
@@ -456,7 +456,6 @@
         listRoles({ roleCode: 'merchant' }).then((res) => {
           form.roleId = res[0].roleId;
           form.roleName = res[0].roleName;
-          form.tenantId = Number(localStorage.getItem('TenantId'));
         });
       } else {
         resetFields();
diff --git a/src/views/shop/merchant/components/search.vue b/src/views/shop/merchant/components/search.vue
index c5036e0..caa4ad1 100644
--- a/src/views/shop/merchant/components/search.vue
+++ b/src/views/shop/merchant/components/search.vue
@@ -1,6 +1,6 @@
 <!-- 搜索表单 -->
 <template>
-  <a-space :size="10" style="flex-wrap: wrap">
+  <a-space :size="10" style="flex-wrap: wrap" v-if="!merchantId">
     <a-button type="primary" class="ele-btn-icon" @click="add">
       <template #icon>
         <PlusOutlined />
@@ -35,6 +35,8 @@
   import { openUrl } from '@/utils/common';
   import router from '@/router';
   import { getMerchant } from '@/api/shop/merchant';
+  import merchant from "@/views/shop/merchant/index.vue";
+  import { getMerchantId } from "@/utils/merchant";
 
   const props = withDefaults(
     defineProps<{
@@ -50,6 +52,7 @@
     (e: 'remove'): void;
     (e: 'batchMove'): void;
   }>();
+  const merchantId = getMerchantId();
 
   // 新增
   const add = () => {
diff --git a/src/views/shop/merchant/index.vue b/src/views/shop/merchant/index.vue
index 18de81e..a3f850a 100644
--- a/src/views/shop/merchant/index.vue
+++ b/src/views/shop/merchant/index.vue
@@ -30,17 +30,10 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-                <a @click="openUrl(`/goods/category/${record.merchantId}`)"
-                  >分类</a
-                >
-                <a-divider type="vertical" />
-                <a @click="openUrl(`/goods/index/${record.merchantId}`)"
-                  >商品</a
-                >
-                <a-divider type="vertical" />
                 <a @click="openEdit(record)">修改</a>
                 <a-divider type="vertical" />
                 <a-popconfirm
+                  v-if="!merchantId"
                   title="确定要删除此记录吗？"
                   @confirm="remove(record)"
                 >
@@ -91,7 +84,7 @@
   // 是否显示批量移动弹窗
   const showMove = ref(false);
   // 商户ID
-  const merchantId = ref(0);
+  const merchantId = getMerchantId();
 
   // 表格数据源
   const datasource: DatasourceFunction = ({
diff --git a/src/views/shop/merchant/user/components/org-select.vue b/src/views/shop/merchant/user/components/org-select.vue
deleted file mode 100644
index 587424f..0000000
--- a/src/views/shop/merchant/user/components/org-select.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 机构选择下拉框 -->
-<template>
-  <a-tree-select
-    allow-clear
-    tree-default-expand-all
-    :placeholder="placeholder"
-    :value="value || undefined"
-    :tree-data="data"
-    :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
-    @update:value="updateValue"
-  />
-</template>
-
-<script lang="ts" setup>
-  import type { Organization } from '@/api/system/organization/model';
-
-  const emit = defineEmits<{
-    (e: 'update:value', value?: number): void;
-  }>();
-
-  withDefaults(
-    defineProps<{
-      // 选中的数据(v-modal)
-      value?: number;
-      // 提示信息
-      placeholder?: string;
-      // 机构数据
-      data: Organization[];
-    }>(),
-    {
-      placeholder: '请选择角色'
-    }
-  );
-
-  /* 更新选中数据 */
-  const updateValue = (value?: number) => {
-    emit('update:value', value);
-  };
-</script>
diff --git a/src/views/shop/merchant/user/components/role-select.vue b/src/views/shop/merchant/user/components/role-select.vue
deleted file mode 100644
index 04534b9..0000000
--- a/src/views/shop/merchant/user/components/role-select.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- 角色选择下拉框 -->
-<template>
-  <a-select
-    allow-clear
-    mode="multiple"
-    :value="roleIds"
-    :placeholder="placeholder"
-    @update:value="updateValue"
-    @blur="onBlur"
-  >
-    <a-select-option
-      v-for="item in data"
-      :key="item.roleId"
-      :value="item.roleId"
-    >
-      {{ item.roleName }}
-    </a-select-option>
-  </a-select>
-</template>
-
-<script lang="ts" setup>
-  import { ref, computed } from 'vue';
-  import { message } from 'ant-design-vue/es';
-  import { listRoles } from '@/api/system/role';
-  import type { Role } from '@/api/system/role/model';
-
-  const emit = defineEmits<{
-    (e: 'update:value', value: Role[]): void;
-    (e: 'blur'): void;
-  }>();
-
-  const props = withDefaults(
-    defineProps<{
-      // 选中的角色
-      value?: Role[];
-      //
-      placeholder?: string;
-    }>(),
-    {
-      placeholder: '请选择角色'
-    }
-  );
-
-  // 选中的角色id
-  const roleIds = computed(() => props.value?.map((d) => d.roleId as number));
-
-  // 角色数据
-  const data = ref<Role[]>([]);
-
-  /* 更新选中数据 */
-  const updateValue = (value: number[]) => {
-    emit(
-      'update:value',
-      value.map((v) => ({ roleId: v }))
-    );
-  };
-
-  /* 获取角色数据 */
-  listRoles()
-    .then((list) => {
-      data.value = list;
-    })
-    .catch((e) => {
-      message.error(e.message);
-    });
-
-  /* 失去焦点 */
-  const onBlur = () => {
-    emit('blur');
-  };
-</script>
diff --git a/src/views/shop/merchant/user/components/search.vue b/src/views/shop/merchant/user/components/search.vue
deleted file mode 100644
index 82fea9d..0000000
--- a/src/views/shop/merchant/user/components/search.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- 搜索表单 -->
-<template>
-  <a-space :size="10" style="flex-wrap: wrap">
-    <a-button type="primary" class="ele-btn-icon" @click="add">
-      <template #icon>
-        <PlusOutlined />
-      </template>
-      <span>添加</span>
-    </a-button>
-  </a-space>
-</template>
-
-<script lang="ts" setup>
-  import { PlusOutlined } from '@ant-design/icons-vue';
-  import type { GradeParam } from '@/api/user/grade/model';
-  import { watch } from 'vue';
-
-  const props = withDefaults(
-    defineProps<{
-      // 选中的角色
-      selection?: [];
-    }>(),
-    {}
-  );
-
-  const emit = defineEmits<{
-    (e: 'search', where?: GradeParam): void;
-    (e: 'add'): void;
-    (e: 'remove'): void;
-    (e: 'batchMove'): void;
-  }>();
-
-  // 新增
-  const add = () => {
-    emit('add');
-  };
-
-  watch(
-    () => props.selection,
-    () => {}
-  );
-</script>
diff --git a/src/views/shop/merchant/user/components/sex-select.vue b/src/views/shop/merchant/user/components/sex-select.vue
deleted file mode 100644
index 1497ad5..0000000
--- a/src/views/shop/merchant/user/components/sex-select.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- 角色选择下拉框 -->
-<template>
-  <a-select
-    show-search
-    optionFilterProp="label"
-    :options="data"
-    allow-clear
-    :value="value"
-    :placeholder="placeholder"
-    @update:value="updateValue"
-    @blur="onBlur"
-  />
-</template>
-
-<script lang="ts" setup>
-  import { getDictionaryOptions } from '@/utils/common';
-
-  const emit = defineEmits<{
-    (e: 'update:value', value: string): void;
-    (e: 'blur'): void;
-  }>();
-
-  withDefaults(
-    defineProps<{
-      value?: string;
-      placeholder?: string;
-    }>(),
-    {
-      placeholder: '请选择性别'
-    }
-  );
-
-  // 字典数据
-  const data = getDictionaryOptions('sex');
-
-  /* 更新选中数据 */
-  const updateValue = (value: string) => {
-    emit('update:value', value);
-  };
-
-  /* 失去焦点 */
-  const onBlur = () => {
-    emit('blur');
-  };
-</script>
diff --git a/src/views/shop/merchant/user/components/user-edit.vue b/src/views/shop/merchant/user/components/user-edit.vue
deleted file mode 100644
index 13f807d..0000000
--- a/src/views/shop/merchant/user/components/user-edit.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-<!-- 用户编辑弹窗 -->
-<template>
-  <ele-modal
-    :width="800"
-    :visible="visible"
-    :confirm-loading="loading"
-    :title="isUpdate ? '修改用户' : '新建用户'"
-    :body-style="{ paddingBottom: '8px' }"
-    @update:visible="updateVisible"
-    @ok="save"
-  >
-    <a-form
-      ref="formRef"
-      :model="form"
-      :rules="rules"
-      :label-col="styleResponsive ? { md: 5, sm: 4, xs: 24 } : { flex: '90px' }"
-      :wrapper-col="
-        styleResponsive ? { md: 17, sm: 20, xs: 24 } : { flex: '1' }
-      "
-    >
-      <a-row :gutter="16">
-        <a-col
-          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
-        >
-          <a-form-item label="账号" name="username">
-            <a-input
-              allow-clear
-              :maxlength="20"
-              placeholder="请输入账号"
-              :disabled="isUpdate"
-              v-model:value="form.username"
-            />
-          </a-form-item>
-          <a-form-item label="昵称" name="nickname">
-            <a-input
-              allow-clear
-              :maxlength="20"
-              placeholder="请输入昵称"
-              v-model:value="form.nickname"
-            />
-          </a-form-item>
-          <a-form-item label="角色" name="roles">
-            <role-select v-model:value="form.roles" />
-          </a-form-item>
-          <a-form-item label="会员等级">
-            <SelectGrade
-              :placeholder="`请选择会员等级`"
-              v-model:value="form.gradeName"
-              :disabled="isUpdate"
-              @done="chooseGradeId"
-            />
-          </a-form-item>
-          <a-form-item label="性别" name="sex">
-            <DictSelect
-              dict-code="sex"
-              :placeholder="`请选择性别`"
-              v-model:value="form.sexName"
-              @done="chooseSex"
-            />
-          </a-form-item>
-          <a-form-item label="姓名" name="realName">
-            <a-input
-              allow-clear
-              :maxlength="20"
-              placeholder="请输入真实姓名"
-              v-model:value="form.realName"
-            />
-          </a-form-item>
-          <a-form-item label="所属机构" name="type">
-            <org-select
-              :data="organizationList"
-              placeholder="请选择所属机构"
-              v-model:value="form.organizationId"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col
-          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
-        >
-          <a-form-item label="手机号" v-if="isUpdate" name="mobile">
-            <a-input
-              allow-clear
-              :maxlength="11"
-              placeholder="请输入手机号"
-              v-model:value="form.mobile"
-              disabled
-            />
-          </a-form-item>
-          <a-form-item label="手机号" v-else name="phone">
-            <a-input
-              allow-clear
-              :maxlength="11"
-              placeholder="请输入手机号"
-              v-model:value="form.phone"
-            />
-          </a-form-item>
-          <a-form-item label="邮箱" name="email">
-            <a-input
-              allow-clear
-              :maxlength="100"
-              placeholder="请输入邮箱"
-              v-model:value="form.email"
-            />
-          </a-form-item>
-          <a-form-item label="出生日期">
-            <a-date-picker
-              class="ele-fluid"
-              value-format="YYYY-MM-DD"
-              placeholder="请选择出生日期"
-              v-model:value="form.birthday"
-            />
-          </a-form-item>
-          <a-form-item v-if="!isUpdate" label="登录密码" name="password">
-            <a-input-password
-              :maxlength="20"
-              v-model:value="form.password"
-              placeholder="请输入登录密码"
-            />
-          </a-form-item>
-          <a-form-item label="个人简介">
-            <a-textarea
-              :rows="4"
-              :maxlength="200"
-              placeholder="请输入个人简介"
-              v-model:value="form.introduction"
-            />
-          </a-form-item>
-          <a-form-item label="管理员">
-            <a-switch
-              checked-children="是"
-              un-checked-children="否"
-              :checked="form.isAdmin"
-              @update:checked="updateIsAdmin"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </ele-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { message } from 'ant-design-vue/es';
-  import type { FormInstance, Rule } from 'ant-design-vue/es/form';
-  import { emailReg, phoneReg } from 'ele-admin-pro/es';
-  import { storeToRefs } from 'pinia';
-  import { useThemeStore } from '@/store/modules/theme';
-  import useFormData from '@/utils/use-form-data';
-  import RoleSelect from './role-select.vue';
-  import { addUser, updateUser, checkExistence } from '@/api/system/user';
-  import type { User } from '@/api/system/user/model';
-  import OrgSelect from './org-select.vue';
-  // import { getDictionaryOptions } from '@/utils/common';
-  import { Organization } from '@/api/system/organization/model';
-  import { Grade } from '@/api/user/grade/model';
-
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
-  // 获取字典数据
-  // const userTypeData = getDictionaryOptions('userType');
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
-
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: User | null;
-    // 全部机构
-    organizationList: Organization[];
-  }>();
-
-  //
-  const formRef = ref<FormInstance | null>(null);
-
-  // 是否是修改
-  const isUpdate = ref(false);
-
-  // 提交状态
-  const loading = ref(false);
-
-  // 表单数据
-  const { form, resetFields, assignFields } = useFormData<User>({
-    type: undefined,
-    userId: undefined,
-    username: '',
-    nickname: '',
-    realName: '',
-    companyName: '',
-    sex: undefined,
-    sexName: '',
-    roles: [],
-    email: '',
-    phone: '',
-    mobile: '',
-    password: '',
-    introduction: '',
-    organizationId: undefined,
-    birthday: '',
-    idCard: '',
-    comments: '',
-    gradeName: '',
-    isAdmin: undefined,
-    gradeId: undefined
-  });
-
-  // 表单验证规则
-  const rules = reactive<Record<string, Rule[]>>({
-    username: [
-      {
-        required: true,
-        type: 'string',
-        validator: (_rule: Rule, value: string) => {
-          return new Promise<void>((resolve, reject) => {
-            if (!value) {
-              return reject('请输入用户账号');
-            }
-            checkExistence('username', value, props.data?.userId)
-              .then(() => {
-                reject('账号已经存在');
-              })
-              .catch(() => {
-                resolve();
-              });
-          });
-        },
-        trigger: 'blur'
-      }
-    ],
-    nickname: [
-      {
-        required: true,
-        message: '请输入昵称',
-        type: 'string',
-        trigger: 'blur'
-      }
-    ],
-    // realName: [
-    //   {
-    //     required: true,
-    //     message: '请输入真实姓名',
-    //     type: 'string',
-    //     trigger: 'blur'
-    //   }
-    // ],
-    // sex: [
-    //   {
-    //     required: true,
-    //     message: '请选择性别',
-    //     type: 'string',
-    //     trigger: 'blur'
-    //   }
-    // ],
-    roles: [
-      {
-        required: true,
-        message: '请选择角色',
-        type: 'array',
-        trigger: 'blur'
-      }
-    ],
-    email: [
-      {
-        pattern: emailReg,
-        message: '邮箱格式不正确',
-        type: 'string',
-        trigger: 'blur'
-      }
-    ],
-    password: [
-      {
-        required: true,
-        type: 'string',
-        validator: async (_rule: Rule, value: string) => {
-          if (isUpdate.value || /^[\S]{5,18}$/.test(value)) {
-            return Promise.resolve();
-          }
-          return Promise.reject('密码必须为5-18位非空白字符');
-        },
-        trigger: 'blur'
-      }
-    ],
-    phone: [
-      {
-        required: true,
-        pattern: phoneReg,
-        message: '手机号格式不正确',
-        type: 'string',
-        trigger: 'blur'
-      }
-    ]
-  });
-
-  const chooseGradeId = (data: Grade) => {
-    form.gradeName = data.name;
-    form.gradeId = data.gradeId;
-  };
-
-  const chooseSex = (data: any) => {
-    form.sex = data.key;
-    form.sexName = data.label;
-  };
-
-  const updateIsAdmin = (value: boolean) => {
-    form.isAdmin = value;
-  };
-
-  /* 保存编辑 */
-  const save = () => {
-    if (!formRef.value) {
-      return;
-    }
-    formRef.value
-      .validate()
-      .then(() => {
-        loading.value = true;
-        const saveOrUpdate = isUpdate.value ? updateUser : addUser;
-        saveOrUpdate(form)
-          .then((msg) => {
-            loading.value = false;
-            message.success(msg);
-            updateVisible(false);
-            emit('done');
-          })
-          .catch((e) => {
-            loading.value = false;
-            message.error(e.message);
-          });
-      })
-      .catch(() => {});
-  };
-
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
-
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        if (props.data) {
-          assignFields({
-            ...props.data,
-            password: ''
-          });
-          isUpdate.value = true;
-        } else {
-          isUpdate.value = false;
-        }
-      } else {
-        resetFields();
-        formRef.value?.clearValidate();
-      }
-    }
-  );
-</script>
diff --git a/src/views/shop/merchant/user/components/user-import.vue b/src/views/shop/merchant/user/components/user-import.vue
deleted file mode 100644
index 0d8cbcb..0000000
--- a/src/views/shop/merchant/user/components/user-import.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- 用户导入弹窗 -->
-<template>
-  <ele-modal
-    :width="520"
-    :footer="null"
-    title="导入用户"
-    :visible="visible"
-    @update:visible="updateVisible"
-  >
-    <a-spin :spinning="loading">
-      <a-upload-dragger
-        accept=".xls,.xlsx"
-        :show-upload-list="false"
-        :customRequest="doUpload"
-        style="padding: 24px 0; margin-bottom: 16px"
-      >
-        <p class="ant-upload-drag-icon">
-          <cloud-upload-outlined />
-        </p>
-        <p class="ant-upload-hint">将文件拖到此处，或点击上传</p>
-      </a-upload-dragger>
-    </a-spin>
-    <div class="ele-text-center">
-      <span>只能上传xls、xlsx文件，</span>
-      <a
-        href="https://cdn.eleadmin.com/20200610/用户导入模板.xlsx"
-        download="用户导入模板.xlsx"
-      >
-        下载模板
-      </a>
-    </div>
-  </ele-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref } from 'vue';
-  import { message } from 'ant-design-vue/es';
-  import { CloudUploadOutlined } from '@ant-design/icons-vue';
-  import { importUsers } from '@/api/system/user';
-
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
-
-  defineProps<{
-    // 是否打开弹窗
-    visible: boolean;
-  }>();
-
-  // 导入请求状态
-  const loading = ref(false);
-
-  /* 上传 */
-  const doUpload = ({ file }) => {
-    if (
-      ![
-        'application/vnd.ms-excel',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      ].includes(file.type)
-    ) {
-      message.error('只能选择 excel 文件');
-      return false;
-    }
-    if (file.size / 1024 / 1024 > 10) {
-      message.error('大小不能超过 10MB');
-      return false;
-    }
-    loading.value = true;
-    importUsers(file)
-      .then((msg) => {
-        loading.value = false;
-        message.success(msg);
-        updateVisible(false);
-        emit('done');
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
-    return false;
-  };
-
-  /* 更新 visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
-</script>
diff --git a/src/views/shop/merchant/user/components/user-info.vue b/src/views/shop/merchant/user/components/user-info.vue
deleted file mode 100644
index a737d2f..0000000
--- a/src/views/shop/merchant/user/components/user-info.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<!-- 用户编辑弹窗 -->
-<template>
-  <a-drawer
-    :width="680"
-    :visible="visible"
-    :confirm-loading="loading"
-    :title="'基本信息'"
-    :body-style="{ paddingBottom: '8px' }"
-    @update:visible="updateVisible"
-    :footer="null"
-  >
-    <a-form
-      :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-      :wrapper-col="{ md: { span: 19 }, sm: { span: 24 } }"
-    >
-      <a-row :gutter="16">
-        <a-col
-          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
-        >
-          <a-form-item label="账号">
-            <span class="ele-text">{{ user.username }}</span>
-          </a-form-item>
-          <a-form-item label="昵称">
-            <span class="ele-text">{{ user.nickname }}</span>
-          </a-form-item>
-          <a-form-item label="性别">
-            <span class="ele-text">{{ user.sexName }}</span>
-          </a-form-item>
-          <a-form-item label="手机号">
-            <span class="ele-text">{{ user.phone }}</span>
-          </a-form-item>
-          <a-form-item label="角色">
-            <a-tag v-for="item in user.roles" :key="item.roleId" color="blue">
-              {{ item.roleName }}
-            </a-tag>
-          </a-form-item>
-          <a-form-item label="状态">
-            <a-badge
-              v-if="typeof user.status === 'number'"
-              :status="(['processing', 'error'][user.status] as any)"
-              :text="['正常', '冻结'][user.status]"
-            />
-          </a-form-item>
-          <a-form-item label="地址">
-            <span class="ele-text">{{ user.address }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col
-          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
-        >
-          <a-form-item label="可用余额">
-            <span class="ele-text-success">￥{{ formatNumber(user.balance) }}</span>
-          </a-form-item>
-          <a-form-item label="可用积分">
-            <span class="ele-text">{{ user.points }}</span>
-          </a-form-item>
-          <a-form-item label="实际消费">
-            <span class="ele-text">{{ user.payMoney }}</span>
-          </a-form-item>
-          <a-form-item label="机构/部门">
-            <span class="ele-text">{{ user.organizationName }}</span>
-          </a-form-item>
-          <a-form-item label="头像">
-            <a-image :src="user.avatar" :width="36" />
-          </a-form-item>
-          <a-form-item label="生日">
-            <span class="ele-text">{{ user.birthday }}</span>
-          </a-form-item>
-          <a-form-item label="创建时间">
-            <span class="ele-text">{{ user.createTime }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-drawer>
-</template>
-
-<script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { Form } from 'ant-design-vue';
-  import { assignObject } from 'ele-admin-pro';
-  import type { User } from '@/api/system/user/model';
-  import { useThemeStore } from '@/store/modules/theme';
-  import { formatNumber } from 'ele-admin-pro/es';
-  import { storeToRefs } from 'pinia';
-
-  const useForm = Form.useForm;
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: User | null;
-  }>();
-
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
-
-  // 用户信息
-  const user = reactive<User>({
-    username: '',
-    nickname: '',
-    sexName: '',
-    phone: '',
-    avatar: '',
-    balance: undefined,
-    points: 0,
-    payMoney: 0,
-    birthday: '',
-    address: '',
-    roles: [],
-    createTime: undefined,
-    status: undefined
-  });
-
-  // 请求状态
-  const loading = ref(true);
-
-  const { resetFields } = useForm(user);
-
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
-
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        if (props.data) {
-          loading.value = false;
-          assignObject(user, props.data);
-        }
-      } else {
-        resetFields();
-      }
-    }
-  );
-</script>
diff --git a/src/views/shop/merchant/user/components/user-search.vue b/src/views/shop/merchant/user/components/user-search.vue
deleted file mode 100644
index b68abad..0000000
--- a/src/views/shop/merchant/user/components/user-search.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<!-- 搜索表单 -->
-<template>
-  <a-form
-    :label-col="
-      styleResponsive ? { xl: 7, lg: 5, md: 7, sm: 4 } : { flex: '90px' }
-    "
-    :wrapper-col="
-      styleResponsive ? { xl: 17, lg: 19, md: 17, sm: 20 } : { flex: '1' }
-    "
-  >
-    <a-row :gutter="8">
-      <a-col
-        v-bind="
-          styleResponsive
-            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
-            : { span: 6 }
-        "
-      >
-        <a-form-item label="用户账号">
-          <a-input
-            v-model:value.trim="form.username"
-            placeholder="请输入"
-            allow-clear
-          />
-        </a-form-item>
-      </a-col>
-      <a-col
-        v-bind="
-          styleResponsive
-            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
-            : { span: 6 }
-        "
-      >
-        <a-form-item label="昵称">
-          <a-input
-            v-model:value.trim="form.nickname"
-            placeholder="请输入"
-            allow-clear
-          />
-        </a-form-item>
-      </a-col>
-      <a-col
-        v-bind="
-          styleResponsive
-            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
-            : { span: 6 }
-        "
-      >
-        <a-form-item label="性别">
-          <a-select v-model:value="form.sex" placeholder="请选择" allow-clear>
-            <a-select-option value="1">男</a-select-option>
-            <a-select-option value="2">女</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col
-        v-bind="
-          styleResponsive
-            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
-            : { span: 6 }
-        "
-      >
-        <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-          <a-space>
-            <a-button type="primary" @click="search">查询</a-button>
-            <a-button @click="reset">重置</a-button>
-          </a-space>
-        </a-form-item>
-      </a-col>
-    </a-row>
-  </a-form>
-</template>
-
-<script lang="ts" setup>
-  import { storeToRefs } from 'pinia';
-  import { useThemeStore } from '@/store/modules/theme';
-  import useFormData from '@/utils/use-form-data';
-  import type { UserParam } from '@/api/system/user/model';
-
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
-
-  const props = defineProps<{
-    // 默认搜索条件
-    where?: UserParam;
-  }>();
-
-  const emit = defineEmits<{
-    (e: 'search', where?: UserParam): void;
-  }>();
-
-  // 表单数据
-  const { form, resetFields } = useFormData<UserParam>({
-    username: '',
-    nickname: '',
-    sex: undefined,
-    ...props.where
-  });
-
-  /* 搜索 */
-  const search = () => {
-    emit('search', form);
-  };
-
-  /*  重置 */
-  const reset = () => {
-    resetFields();
-    search();
-  };
-</script>
diff --git a/src/views/shop/merchant/user/components/userEdit.vue b/src/views/shop/merchant/user/components/userEdit.vue
deleted file mode 100644
index 3a59597..0000000
--- a/src/views/shop/merchant/user/components/userEdit.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<!-- 编辑弹窗 -->
-<template>
-  <ele-modal
-    :width="800"
-    :visible="visible"
-    :maskClosable="false"
-    :maxable="maxable"
-    :title="isUpdate ? '编辑' : '添加'"
-    :body-style="{ paddingBottom: '28px' }"
-    @update:visible="updateVisible"
-    @ok="save"
-  >
-    <a-form
-      ref="formRef"
-      :model="form"
-      :rules="rules"
-      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
-      :wrapper-col="
-        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
-      "
-    >
-      <a-form-item label="用户唯一小程序id" name="openId">
-        <a-input
-          allow-clear
-          placeholder="请输入用户唯一小程序id"
-          v-model:value="form.openId"
-        />
-      </a-form-item>
-      <a-form-item label="小程序用户秘钥" name="sessionKey">
-        <a-input
-          allow-clear
-          placeholder="请输入小程序用户秘钥"
-          v-model:value="form.sessionKey"
-        />
-      </a-form-item>
-      <a-form-item label="用户名" name="username">
-        <a-input
-          allow-clear
-          placeholder="请输入用户名"
-          v-model:value="form.username"
-        />
-      </a-form-item>
-      <a-form-item label="头像地址" name="avatarUrl">
-        <a-input
-          allow-clear
-          placeholder="请输入头像地址"
-          v-model:value="form.avatarUrl"
-        />
-      </a-form-item>
-      <a-form-item label="1男，2女" name="gender">
-        <a-input
-          allow-clear
-          placeholder="请输入1男，2女"
-          v-model:value="form.gender"
-        />
-      </a-form-item>
-      <a-form-item label="国家" name="country">
-        <a-input
-          allow-clear
-          placeholder="请输入国家"
-          v-model:value="form.country"
-        />
-      </a-form-item>
-      <a-form-item label="省份" name="province">
-        <a-input
-          allow-clear
-          placeholder="请输入省份"
-          v-model:value="form.province"
-        />
-      </a-form-item>
-      <a-form-item label="城市" name="city">
-        <a-input
-          allow-clear
-          placeholder="请输入城市"
-          v-model:value="form.city"
-        />
-      </a-form-item>
-      <a-form-item label="手机号码" name="phone">
-        <a-input
-          allow-clear
-          placeholder="请输入手机号码"
-          v-model:value="form.phone"
-        />
-      </a-form-item>
-      <a-form-item label="积分" name="integral">
-        <a-input
-          allow-clear
-          placeholder="请输入积分"
-          v-model:value="form.integral"
-        />
-      </a-form-item>
-      <a-form-item label="余额" name="money">
-        <a-input
-          allow-clear
-          placeholder="请输入余额"
-          v-model:value="form.money"
-        />
-      </a-form-item>
-      <a-form-item label="" name="idcard">
-        <a-input
-          allow-clear
-          placeholder="请输入"
-          v-model:value="form.idcard"
-        />
-      </a-form-item>
-      <a-form-item label="" name="truename">
-        <a-input
-          allow-clear
-          placeholder="请输入"
-          v-model:value="form.truename"
-        />
-      </a-form-item>
-      <a-form-item label="是否管理员：1是；2否" name="isAdmin">
-        <a-input
-          allow-clear
-          placeholder="请输入是否管理员：1是；2否"
-          v-model:value="form.isAdmin"
-        />
-      </a-form-item>
-    </a-form>
-  </ele-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { Form, message } from 'ant-design-vue';
-  import { assignObject, uuid } from 'ele-admin-pro';
-  import { addUser, updateUser } from '@/api/system/user';
-  import { User } from '@/api/system/user/model';
-  import { useThemeStore } from '@/store/modules/theme';
-  import { storeToRefs } from 'pinia';
-  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
-  import { FormInstance } from 'ant-design-vue/es/form';
-  import { FileRecord } from '@/api/system/file/model';
-
-  // 是否是修改
-  const isUpdate = ref(false);
-  const useForm = Form.useForm;
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
-
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: User | null;
-  }>();
-
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
-
-  // 提交状态
-  const loading = ref(false);
-  // 是否显示最大化切换按钮
-  const maxable = ref(true);
-  // 表格选中数据
-  const formRef = ref<FormInstance | null>(null);
-  const images = ref<ItemType[]>([]);
-
-  // 用户信息
-  const form = reactive<User>({
-    id: undefined,
-    openId: undefined,
-    sessionKey: undefined,
-    username: undefined,
-    avatarUrl: undefined,
-    gender: undefined,
-    country: undefined,
-    province: undefined,
-    city: undefined,
-    phone: undefined,
-    integral: undefined,
-    money: undefined,
-    createTime: undefined,
-    idcard: undefined,
-    truename: undefined,
-    isAdmin: undefined,
-    tenantId: undefined,
-    userId: undefined,
-    userName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
-  });
-
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
-
-  // 表单验证规则
-  const rules = reactive({
-    userName: [
-      {
-        required: true,
-        type: 'string',
-        message: '请填写名称',
-        trigger: 'blur'
-      }
-    ]
-  });
-
-  const chooseImage = (data: FileRecord) => {
-    images.value.push({
-      uid: data.id,
-      url: data.path,
-      status: 'done'
-    });
-    form.image = data.path;
-  };
-
-  const onDeleteItem = (index: number) => {
-    images.value.splice(index, 1);
-    form.image = '';
-  };
-
-  const { resetFields } = useForm(form, rules);
-
-  /* 保存编辑 */
-  const save = () => {
-    if (!formRef.value) {
-      return;
-    }
-    formRef.value
-      .validate()
-      .then(() => {
-        loading.value = true;
-        const formData = {
-          ...form
-        };
-        const saveOrUpdate = isUpdate.value ? updateUser : addUser;
-        saveOrUpdate(formData)
-          .then((msg) => {
-            loading.value = false;
-            message.success(msg);
-            updateVisible(false);
-            emit('done');
-          })
-          .catch((e) => {
-            loading.value = false;
-            message.error(e.message);
-          });
-      })
-      .catch(() => {});
-  };
-
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        images.value = [];
-        if (props.data) {
-          assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
-          }
-          isUpdate.value = true;
-        } else {
-          isUpdate.value = false;
-        }
-      } else {
-        resetFields();
-      }
-    },
-    { immediate: true }
-  );
-</script>
diff --git a/src/views/shop/merchant/user/details/index.vue b/src/views/shop/merchant/user/details/index.vue
deleted file mode 100644
index 9e535df..0000000
--- a/src/views/shop/merchant/user/details/index.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card title="基本信息" :bordered="false">
-      <a-form
-        class="ele-form-detail"
-        :label-col="
-          styleResponsive ? { md: 2, sm: 4, xs: 6 } : { flex: '90px' }
-        "
-        :wrapper-col="
-          styleResponsive ? { md: 22, sm: 20, xs: 18 } : { flex: '1' }
-        "
-      >
-        <a-form-item label="账号">
-          <div class="ele-text-secondary">{{ form.username }}</div>
-        </a-form-item>
-        <a-form-item label="昵称">
-          <div class="ele-text-secondary">{{ form.nickname }}</div>
-        </a-form-item>
-        <a-form-item label="性别">
-          <div class="ele-text-secondary">{{ form.sexName }}</div>
-        </a-form-item>
-        <a-form-item label="手机号">
-          <div class="ele-text-secondary">{{ form.phone }}</div>
-        </a-form-item>
-        <a-form-item label="真实姓名">
-          <div class="ele-text-secondary">{{ form.realName }}</div>
-        </a-form-item>
-        <a-form-item label="别名">
-          <div class="ele-text-secondary">{{ form.alias }}</div>
-        </a-form-item>
-        <a-form-item label="角色">
-          <a-tag v-for="item in form.roles" :key="item.roleId" color="blue">
-            {{ item.roleName }}
-          </a-tag>
-        </a-form-item>
-        <a-form-item label="创建时间">
-          <div class="ele-text-secondary">{{ form.createTime }}</div>
-        </a-form-item>
-        <a-form-item label="状态">
-          <a-badge
-            v-if="typeof form.status === 'number'"
-            :status="(['processing', 'error'][form.status] as any)"
-            :text="['正常', '冻结'][form.status]"
-          />
-        </a-form-item>
-      </a-form>
-    </a-card>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { ref, watch, unref } from 'vue';
-  import { useRouter } from 'vue-router';
-  import { message } from 'ant-design-vue/es';
-  import { toDateString } from 'ele-admin-pro/es';
-  import { storeToRefs } from 'pinia';
-  import { useThemeStore } from '@/store/modules/theme';
-  import useFormData from '@/utils/use-form-data';
-  import { setPageTabTitle } from '@/utils/page-tab-util';
-  import { getUser } from '@/api/system/user';
-  import type { User } from '@/api/system/user/model';
-  const ROUTE_PATH = '/system/user/details';
-
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
-
-  const { currentRoute } = useRouter();
-
-  // 用户信息
-  const { form, assignFields } = useFormData<User>({
-    userId: undefined,
-    alias: '',
-    realName: '',
-    username: '',
-    nickname: '',
-    sexName: '',
-    phone: '',
-    roles: [],
-    createTime: undefined,
-    status: undefined
-  });
-
-  // 请求状态
-  const loading = ref(true);
-
-  /*  */
-  const query = () => {
-    const { query } = unref(currentRoute);
-    const id = query.id;
-    if (!id || form.userId === Number(id)) {
-      return;
-    }
-    loading.value = true;
-    getUser(Number(id))
-      .then((data) => {
-        loading.value = false;
-        assignFields({
-          ...data,
-          createTime: toDateString(data.createTime)
-        });
-        // 修改页签标题
-        if (unref(currentRoute).path === ROUTE_PATH) {
-          setPageTabTitle(data.nickname + '的信息');
-        }
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
-  };
-
-  watch(
-    currentRoute,
-    (route) => {
-      const { path } = unref(route);
-      if (path !== ROUTE_PATH) {
-        return;
-      }
-      query();
-    },
-    { immediate: true }
-  );
-</script>
-
-<script lang="ts">
-  export default {
-    name: 'SystemUserDetails'
-  };
-</script>
diff --git a/src/views/shop/merchant/user/index.vue b/src/views/shop/merchant/user/index.vue
deleted file mode 100644
index 6597a2a..0000000
--- a/src/views/shop/merchant/user/index.vue
+++ /dev/null
@@ -1,562 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 表格 -->
-      <ele-pro-table
-        ref="tableRef"
-        row-key="userId"
-        :columns="columns"
-        :datasource="datasource"
-        v-model:selection="selection"
-        :scroll="{ x: 1300 }"
-        :where="defaultWhere"
-        :customRow="customRow"
-        cache-key="proSystemUserTable"
-      >
-        <template #toolbar>
-          <a-space>
-            <a-button type="primary" class="ele-btn-icon" @click="openEdit()">
-              <template #icon>
-                <plus-outlined />
-              </template>
-              <span>新建</span>
-            </a-button>
-            <a-button
-              type="primary"
-              class="ele-btn-icon"
-              @click="openEdit(selection[0])"
-              :disabled="selection.length === 0"
-            >
-              <template #icon>
-                <EditOutlined />
-              </template>
-              <span>修改</span>
-            </a-button>
-            <a-button
-              type="primary"
-              danger
-              @click="resetPsw(selection[0])"
-              :disabled="selection.length === 0"
-              >重置密码</a-button
-            >
-            <a-button
-              danger
-              type="primary"
-              class="ele-btn-icon"
-              @click="removeBatch"
-            >
-              <template #icon>
-                <delete-outlined />
-              </template>
-              <span>批量删除</span>
-            </a-button>
-            <a-button type="dashed" class="ele-btn-icon" @click="openImport">
-              <template #icon>
-                <upload-outlined />
-              </template>
-              <span>导入</span>
-            </a-button>
-            <a-input-search
-              allow-clear
-              v-model:value="searchText"
-              placeholder="请输入关键词"
-              @search="reload"
-              @pressEnter="reload"
-            />
-          </a-space>
-        </template>
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'avatar'">
-            <a-avatar
-              :size="30"
-              :src="`${record.avatar}`"
-              style="margin-right: 4px"
-            >
-              <template #icon>
-                <UserOutlined />
-              </template>
-            </a-avatar>
-          </template>
-          <template v-if="column.key === 'nickname'">
-            <span>{{ record.nickname }}</span>
-          </template>
-          <template v-if="column.key === 'mobile'">
-            <span v-if="hasRole('superAdmin')">{{ record.phone }}</span>
-            <span v-else>{{ record.mobile }}</span>
-          </template>
-          <template v-if="column.key === 'roles'">
-            <a-tag v-for="item in record.roles" :key="item.roleId" color="blue">
-              {{ item.roleName }}
-            </a-tag>
-          </template>
-          <template v-if="column.key === 'platform'">
-            <WechatOutlined v-if="record.platform === 'MP-WEIXIN'" />
-            <Html5Outlined v-if="record.platform === 'H5'" />
-            <ChromeOutlined v-if="record.platform === 'WEB'" />
-          </template>
-          <template v-if="column.key === 'balance'">
-            <span class="ele-text-success">
-              ￥{{ formatNumber(record.balance) }}
-            </span>
-          </template>
-          <template v-if="column.key === 'expendMoney'">
-            <span class="ele-text-warning">
-              ￥{{ formatNumber(record.expendMoney) }}
-            </span>
-          </template>
-          <template v-if="column.key === 'isAdmin'">
-            <a-switch
-              :checked="record.isAdmin == 1"
-              @change="updateIsAdmin(record)"
-            />
-          </template>
-          <template v-if="column.key === 'action'">
-            <a-space>
-              <a @click="openEdit(record)">修改</a>
-              <a-divider type="vertical" />
-              <!--              <a @click="resetPsw(record)">重置</a>-->
-              <!--              <a-divider type="vertical" />-->
-              <a-popconfirm
-                placement="topRight"
-                title="确定要删除此用户吗？"
-                @confirm="remove(record)"
-              >
-                <a class="ele-text-danger">删除</a>
-              </a-popconfirm>
-            </a-space>
-          </template>
-        </template>
-      </ele-pro-table>
-    </a-card>
-    <!-- 编辑弹窗 -->
-    <user-edit
-      v-model:visible="showEdit"
-      :data="current"
-      :organization-list="data"
-      @done="reload"
-    />
-    <!-- 导入弹窗 -->
-    <user-import v-model:visible="showImport" @done="reload" />
-    <!-- 用户详情 -->
-    <user-info v-model:visible="showInfo" :data="current" @done="reload" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { createVNode, ref, reactive } from 'vue';
-  import { message, Modal } from 'ant-design-vue/es';
-  import {
-    PlusOutlined,
-    DeleteOutlined,
-    UploadOutlined,
-    EditOutlined,
-    UserOutlined,
-    Html5Outlined,
-    ChromeOutlined,
-    WechatOutlined,
-    ExclamationCircleOutlined
-  } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro/es';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import { messageLoading, formatNumber } from 'ele-admin-pro/es';
-  import { timeAgo } from 'ele-admin-pro';
-  import UserEdit from './components/user-edit.vue';
-  import UserImport from './components/user-import.vue';
-  import UserInfo from './components/user-info.vue';
-  import { toDateString } from 'ele-admin-pro';
-  import {
-    pageUsers,
-    removeUser,
-    removeUsers,
-    updateUserStatus,
-    updateUserPassword,
-    updateUser
-  } from '@/api/system/user';
-  import type { User, UserParam } from '@/api/system/user/model';
-  import { toTreeData, uuid } from 'ele-admin-pro';
-  import { listRoles } from '@/api/system/role';
-  import { listOrganizations } from '@/api/system/organization';
-  import { Organization } from '@/api/system/organization/model';
-  import { hasRole } from '@/utils/permission';
-
-  // 加载状态
-  const loading = ref(true);
-  // 树形数据
-  const data = ref<Organization[]>([]);
-  // 树展开的key
-  const expandedRowKeys = ref<number[]>([]);
-  // 树选中的key
-  const selectedRowKeys = ref<number[]>([]);
-  // 表格选中数据
-  const selection = ref<User[]>([]);
-  // 当前编辑数据
-  const current = ref<User | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 是否显示用户详情
-  const showInfo = ref(false);
-  // 是否显示用户导入弹窗
-  const showImport = ref(false);
-  const userType = ref<number>();
-  const searchText = ref('');
-
-  // 加载角色
-  const roles = ref<any[]>([]);
-  const filters = () => {
-    listRoles().then((result) => {
-      result.map((d) => {
-        roles.value.push({
-          text: d.roleName,
-          value: d.roleId
-        });
-      });
-    });
-  };
-  filters();
-  // 加载机构
-  listOrganizations()
-    .then((list) => {
-      loading.value = false;
-      const eks: number[] = [];
-      list.forEach((d) => {
-        d.key = d.organizationId;
-        d.value = d.organizationId;
-        d.title = d.organizationName;
-        if (typeof d.key === 'number') {
-          eks.push(d.key);
-        }
-      });
-      expandedRowKeys.value = eks;
-      data.value = toTreeData({
-        data: list,
-        idField: 'organizationId',
-        parentIdField: 'parentId'
-      });
-      if (list.length) {
-        if (typeof list[0].key === 'number') {
-          selectedRowKeys.value = [list[0].key];
-        }
-        // current.value = list[0];
-      } else {
-        selectedRowKeys.value = [];
-        // current.value = null;
-      }
-    })
-    .catch((e) => {
-      loading.value = false;
-      message.error(e.message);
-    });
-
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: 'ID',
-      dataIndex: 'userId',
-      width: 90,
-      showSorterTooltip: false
-    },
-    {
-      title: '头像',
-      key: 'avatar',
-      dataIndex: 'avatar',
-      align: 'center',
-      width: 90
-    },
-    {
-      title: '手机号码',
-      dataIndex: 'mobile',
-      align: 'center',
-      key: 'mobile',
-      showSorterTooltip: false
-    },
-    {
-      title: '真实姓名',
-      dataIndex: 'realName',
-      align: 'center',
-      showSorterTooltip: false
-    },
-    {
-      title: '昵称',
-      key: 'nickname',
-      align: 'center',
-      dataIndex: 'nickname'
-    },
-    {
-      title: '性别',
-      dataIndex: 'sex',
-      align: 'center',
-      showSorterTooltip: false
-    },
-    {
-      title: '邮箱',
-      dataIndex: 'email',
-      align: 'center',
-      hideInTable: true,
-      showSorterTooltip: false
-    },
-    {
-      title: '可用余额',
-      dataIndex: 'balance',
-      align: 'center'
-    },
-    {
-      title: '可用积分',
-      dataIndex: 'points',
-      align: 'center',
-      sorter: true
-    },
-    {
-      title: '实际消费金额',
-      dataIndex: 'expendMoney',
-      key: 'expendMoney',
-      sorter: true,
-      align: 'center',
-      hideInTable: true,
-      showSorterTooltip: false
-    },
-    {
-      title: '注册来源',
-      key: 'platform',
-      align: 'center',
-      dataIndex: 'platform',
-      width: 120
-    },
-    {
-      title: '证件号码',
-      dataIndex: 'idCard',
-      align: 'center',
-      hideInTable: true
-    },
-    {
-      title: '出生日期',
-      dataIndex: 'birthday',
-      key: 'birthday',
-      hideInTable: true
-    },
-    {
-      title: '省份',
-      dataIndex: 'province',
-      key: 'province',
-      hideInTable: true
-    },
-    {
-      title: '城市',
-      dataIndex: 'city',
-      key: 'city',
-      hideInTable: true,
-      showSorterTooltip: false
-    },
-    {
-      title: '地区',
-      dataIndex: 'region',
-      key: 'region',
-      hideInTable: true,
-      showSorterTooltip: false
-    },
-    {
-      title: '邮箱认证',
-      dataIndex: 'emailVerified',
-      hideInTable: true,
-      showSorterTooltip: false,
-      customRender: ({ text }) => ['未认证', '已认证'][text]
-    },
-    {
-      title: '实名认证',
-      dataIndex: 'certification',
-      sorter: true,
-      hideInTable: true,
-      customRender: ({ text }) => ['未认证', '已认证'][text]
-    },
-    {
-      title: '角色',
-      dataIndex: 'roles',
-      key: 'roles',
-      align: 'center'
-    },
-    {
-      title: '管理员',
-      key: 'isAdmin',
-      dataIndex: 'isAdmin',
-      sorter: true,
-      showSorterTooltip: false,
-      align: 'center'
-    },
-    {
-      title: '注册时间',
-      dataIndex: 'createTime',
-      sorter: true,
-      showSorterTooltip: false,
-      ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 120,
-      fixed: 'right',
-      align: 'center'
-    }
-  ]);
-
-  // 默认搜索条件
-  const defaultWhere = reactive({
-    username: '',
-    nickname: ''
-  });
-
-  // 表格数据源
-  const datasource: DatasourceFunction = ({
-    page,
-    limit,
-    where,
-    orders,
-    filters
-  }) => {
-    where = {};
-    where.roleId = filters.roles;
-    where.keywords = searchText.value;
-    return pageUsers({ page, limit, ...where, ...orders });
-  };
-
-  /* 搜索 */
-  const reload = (where?: UserParam) => {
-    selection.value = [];
-    tableRef?.value?.reload({ where });
-  };
-
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: User) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
-
-  /* 打开用户详情弹窗 */
-  const openInfo = (row?: User) => {
-    current.value = row ?? null;
-    showInfo.value = true;
-  };
-
-  /* 打开编辑弹窗 */
-  const openImport = () => {
-    showImport.value = true;
-  };
-
-  const handleTabs = (e) => {
-    userType.value = Number(e.target.value);
-    reload();
-  };
-
-  /* 删除单个 */
-  const remove = (row: User) => {
-    const hide = messageLoading('请求中..', 0);
-    removeUser(row.userId)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
-
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
-    }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的用户吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = messageLoading('请求中..', 0);
-        removeUsers(selection.value.map((d) => d.userId))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
-  };
-
-  /* 重置用户密码 */
-  const resetPsw = (row: User) => {
-    Modal.confirm({
-      title: '提示',
-      content: '确定要重置此用户的密码吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = message.loading('请求中..', 0);
-        const password = uuid(8);
-        updateUserPassword(row.userId, password)
-          .then((msg) => {
-            hide();
-            message.success(msg + '，新密码：' + password);
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
-  };
-
-  /* 修改用户状态 */
-  const updateIsAdmin = (row: User) => {
-    row.isAdmin = row.isAdmin ? 0 : 1;
-    updateUser(row)
-      .then((msg) => {
-        message.success(msg);
-      })
-      .catch((e) => {
-        message.error(e.message);
-      });
-  };
-
-  /* 自定义行属性 */
-  const customRow = (record: User) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
-      },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
-  };
-</script>
-
-<script lang="ts">
-  export default {
-    name: 'SystemUser'
-  };
-</script>
-
-<style lang="less" scoped>
-  .user-box {
-    display: flex;
-    align-items: center;
-    .user-info {
-      display: flex;
-      flex-direction: column;
-      align-items: start;
-    }
-  }
-</style>
diff --git a/src/views/shop/merchantAccount/index.vue b/src/views/shop/merchantAccount/index.vue
index a2c0c1d..881a621 100644
--- a/src/views/shop/merchantAccount/index.vue
+++ b/src/views/shop/merchantAccount/index.vue
@@ -245,13 +245,6 @@
   watch(
     () => router.currentRoute.value.params.id,
     (id) => {
-      if (id) {
-        if (id == ':id') {
-          merchantId.value = 0;
-        } else {
-          merchantId.value = Number(id);
-        }
-      }
       query();
     },
     { immediate: true }
diff --git a/src/views/shop/spec/components/specEdit.vue b/src/views/shop/spec/components/specEdit.vue
index 56dedab..33b6962 100644
--- a/src/views/shop/spec/components/specEdit.vue
+++ b/src/views/shop/spec/components/specEdit.vue
@@ -120,6 +120,7 @@
     specId: undefined,
     specName: undefined,
     specValue: undefined,
+    merchantId: undefined,
     status: 0,
     comments: '',
     sortNumber: 100
diff --git a/src/views/shop/spec/index.vue b/src/views/shop/spec/index.vue
index 0d4ab89..e72933f 100644
--- a/src/views/shop/spec/index.vue
+++ b/src/views/shop/spec/index.vue
@@ -81,6 +81,7 @@
   import SpecEdit from './components/specEdit.vue';
   import { pageSpec, removeSpec, removeBatchSpec } from '@/api/shop/spec';
   import type { Spec, SpecParam } from '@/api/shop/spec/model';
+  import { getMerchantId } from "@/utils/merchant";
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -107,6 +108,7 @@
     if (filters) {
       where.status = filters.status;
     }
+    where.merchantId = getMerchantId();
     return pageSpec({
       ...where,
       ...orders,