github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 14:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

活动选择商品过滤掉卡密优惠券，本地上传图片问题修复

Browse Source
This commit is contained in:
evoxwht 2023-04-23 14:56:14 +08:00
commit f66ee07140
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crmeb/crmeb/services/upload/storage/Local.php
View File

@ -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();

12
template/admin/src/pages/marketing/lottery/addGoods.vue
View File

@ -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;

1
template/admin/src/pages/marketing/storeBargain/create.vue
View File

@ -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();
},

1
template/admin/src/pages/marketing/storeCombination/create.vue
View File

@ -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();
},

1
template/admin/src/pages/marketing/storeIntegral/create.vue
View File

@ -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();
}, // 移动

1
template/admin/src/pages/marketing/storeSeckill/create.vue
View File

@ -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();
}, // 移动