Merge branch 'bd-dev' of http://47.94.45.65:3000/angelo/web-base-admin into bd-test

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
+  })
+}

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"

src/views/marketing/shoppingUpgrade/update.vue

@@ -156,11 +156,12 @@ export default {
 
     getData() {
       api
-        .waresList({
+        .getGoodsListByType({
-          specialArea: this.isArea
+          specialArea: this.isArea,
+          isMakerGift: 3
         })
         .then((res) => {
-          this.allGoods = res.data
+          this.allGoods = res.data || []
         })
     },