This commit is contained in:
YeMingfei666 2024-11-13 09:46:20 +08:00
commit b7da2d0a7b
10 changed files with 409 additions and 91 deletions

View File

@ -417,6 +417,17 @@ export function modityActivate(data) {
});
}
/**
* 新增修改活动 新的
* @returns
*/
export function storageupActivate(data) {
return request({
url: `/shop/storage/upActivate`,
method: "post",
data
});
}
/**
* 活动列表
* @returns

View File

@ -0,0 +1,175 @@
<template>
<el-dialog title="选择优惠劵" top="5vh" :visible.sync="dialogVisible">
<div class="head-container">
<el-table ref="table" :data="tableData.list" height="500" v-loading="tableData.loading">
<!-- <el-table-column type="selection" width="55" align="center" v-if="!radio"></el-table-column> -->
<el-table-column label="名称" prop="title" />
<el-table-column label="使用门槛">
<template v-slot="scope">
{{ `${scope.row.fullAmount}${scope.row.discountAmount ? '减' + scope.row.discountAmount + '元' :
''}` }}
</template>
</el-table-column>
<el-table-column label="总发放数量" prop="number" />
<el-table-column label="已使用" prop="useNumber" />
<el-table-column label="剩余" prop="leftNumber" />
<el-table-column label="操作">
<template v-slot="scope">
<el-button type="primary" @click="selectHandle(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
</div>
<el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
@current-change="paginationChange" @size-change="sizeChange"
layout="total, sizes, prev, pager, next, jumper"></el-pagination>
<span slot="footer" class="dialog-footer" v-if="!radio">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="confirmHandle"> </el-button>
</span>
</el-dialog>
</template>
<script>
import { getTbShopCoupon, delTbShopCoupon } from '@/api/coupon'
export default {
props: {
//
radio: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: false,
searhForm: {
name: '',
category: ''
},
categoryList: [],
tableData: {
page: 0,
size: 10,
total: 0,
loading: false,
list: []
},
goods: []
}
},
methods: {
//
selectHandle(row) {
this.$emit('success', [{ ...row }])
this.close()
},
//
confirmHandle() {
let res = this.$refs.table.selection
this.$emit('success', res)
this.close()
},
//
resetHandle() {
this.searhForm.name = ''
this.searhForm.category = ''
this.tableData.page = 0
this.tableData.size = 10
this.tableData.list = []
this.getTableData()
},
//
sizeChange(e) {
this.tableData.size = e
this.getTableData()
},
//
paginationChange(e) {
this.tableData.page = e - 1
this.getTableData()
},
//
async getTableData() {
this.tableData.loading = true
try {
const res = await getTbShopCoupon({
page: this.tableData.page,
size: this.tableData.size,
name: this.searhForm.name,
categoryId: this.searhForm.category,
shopId: localStorage.getItem('shopId'),
sort: 'id',
})
this.tableData.list = res.content
this.tableData.total = res.totalElements
if (this.goods.length) {
this.$nextTick(() => {
this.selection()
})
}
setTimeout(() => {
this.tableData.loading = false
}, 500);
} catch (error) {
console.log(error)
}
},
//
async tbShopCategoryGet() {
try {
const res = await getTbShopCoupon({
page: 0,
size: 100,
sort: 'id',
shopId: localStorage.getItem('shopId')
})
this.categoryList = res.content
} catch (error) {
console.log(error)
}
},
async show(goods, categoryId) {
this.dialogVisible = true
if (goods && goods.length) {
this.goods = goods
} else {
this.goods = []
}
this.resetHandle()
console.log(categoryId);
if (categoryId) {
this.searhForm.category = categoryId
}
console.log(this.searhForm);
},
close() {
this.dialogVisible = false
},
selection() {
this.goods.forEach(row => {
this.tableData.list.forEach((item, index) => {
if (row.id == item.id) {
this.$refs.table.toggleRowSelection(this.tableData.list[index]);
}
})
});
}
}
}
</script>
<style scoped lang="scss">
.shop_info {
display: flex;
align-items: center;
span {
margin-left: 10px;
}
}
</style>

View File

@ -6,29 +6,30 @@
</div>
<!-- 优惠券 -->
<div v-if="form.type == 1" class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
<el-form-item label="优惠券券名" prop="title">
<el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="120px" label-position="left">
<el-form-item label="优惠券券名" prop="title" style="width: 100%;">
<el-input v-model="form.title" placeholder="" style="width: 289px;" />
</el-form-item>
<el-form-item label="使用门槛">
<el-input v-model="form.fullAmount" type="number" placeholder="" style="width: 180px;margin-right: 66px;">
<el-form-item label="使用门槛" prop="fullAmount">
<el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;margin-right: 66px;">
<template slot="prepend"></template>
<template slot="append"></template>
</el-input>
<el-input v-model="form.discountAmount" type="number" placeholder="" style="width: 180px;">
</el-form-item>
<el-form-item label="" prop="discountAmount">
<el-input v-model="form.discountAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;">
<template slot="prepend"></template>
<template slot="append"></template>
</el-input>
</el-form-item>
<el-form-item label="有效期类型">
<el-form-item label="有效期类型" style="width: 100%;">
<el-radio-group v-model="form.validityType">
<el-radio v-for="item in couponEnum.validityType" :key="item.value" :label="item.value">
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime">
<el-form-item v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime" style="width: 100%;">
<el-date-picker
v-model="validityTime"
type="daterange"
@ -40,12 +41,12 @@
@change="validityChange"
/>
</el-form-item>
<el-form-item label="有效期(天)" prop="validDays">
<el-form-item label="有效期(天)" prop="validDays" style="width: 100%;">
<el-input v-model="form.validDays" placeholder="" style="width: 200px;">
<template slot="append"></template>
</el-input>
</el-form-item>
<!-- <el-form-item label="使用门槛" prop="daysToTakeEffect">
<!-- <el-form-item label="使用门槛" prop="daysToTakeEffect" style="width: 100%;">
<el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
<template slot="prepend"></template>
<template slot="append">天生效</template>
@ -54,19 +55,19 @@
<i class="el-icon-question" />
</el-tooltip>
</el-form-item> -->
<el-form-item label="可用周期" prop="userDays">
<el-form-item label="可用周期" prop="userDays" style="width: 100%;">
<el-checkbox-group v-model="form.userDays">
<el-checkbox v-for="(city,index) in couponEnum.cycle" :key="index" :label="city.label" @change="userDayChagne">{{ city.label }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="指定时间段">
<el-form-item label="指定时间段" style="width: 100%;">
<el-radio-group v-model="form.useTimeType">
<el-radio v-for="item in couponEnum.useTimeType" :key="item.value" :label="item.value">
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.useTimeType == 'custom'" label="指定时间段" prop="useEndTime">
<el-form-item v-if="form.useTimeType == 'custom'" label="指定时间段" prop="useEndTime" style="width: 100%;">
<el-time-picker
v-model="useTime"
is-range
@ -78,8 +79,8 @@
@change="useTimeChange"
/>
</el-form-item>
<el-form-item label="发放数量" prop="number">
<el-input v-model="form.number" type="number" placeholder="" style="width: 200px;" />
<el-form-item label="发放数量" prop="number" style="width: 100%;">
<el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 200px;" />
<el-tooltip class="item" effect="dark" content="限用户自行领取,(当库存为 0时集草等活动仍会赠送" placement="top-start">
<i class="el-icon-question" />
</el-tooltip>
@ -96,16 +97,14 @@
<el-form-item label="商品券券名" prop="title">
<el-input v-model="form.title" placeholder="" style="width: 289px;" />
</el-form-item>
<el-form-item />
<el-form-item />
<el-form-item label="发放数量" prop="number">
<el-input v-model="form.number" type="number" placeholder="" style="width: 289px;" />
<el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 289px;" />
<el-tooltip class="item" effect="dark" content="限用户自行领取,(当库存为 0时集草等活动仍会赠送" placement="top-start">
<i class="el-icon-question" />
</el-tooltip>
</el-form-item>
<el-form-item label="使用门槛">
全额满<el-input v-model="form.fullAmount" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix"></template></el-input>可用
<el-form-item label="使用门槛" prop="fullAmount">
全额满<el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix"></template></el-input>可用
</el-form-item>
<el-form-item label="赠送商品" prop="products">
<div>
@ -186,6 +185,20 @@ export default {
trigger: 'blur'
}
],
fullAmount: [
{
required: true,
message: '填写满减金额',
trigger: 'blur'
}
],
discountAmount: [
{
required: true,
message: '填写满减金额',
trigger: 'blur'
}
],
number: [
{
required: true,

View File

@ -31,7 +31,7 @@
<el-table-column label="总发放数量" prop="number" />
<el-table-column label="已领取" align="center">
<template v-slot="scope">
<div style="display: flex;align-items: center;">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="width: 30px;">{{ scope.row.number-scope.row.leftNumber }}</div>
<div style="margin: 0 10px;">|</div>
<div style="color: #3F9EFF;cursor: pointer;flex-shrink: 0;" @click="couponDetailsOpen(scope.row)">详情</div>

View File

@ -437,7 +437,7 @@ export default {
Editor,
addImg,
},
name:'add_shop',
name: 'add_shop',
data() {
const validatordateUsed = (rule, value, callback) => {
if (!this.form.notices.dateUsed) {
@ -602,18 +602,32 @@ export default {
batchNumberForm: {
batchNumber: 0,
},
routequery:''
};
},
mounted() {
this.tbShopUnit();
this.tbShopCategoryGet();
this.changeTypeEnum(0);
if (this.$route.query.goods_id) {
this.tbProductGetDetail();
}
},
methods: {
watch: {
//
$route(to, from) {
console.log(to.query.goods_id)
if (to.query.goods_id) {
if (this.routequery == to.query.goods_id) {
return false;
} else {
this.tbProductGetDetail();
}
this.routequery = to.query.goods_id
}
}
},
methods: {
uploadImgSucess(res, item) {
console.log(res);
console.log(item);

View File

@ -27,12 +27,19 @@
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="售卖时间管控" >
<el-form-item label="售卖时间管控">
<el-radio-group v-model="form.useTime">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="排列方式">
<el-radio-group v-model="form.sortMode">
<el-radio label="0">默认</el-radio>
<el-radio label="1">价格由高到低</el-radio>
<el-radio label="2">销量由高到低</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="" v-if="form.useTime == 1">
<!-- <el-time-picker is-range v-model="form.saleTime" value-format="HH:mm" format="HH:mm"
:picker-options="pickerOptions" range-separator="至" start-placeholder="开始时间"
@ -51,7 +58,7 @@
</el-form-item>
<el-form-item label="分组排序" >
<el-form-item label="分组排序">
<el-input-number v-model="form.sort" controls-position="right" :min="0"></el-input-number>
</el-form-item>
@ -86,6 +93,7 @@ export default {
productIds: [],
saleTime: [],
useTime: 0,
sortMode: '0',
shopId: localStorage.getItem('shopId')
},
pickerOptions: {
@ -182,7 +190,7 @@ export default {
},
async show(obj) {
let res = await hasPermission('允许修改分组');
if ( !res) { return; }
if (!res) { return; }
// if()
this.form.useTime = 0
if (obj && obj.id) {
@ -192,6 +200,9 @@ export default {
this.form.name = obj.name
this.form.sort = obj.sort
this.form.productIds = obj.productIds
this.form.sortMode = obj.sortMode + ''
console.log(obj, '体哦啊是1')
console.log(this.form, '体哦啊是1')
// if (obj.saleStartTime != null) {
// this.$set(this.form, 'saleTime', [obj.saleStartTime, obj.saleEndTime])
// }

View File

@ -298,11 +298,9 @@ export default {
}
},
async mounted() {
console.log(this.$route.query.productId, 'tiaoshi1')
if (this.$route.query.productId) {
this.query.productId = this.$route.query.productId
}
console.log(this.query)
await this.tbShopCategoryGet()
await this.getTableData()
@ -533,7 +531,6 @@ export default {
})
})
console.log(res);
this.tableData.loading = false
this.tableData.data = res.content

View File

@ -19,24 +19,26 @@
下载会员充值二维码
</el-button>
<div style="margin-top: 35px; font-size: 16px; color: #333;">
允许充值自定义金额<el-switch v-model="shopInfo.isCustom" active-value="1" inactive-value="0" size="large" @change="customStatusChange"></el-switch>
允许充值自定义金额<el-switch v-model="shopInfo.isCustom" active-value="1" inactive-value="0" size="large"
@change="customStatusChange"></el-switch>
</div>
</div>
<div class="head-container">
<el-table :data="tableData.data" v-loading="tableData.loading">
<el-table-column label="店铺ID" prop="shopId"></el-table-column>
<el-table-column label="最小金额" prop="minNum"></el-table-column>
<el-table-column label="最大金额" prop="maxNum"></el-table-column>
<el-table-column label="赠送金额" prop="handselNum"></el-table-column>
<el-table-column label="赠送类型" prop="handselType">
<el-table-column label="充值金额" prop="amount"></el-table-column>
<el-table-column label="赠送金额" prop="giftAmount"></el-table-column>
<!-- <el-table-column label="赠送金额" prop="handselNum"></el-table-column>
<el-table-column label="是否使用优惠券" prop="isUseCoupon">
<template v-slot="scope">
{{ scope.row.handselType | handselTypeFilter }}
</template>
</el-table-column>
<!-- <el-table-column label="排序" sortable prop="sort"></el-table-column> -->
<el-table-column label="是否启用" prop="isDel">
</el-table-column>
<el-table-column label="排序" sortable prop="sort"></el-table-column> -->
<el-table-column label="赠送积分" prop="giftPoints"></el-table-column>
<el-table-column label="是否使用优惠券" prop="isUseCoupon">
<template v-slot="scope">
<el-switch v-model="scope.row.isDel" active-value="0" inactive-value="1"
<el-switch v-model="scope.row.isUseCoupon" :active-value="1" :inactive-value="0"
@change="statusChange($event, scope.row)"></el-switch>
</template>
</el-table-column>
@ -65,7 +67,7 @@
import handselTypes from './handselTypes'
import addActive from './components/addActive'
import QR from './components/downloadQR.vue'
import { findActivate, modityActivate } from '@/api/shop'
import { findActivate, storageupActivate } from '@/api/shop'
import { tbShopInfo, tbShopInfoPut } from "@/api/user";
import dayjs from 'dayjs'
export default {
@ -104,16 +106,27 @@ export default {
methods: {
//
async statusChange(e, row) {
try {
this.tableData.loading = true
const data = { ...row }
data.status = e
await modityActivate(data)
this.getTableData()
} catch (error) {
console.log(error)
this.tableData.loading = false
if (row.couponName) {
try {
this.tableData.loading = true
const data = { ...row }
data.isUseCoupon = e
console.log(data.isUseCoupon)
await storageupActivate(data)
this.getTableData()
} catch (error) {
console.log(error)
this.tableData.loading = false
}
} else {
console.log(22)
this.$message({
message: '请选择优惠劵',
type: 'warning'
});
return false;
}
},
//
resetHandle() {
@ -151,7 +164,7 @@ export default {
}
console.log(this.shopInfo);
} catch (error) {
console.log(error)
}

View File

@ -2,7 +2,23 @@
<div>
<el-dialog :title="form.id ? '编辑活动' : '添加活动'" :visible.sync="dialogVisible" @close="reset">
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
<el-form-item label="最小金额">
<el-form-item label="充值">
<template>
<div style="display: flex;">
<el-input style="width: 220px;" placeholder="请输入金额" v-model="form.amount">
<template slot="prepend"></template>
<template slot="append"></template>
</el-input>
<el-input style="margin-left: 20px; width: 220px;" placeholder="请输入金额"
v-model="form.giftAmount">
<template slot="prepend"></template>
<template slot="append"></template>
</el-input>
</div>
</template>
</el-form-item>
<!-- <el-form-item label="最小金额">
<el-input-number v-model="form.minNum" controls-position="right" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="最大金额">
@ -11,32 +27,46 @@
<el-form-item label="赠送金额">
<el-input-number v-model="form.handselNum" controls-position="right" :min="0"></el-input-number>
</el-form-item>
<!-- <el-form-item label="赠送类型">
<el-form-item label="赠送类型">
<el-select v-model="form.handselType">
<el-option :label="item.label" :value="item.value" v-for="item in handselTypes"
:key="item.value"></el-option>
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item label="状态">
<el-switch v-model="form.isDel" active-value="0" inactive-value="1"></el-switch>
</el-form-item> -->
<el-form-item label="是否使用优惠券">
<el-switch v-model="form.isUseCoupon" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="是否赠送商品">
<el-switch v-model="form.isGiftPro" :active-value="1" :inactive-value="0"></el-switch>
<el-form-item label="数量">
<el-input-number v-model="form.num" controls-position="right" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="赠送商品">
<el-form-item label="积分">
<template>
<div class="labelboxss">
<div>赠送</div>
<el-input style="width: 140px;margin: 0 15px;" v-model="form.giftPoints"></el-input>
<div>积分</div>
</div>
</template>
</el-form-item>
<el-form-item label="选择优惠劵" v-if="form.isUseCoupon == 1">
<div>
<el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...productIds])">
添加商品
<el-button type="primary" icon="el-icon-plus" @click="$refs.coupon.show([...productIds])">
添加优惠劵
</el-button>
</div>
<div class="shop_list">
<div class="item_wrap" style="display: flex;align-items: center;margin-top: 6px;"
v-for="(item, index) in productIds" :key="item.id">
<div class="name">{{ item.name }}</div>
<el-input style="width: 120px;" v-model="item.num" placeholder='请填写数量'
@input="checkIfNum(item)"></el-input>
<el-button type="text" @click="productIds.splice(index, 1)"
style="margin-left: 20px;">删除</el-button>
<div class="name">{{ item.title }}</div>
<!-- <el-input style="width: 120px;" v-model="item.num" placeholder='请填写数量'
@input="checkIfNum(item)"></el-input> -->
<!-- <el-button type="text" @click="productIds.splice(index, 1)"
style="margin-left: 20px;">删除</el-button> -->
<el-button type="text" @click="productIds = []" style="margin-left: 20px;">删除</el-button>
</div>
</div>
</el-form-item>
@ -46,18 +76,18 @@
<el-button type="primary" :loading="loading" @click="onSubmitHandle"> </el-button>
</span>
</el-dialog>
<shopList ref="shopListRef" @success="slectShop" />
<coupon ref="coupon" @success="slectShop" />
</div>
</template>
<script>
import handselTypes from '../handselTypes'
import { modityActivate, activate } from '@/api/shop'
import shopList from '@/components/shopList'
import { activate, storageupActivate } from '@/api/shop'
import coupon from '@/components/coupon'
export default {
components: { shopList },
components: { coupon },
data() {
return {
dialogVisible: false,
@ -70,7 +100,10 @@ export default {
maxNum: 1,
handselNum: 1, //
handselType: 'GD',
isDel: '0'
isDel: '0',
num: 1,
amount: '',
giftAmount: ''
},
productIds: [],
resetForm: '',
@ -97,15 +130,16 @@ export default {
},
methods: {
slectShop(res) {
if (this.productIds.length) {
res.map(async item => {
if (!await this.checkShop(item.id)) {
this.productIds.push({ ...item })
}
})
} else {
this.productIds = res
}
console.log(res, 11)
// if (this.productIds.length) {
// res.map(async item => {
// if (!await this.checkShop(item.id)) {
// this.productIds.push({ ...item })
// }
// })
// } else {
this.productIds = res
// }
},
//
checkShop(id) {
@ -125,21 +159,37 @@ export default {
this.form.config.categoryList = e
},
onSubmitHandle() {
// console.log(this.form)
let arr = []
this.productIds.forEach(ele => {
arr.push({
productId: ele.id,
num: ele.num
})
})
this.form.products = arr
console.log(this.form)
if (this.form.amount == '') {
this.$message({
message: '充值金额不能为空',
type: 'warning'
});
return false;
}
if (this.form.isUseCoupon == 1) {
if (this.productIds.length == 0) {
this.$message({
message: '请选择优惠劵',
type: 'warning'
});
return false;
}
this.form.couponId = this.productIds[0].id
}
// let arr = []
// this.productIds.forEach(ele => {
// arr.push({
// productId: ele.id,
// num: ele.num
// })
// })
this.$refs.form.validate(async valid => {
if (valid) {
try {
this.loading = true
this.form.shopId = localStorage.getItem('shopId')
let res = await modityActivate(this.form)
let res = await storageupActivate(this.form)
this.$emit('success', res)
this.close()
this.$notify({
@ -159,9 +209,13 @@ export default {
this.dialogVisible = true
if (obj && obj.id) {
this.form = { ...obj }
let res = await activate(obj.id)
this.productIds = res
console.log(res, '调试1')
// let res = await activate(obj.id)
// this.productIds = res
if (obj.couponName) {
this.productIds = [{ title: obj.couponName }]
}
console.log(obj, '调试1')
}
},
close() {
@ -174,6 +228,35 @@ export default {
}
</script>
<style scoped lang="scss">
.labelbox {
display: flex;
justify-content: flex-start;
align-items: center;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 12px;
color: #666666;
width: 130px;
background: #F7F7FA;
border-radius: 2px 2px 2px 2px;
border: 1px solid #DDDFE6;
padding: 0 10px;
input {
border: none !important;
}
}
.labelboxss {
display: flex;
justify-content: flex-start;
align-items: center;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
color: #666666;
}
.shop_list {
// display: flex;/
// flex-wrap: wrap;

View File

@ -25,13 +25,14 @@ export default {
},
methods: {
show() {
this.isshow = true
this.getlist()
},
async getlist() {
let res = await getwxacode({
shopId: localStorage.getItem('shopId')
})
this.isshow = true
this.imgUrl = res
}, downImg() {
// window.location.href()