From 43356b0aac37608a173e166b3245dcaa1b240e23 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, 29 Jul 2024 19:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A5=BD=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                        | 4 ++--
 src/api/shop/dealerUser/model/index.ts                  | 3 +++
 src/views/shop/dealerUser/components/dealerUserEdit.vue | 1 +
 src/views/shop/dealerUser/index.vue                     | 6 +++---
 src/views/shop/merchantType/index.vue                   | 1 -
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index df3cbfc..cd9000d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
-#VITE_API_URL=https://modules.gxwebsoft.com/api
+VITE_API_URL=https://modules.gxwebsoft.com/api
 
 #VITE_SERVER_URL=http://127.0.0.1:9091/api
-VITE_API_URL=http://127.0.0.1:9099/api
+#VITE_API_URL=http://127.0.0.1:9099/api
diff --git a/src/api/shop/dealerUser/model/index.ts b/src/api/shop/dealerUser/model/index.ts
index 9fd0ddb..5091a0c 100644
--- a/src/api/shop/dealerUser/model/index.ts
+++ b/src/api/shop/dealerUser/model/index.ts
@@ -4,6 +4,8 @@ import type { PageParam } from '@/api';
  * 分销商用户记录表
  */
 export interface DealerUser {
+  // 自增id
+  id?: number;
   // 分销商用户ID
   userId?: number;
   // 姓名
@@ -40,6 +42,7 @@ export interface DealerUser {
  * 分销商用户记录表搜索条件
  */
 export interface DealerUserParam extends PageParam {
+  id?: number;
   userId?: number;
   keywords?: string;
 }
diff --git a/src/views/shop/dealerUser/components/dealerUserEdit.vue b/src/views/shop/dealerUser/components/dealerUserEdit.vue
index 7f4fed2..8bd1430 100644
--- a/src/views/shop/dealerUser/components/dealerUserEdit.vue
+++ b/src/views/shop/dealerUser/components/dealerUserEdit.vue
@@ -148,6 +148,7 @@
 
   // 用户信息
   const form = reactive<DealerUser>({
+    id: undefined,
     userId: undefined,
     realName: undefined,
     mobile: undefined,
diff --git a/src/views/shop/dealerUser/index.vue b/src/views/shop/dealerUser/index.vue
index a7cd5cd..409358a 100644
--- a/src/views/shop/dealerUser/index.vue
+++ b/src/views/shop/dealerUser/index.vue
@@ -4,7 +4,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="dealerUserId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -193,7 +193,7 @@
   /* 删除单个 */
   const remove = (row: DealerUser) => {
     const hide = message.loading('请求中..', 0);
-    removeDealerUser(row.userId)
+    removeDealerUser(row.id)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -218,7 +218,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchDealerUser(selection.value.map((d) => d.userId))
+        removeBatchDealerUser(selection.value.map((d) => d.id))
           .then((msg) => {
             hide();
             message.success(msg);
diff --git a/src/views/shop/merchantType/index.vue b/src/views/shop/merchantType/index.vue
index 3cf5388..02133d1 100644
--- a/src/views/shop/merchantType/index.vue
+++ b/src/views/shop/merchantType/index.vue
@@ -149,7 +149,6 @@
       align: 'center',
       sorter: true,
       ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
     },
     {
       title: '操作',