From 863725d3ba6a43aa90cecba5d97b8a2c88c7fe5b Mon Sep 17 00:00:00 2001
From: Ryan Ran <1410277647@qq.com>
Date: Mon, 11 Nov 2024 15:23:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=E6=B4=BB=E5=8A=A8=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/components/lili-dialog/link-dialog.vue   | 12 +++++++-----
 .../components/lili-dialog/template/marketing.vue    |  8 +-------
 .../promotion/full-discount/full-discount-add.vue    |  1 +
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/manager/src/components/lili-dialog/link-dialog.vue b/manager/src/components/lili-dialog/link-dialog.vue
index b68812de..ee37feec 100644
--- a/manager/src/components/lili-dialog/link-dialog.vue
+++ b/manager/src/components/lili-dialog/link-dialog.vue
@@ -65,11 +65,13 @@ export default {
               }
               return cur;
       }, []);
-      this.wap.forEach((items,indexs) => {
-        if(items.title == '活动'){
-          this.wap.splice(indexs,1)
-        }
-      })
+      if (this.$route.path !== '/floorList/main') {
+        this.wap.forEach((items, indexs) => {
+          if (items.title == '活动') {
+            this.wap.splice(indexs, 1)
+          }
+        })
+      }
     }else{
       this.wap.push( {
         title: "活动",
diff --git a/manager/src/components/lili-dialog/template/marketing.vue b/manager/src/components/lili-dialog/template/marketing.vue
index be39d636..dc6af46b 100644
--- a/manager/src/components/lili-dialog/template/marketing.vue
+++ b/manager/src/components/lili-dialog/template/marketing.vue
@@ -73,13 +73,6 @@ export default {
         pageSize: 10,
       },
       pintuanColumns: [
-        // 表头
-        {
-          title: "活动标题",
-          key: "title",
-          tooltip: true,
-          width: 250,
-        },
         {
           title: "商品名称",
           key: "goodsName",
@@ -386,6 +379,7 @@ export default {
         // 去除优惠券
         delete this.promotionList.COUPON;
         Object.keys(res.result)[0] && this.typeOption(Object.keys(res.result)[0]).methodsed();
+        this.promotions = Object.keys(res.result)[0];
       }
 
       // if (Object.keys(res.result).length) {
diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue
index e3818005..6c315ea7 100644
--- a/seller/src/views/promotion/full-discount/full-discount-add.vue
+++ b/seller/src/views/promotion/full-discount/full-discount-add.vue
@@ -377,6 +377,7 @@ export default {
           price: e.price,
           quantity: e.quantity,
           storeId: e.storeId,
+          goodsId:e.goodsId,
           storeName: e.storeName,
           thumbnail: e.thumbnail,
           skuId: e.id,

From 5662da12105f3106a5e6b61216c1933784c4454d Mon Sep 17 00:00:00 2001
From: Ryan Ran <1410277647@qq.com>
Date: Mon, 25 Nov 2024 10:43:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E7=AB=AF=E5=88=86=E9=94=80=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=93=BE=E6=8E=A5=E5=95=86=E5=93=81=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/distribution/distributionGoods.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue
index 7a7e2025..fa234bfb 100644
--- a/seller/src/views/distribution/distributionGoods.vue
+++ b/seller/src/views/distribution/distributionGoods.vue
@@ -22,11 +22,11 @@
 
             <div style="margin-left: 13px;">
               <div class="div-zoom">
-                <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
               </div>
               <Poptip trigger="hover" title="扫码在手机中查看" transfer>
                 <div slot="content">
-                  <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
                 <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
               </Poptip>