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 @@
-
+
@@ -116,7 +116,7 @@
width="900"
@on-cancel="cancel"
>
-
+
@@ -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();
}, // 移动