From 4bec49c6c22e1474c6cbc049f5586bf6c4318649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Fri, 23 Oct 2026 14:09:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=90=8E=E5=8F=B0):=20=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=20Element=20Plus=202.x=20=E5=BC=B9=E5=B1=82=20API=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ElPopover 仅暴露 hide()，旧 Element UI 的 doClose() 在 2.x 不存在，
  分销/会员价设置弹层改为可选链调用 hide()，避免关闭时报错。
- 会员价弹层可见性绑定由 v-model:value 改为 v-model:visible，
  并去掉编辑图标上的冗余点击赋值。
- 订单列表移除「活动类型」列（中台已不再下发 activity_type_text，恒为空）。
---
 .../admin/src/pages/order/orderCenter/index.vue     |  5 -----
 .../src/pages/product/components/brokerageSet.vue   |  5 +++--
 .../src/pages/product/components/vipPriceSet.vue    | 13 +++++++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/frontend/admin/src/pages/order/orderCenter/index.vue b/frontend/admin/src/pages/order/orderCenter/index.vue
index ecc5aa53f..a2636fb2d 100644
--- a/frontend/admin/src/pages/order/orderCenter/index.vue
+++ b/frontend/admin/src/pages/order/orderCenter/index.vue
@@ -171,11 +171,6 @@
               <span>{{ getProductTypeLabel(scope.row.product_type) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="活动类型" width="120">
-            <template #default="scope">
-              <span>{{ scope.row.activity_type_text || '--' }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="商品信息" min-width="250">
             <template #default="scope">
               <div class="tab">
diff --git a/frontend/admin/src/pages/product/components/brokerageSet.vue b/frontend/admin/src/pages/product/components/brokerageSet.vue
index de834008d..b69197809 100644
--- a/frontend/admin/src/pages/product/components/brokerageSet.vue
+++ b/frontend/admin/src/pages/product/components/brokerageSet.vue
@@ -264,8 +264,9 @@ function brokerageTwoRowReplace(item) {
   item.brokerage_two = item.brokerage_two.replace(/^-|\D/g, '');
 }
 function closePop() {
-  popoverRef_one.value.doClose();
-  popoverRef_two.value.doClose();
+  // ElPopover（Element Plus 2.x）只暴露 hide()，没有旧版 Element UI 的 doClose()
+  popoverRef_one.value?.hide?.();
+  popoverRef_two.value?.hide?.();
   brokerage_two.value = '';
   brokerage.value = '';
 }
diff --git a/frontend/admin/src/pages/product/components/vipPriceSet.vue b/frontend/admin/src/pages/product/components/vipPriceSet.vue
index 612469526..0e7d842d4 100644
--- a/frontend/admin/src/pages/product/components/vipPriceSet.vue
+++ b/frontend/admin/src/pages/product/components/vipPriceSet.vue
@@ -40,7 +40,7 @@
                 <span>付费会员价</span>
                 <el-popover
                   ref="vipSetPopover"
-                  v-model:value="vipSetPopoverPopver"
+                  v-model:visible="vipSetPopoverPopver"
                   placement="top"
                   width="290"
                   trigger="click"
@@ -66,9 +66,9 @@
                       <el-button type="primary" class="ml-14" @click="vipSetConfirm">确认</el-button>
                     </div>
                   </div>
-                  <template #reference
-                    ><span class="iconfont iconbianji1" @click.stop="vipSetPopoverPopver = true"></span
-                  ></template>
+                  <template #reference>
+                    <span class="iconfont iconbianji1"></span>
+                  </template>
                 </el-popover>
               </template>
               <template #default="scope">
@@ -189,9 +189,10 @@ function submitForm() {
       disabled.value = false;
     });
 }
-function closeVipSet(i) {
+function closeVipSet() {
+  // ElPopover（Element Plus 2.x）只暴露 hide()，没有旧版 Element UI 的 doClose()
   vipSetPopoverPopver.value = false;
-  vipSetPopover.value.doClose();
+  vipSetPopover.value?.hide?.();
   vipSetType.value = 0;
   vipSetNum.value = '';
 }