From 3716ad53ab887b21d155e0e380015a15a9284327 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 22 Oct 2025 16:43:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(shoppingUpgrade):=20=E5=8A=A0=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7-=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/giftGoods.js                               | 9 +++++++++
 src/views/marketing/giftGoods/addGiftGoodsInfo.vue | 6 ------
 src/views/marketing/shoppingUpgrade/update.vue     | 7 ++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/api/giftGoods.js b/src/api/giftGoods.js
index f2de9a1..2261638 100644
--- a/src/api/giftGoods.js
+++ b/src/api/giftGoods.js
@@ -403,3 +403,12 @@ export function directUpgradeRecordList(params) {
     params
   })
 }
+
+// 根据商品类型获取商品
+export function getGoodsListByType(params) {
+  return request({
+    url: '/sale/manage/wares/find-all-maker',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/marketing/giftGoods/addGiftGoodsInfo.vue b/src/views/marketing/giftGoods/addGiftGoodsInfo.vue
index ef4501e..a171957 100644
--- a/src/views/marketing/giftGoods/addGiftGoodsInfo.vue
+++ b/src/views/marketing/giftGoods/addGiftGoodsInfo.vue
@@ -1,9 +1,3 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2023-02-23 15:59:57
--->
 <template>
   <div class="page">
     <!-- <topBar v-if="topList.length > 0"
diff --git a/src/views/marketing/shoppingUpgrade/update.vue b/src/views/marketing/shoppingUpgrade/update.vue
index 85c5f28..99042fa 100644
--- a/src/views/marketing/shoppingUpgrade/update.vue
+++ b/src/views/marketing/shoppingUpgrade/update.vue
@@ -156,11 +156,12 @@ export default {
 
     getData() {
       api
-        .waresList({
-          specialArea: this.isArea
+        .getGoodsListByType({
+          specialArea: this.isArea,
+          isMakerGift: 3
         })
         .then((res) => {
-          this.allGoods = res.data
+          this.allGoods = res.data || []
         })
     },