From 0d723de63e3463fed876eec4fad935d300dca54d Mon Sep 17 00:00:00 2001
From: limengyang <2509946015@qq.com>
Date: Tue, 9 Apr 2024 10:03:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:(lmy)=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/roleEnum.ts                             |  2 +-
 .../regionalSpotManage/components/addProduct.vue  | 15 +++++++--------
 src/views/regionalSpotManage/components/list.vue  |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/enums/roleEnum.ts b/src/enums/roleEnum.ts
index f0d8f30..89bf086 100644
--- a/src/enums/roleEnum.ts
+++ b/src/enums/roleEnum.ts
@@ -1,5 +1,5 @@
 const RoleEnum = {
-  JS0000: ['super', 'supplier'],
+  JS0000: ['super'],
   JS0001: ['supplier'],
 };
 
diff --git a/src/views/regionalSpotManage/components/addProduct.vue b/src/views/regionalSpotManage/components/addProduct.vue
index 4ad67d6..cb22a47 100644
--- a/src/views/regionalSpotManage/components/addProduct.vue
+++ b/src/views/regionalSpotManage/components/addProduct.vue
@@ -47,14 +47,11 @@
     total: 0,
     showTotal: (total) => `共 ${total} 条`,
     hideOnSinglePage: false,
-    showQuickJumper: true,
+    showQuickJumper: false,
     showSizeChanger: true,
     pageSizeOptions: ['10', '20', '30', '50', '100'],
-    onChange: (current) => {
+    onChange: (current, size) => {
       pagination.value.current = current;
-      getLeftData();
-    },
-    onShowSizeChange: (size) => {
       pagination.value.pageSize = size;
       getLeftData();
     },
@@ -78,8 +75,10 @@
     const res = await regionalSpotManageProductListApi(param);
     if (res.success) {
       leftData.value = res.data;
+      pagination.value.total = res.data[0].total;
     } else {
       leftData.value = [];
+      pagination.value.total = 0;
     }
     leftLoading.value = false;
     if (rightData.value.length > 0) {
@@ -100,7 +99,6 @@
       }
     }
     leftData.value = [...leftData.value];
-    pagination.value.total = leftData.value.length;
   };
   const selectedRowKeys = ref<any[]>([]);
   const selectedRows = ref<any[]>([]);
@@ -290,7 +288,7 @@
         placeholder="请输入品牌名称"
         style="width: 200px"
         :default-active-first-option="false"
-        :show-arrow="false"
+        :show-arrow="true"
         :filter-option="false"
         :not-found-content="null"
         @search="handleSearch"
@@ -406,7 +404,8 @@
     <a-alert type="warning">
       <template #message>
         <span style="color: red">特别提醒：</span
-        >北京市-直辖市；天津市-直辖市。本次设置为，北京市-直辖市；四川省-成都市。提交后，商品现货区域将更新为
+        >若商品之前已设置现货区域，则本次设置为在之前设置基础上新增。例如，原来商品设置为
+        北京市-直辖市；天津市-直辖市。本次设置为，北京市-直辖市；四川省-成都市。提交后，商品现货区域将更新为
         北京市-直辖市；天津市-直辖市；四川省-成都市。
       </template>
     </a-alert>
diff --git a/src/views/regionalSpotManage/components/list.vue b/src/views/regionalSpotManage/components/list.vue
index fbb63ec..feb9289 100644
--- a/src/views/regionalSpotManage/components/list.vue
+++ b/src/views/regionalSpotManage/components/list.vue
@@ -318,8 +318,8 @@
     });
     delLoading.value = true;
     const res = await getAreaList(param.value);
-    if (res.success) {
-      delAreaList.value = res.data;
+    if (res) {
+      delAreaList.value = res;
     }
     delLoading.value = false;
   };
-- 
2.24.1