From 26380f8a9ad6dede4a99a903afb78a0dce8bfed0 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Sun, 23 Apr 2023 14:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=80=89=E6=8B=A9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=BF=87=E6=BB=A4=E6=8E=89=E5=8D=A1=E5=AF=86=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=EF=BC=8C=E6=9C=AC=E5=9C=B0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/upload/storage/Local.php        |  4 ++--
 .../admin/src/pages/marketing/lottery/addGoods.vue   | 12 ++++++++++--
 .../src/pages/marketing/storeBargain/create.vue      |  1 +
 .../src/pages/marketing/storeCombination/create.vue  |  1 +
 .../src/pages/marketing/storeIntegral/create.vue     |  1 +
 .../src/pages/marketing/storeSeckill/create.vue      |  1 +
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/crmeb/crmeb/services/upload/storage/Local.php b/crmeb/crmeb/services/upload/storage/Local.php
index dc690c81c..366eb3d62 100644
--- a/crmeb/crmeb/services/upload/storage/Local.php
+++ b/crmeb/crmeb/services/upload/storage/Local.php
@@ -150,11 +150,11 @@ class Local extends BaseUpload
 
     /**
      * 文件流上传
-     * @param string $fileContent
+     * @param $fileContent
      * @param string|null $key
      * @return array|bool|mixed|\StdClass
      */
-    public function stream(string $fileContent, string $key = null)
+    public function stream($fileContent, string $key = null)
     {
         if (!$key) {
             $key = $this->saveFileName();
diff --git a/template/admin/src/pages/marketing/lottery/addGoods.vue b/template/admin/src/pages/marketing/lottery/addGoods.vue
index 1ceaccf61..7c7ac771e 100644
--- a/template/admin/src/pages/marketing/lottery/addGoods.vue
+++ b/template/admin/src/pages/marketing/lottery/addGoods.vue
@@ -49,7 +49,7 @@
           </div>
         </template>
         <div v-else class="upLoad pictrueTab acea-row row-center-wrapper">
-          <Icon type="ios-camera-outline" size="26" @click="modals = true" />
+          <Icon type="ios-camera-outline" size="26" @click="changeGoods" />
         </div>
       </FormItem>
       <FormItem label="奖品名称" prop="name">
@@ -116,7 +116,7 @@
       width="900"
       @on-cancel="cancel"
     >
-      <goods-list ref="goodslist" v-if="modals" @getProductId="getProductId"></goods-list>
+      <goods-list ref="goodslist" @getProductId="getProductId"></goods-list>
     </Modal>
     <coupon-list ref="couponTemplates" :luckDraw="true" @getCouponId="getCouponId"></coupon-list>
     <!--<coupon-list-->
@@ -232,6 +232,14 @@ export default {
     });
   },
   methods: {
+    // 选择商品
+    changeGoods() {
+      this.modals = true;
+      this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
+      this.$refs.goodslist.getList();
+      this.$refs.goodslist.goodsCategory();
+    }, 
     getCouponId(e) {
       this.formValidate.coupon_id = e.id;
       this.formValidate.coupon_title = e.coupon_title;
diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue
index 333314057..7ca48eb08 100644
--- a/template/admin/src/pages/marketing/storeBargain/create.vue
+++ b/template/admin/src/pages/marketing/storeBargain/create.vue
@@ -955,6 +955,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     },
diff --git a/template/admin/src/pages/marketing/storeCombination/create.vue b/template/admin/src/pages/marketing/storeCombination/create.vue
index 4f0da17d4..cbf420bc7 100644
--- a/template/admin/src/pages/marketing/storeCombination/create.vue
+++ b/template/admin/src/pages/marketing/storeCombination/create.vue
@@ -949,6 +949,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     },
diff --git a/template/admin/src/pages/marketing/storeIntegral/create.vue b/template/admin/src/pages/marketing/storeIntegral/create.vue
index ce1bf2e9c..a59219635 100644
--- a/template/admin/src/pages/marketing/storeIntegral/create.vue
+++ b/template/admin/src/pages/marketing/storeIntegral/create.vue
@@ -699,6 +699,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     }, // 移动
diff --git a/template/admin/src/pages/marketing/storeSeckill/create.vue b/template/admin/src/pages/marketing/storeSeckill/create.vue
index f3d3d345d..e3f322c21 100644
--- a/template/admin/src/pages/marketing/storeSeckill/create.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/create.vue
@@ -875,6 +875,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     }, // 移动