From 4e0e36178d82ed486d8cec2c8f52ca96d715cc12 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 30 Oct 2025 19:16:05 +0800
Subject: [PATCH] 1、活动增加促销商品(完成后端) 2、修复小程序端活动相册下载不了的问题; 3、修复小程序端活动详情定位问题; 4、修复小程序端报名时免费的也弹出支付弹窗的问题; 5、修复分会后台活动核销码下载问题。

---
 branch_vue/src/components/product/Product.vue |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/branch_vue/src/components/product/Product.vue b/branch_vue/src/components/product/Product.vue
index 10a77e0..3772461 100644
--- a/branch_vue/src/components/product/Product.vue
+++ b/branch_vue/src/components/product/Product.vue
@@ -4,7 +4,7 @@
     	时间:2019-10-25
     	描述:组件-选择商品
     -->
-  <el-dialog title="选择商品" :visible.sync="dialogVisible" @close="dialogFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="900px">
+  <el-dialog title="选择商品" :visible.sync="dialogVisible" @close="dialogFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="900px" :append-to-body='true'>
     <div class="common-seach-wrap">
       <el-form :inline="true" size="small" :model="formInline" class="demo-form-inline">
         <el-form-item label="商品名称">
@@ -97,7 +97,24 @@
       params:null
     };
   },
-  props: ['isproduct', 'excludeIds','islist'],
+  props: {
+    isproduct: {
+      type: Boolean,
+      default: false,
+    },
+    excludeIds: {
+      type: Array,
+      default: ()=>[]
+    },
+    islist: {
+      type: Boolean,
+      default: false,
+    },
+    shop_supplier_id: {
+      type: [String, Number],
+      default: "",
+    }
+  },
   watch:{
     isproduct:function(n,o){
       if(n!=o){
@@ -140,6 +157,7 @@
     getData() {
       let self = this;
       let params = self.formInline;
+      params.shop_supplier_id = self.shop_supplier_id; // by lyzflash 2025.10.30
       params.page = self.curPage;
       params.list_rows = self.pageSize;
       PorductApi.chooseLists(params, true)

--
Gitblit v1.9.2