czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

This commit is contained in:
魏啾 2024-11-13 18:29:11 +08:00
parent 528344d6ce b836d1a0b4
commit e9bd9cc2d8
10 changed files with 607 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/application/components/invite_friend/setting.vue
View File

@ -80,6 +80,9 @@
<el-button type="primary" @click="addRewardHandle('rewardCoupons')">添加券</el-button>
</el-form-item>
<el-form-item prop="rewardCoupons">
<div>
<div class="tips">奖励券不受优惠券发放数量影响</div>
</div>
<el-table :data="form.rewardCoupons" border style="width: 600px;">
<el-table-column label="券ID" prop="couponId"></el-table-column>
<el-table-column label="名称" prop="couponName"></el-table-column>

426
src/views/application/components/invite_friend/share.vue Normal file
View File

@ -0,0 +1,426 @@
<template>
<div>
<el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
<el-form-item label="分享标题" prop="title">
<el-input v-model="form.title" style="width: 500px;" placeholder="例如：邀请1人可得，双方各得10元优惠券"></el-input>
</el-form-item>
<el-form-item label="分享封面" prop="shareImg">
<div class="img_list">
<div class="item" v-if="form.shareImg">
<el-image :src="form.shareImg" style="width: 100%;height: 100%" :preview-src-list="urlList" />
<div class="del" @click.stop="form.shareImg = ''">删除</div>
</div>
<div class="item upload" @click="formImgKey = 'shareImg'; $refs.addImg.show()" v-else>
<i class="icon el-icon-plus"></i>
</div>
</div>
<div class="tips">建议尺寸：630*504</div>
</el-form-item>
<el-form-item label="演示">
<div class="preview_wrap">
<div class="message_wrap">
<div class="msg">
<div class="content">
<div class="name">
<img class="logo" :src="shopInfo.logo">
<span class="t">{{ shopInfo.name }}</span>
</div>
<div class="title">{{ form.title }}</div>
<el-image :src="form.shareImg" style="width: 100%;height: 130px;" fit="cover">
<div slot="error" class="image-slot">
<i class="el-icon-folder-delete"></i>
</div>
</el-image>
<div class="btm">
<i class="icon el-icon-link"></i>
小程序
</div>
</div>
<img class="avatar" src="@/assets/images/avatar.png">
</div>
</div>
<div class="footer">
<i class="icon el-icon-microphone"></i>
<div class="ipt"></div>
<i class="icon el-icon-picture-outline-round"></i>
<i class="icon el-icon-circle-plus-outline"></i>
</div>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="loading" @click="onSubmitHandle">保存</el-button>
</el-form-item>
</el-form>
<addImg ref="addImg" @successEvent="e => form[formImgKey] = e[0].url" />
<AddCoupon ref="AddCoupon" @success="addCouponSuccess" />
</div>
</template>
<script>
import { byShopId, tbShopShare } from '@/api/inviteFirend.js'
import addImg from "@/views/product/components/addImages.vue";
import AddCoupon from './addCoupon.vue'
export default {
components: { addImg, AddCoupon },
data() {
const imgValidate1 = (rule, value, callback) => {
if (!this.form.shareImg) {
callback(new Error("请上传分享封面图"));
} else {
callback()
}
}
const imgValidate2 = (rule, value, callback) => {
if (!this.form.invitedImg) {
callback(new Error("请上传邀请顶部图"));
} else {
callback()
}
}
const imgValidate3 = (rule, value, callback) => {
if (!this.form.beInvitedImg) {
callback(new Error("请上传被邀顶部图"));
} else {
callback()
}
}
const startTimeValidate = (rule, value, callback) => {
if (!this.form.startTime) {
callback(new Error("请选择活动日期"));
} else {
callback()
}
}
const newCouponsValidate = (rule, value, callback) => {
if (!this.form.newCoupons.length) {
callback(new Error("请添加新用户获得券"));
} else {
callback()
}
}
const rewardCouponsValidate = (rule, value, callback) => {
if (!this.form.rewardCoupons.length) {
callback(new Error("请添加奖励券"));
} else {
callback()
}
}
return {
loading: false,
createdAt: [],
formImgKey: '',
couponKey: '',
tableType: '1', // 1添加 2编辑
tableEditorIndex: 0, // 编辑时的index
shopInfo: {
name: localStorage.getItem('shopName'),
logo: localStorage.getItem('logo')
},
form: {
status: 1,
title: '',
shareImg: '',
invitedImg: '',
beInvitedImg: '',
startTime: '',
endTime: '',
newCoupons: [],
invitedNum: '1',
rewardCoupons: [],
getMethod: 'get'
},
rules: {
title: [
{
required: true,
message: '请输入标题',
trigger: 'blur'
}
],
shareImg: [
{
required: true,
validator: imgValidate1,
trigger: 'change'
}
],
invitedImg: [
{
required: true,
validator: imgValidate2,
trigger: 'change'
}
],
beInvitedImg: [
{
required: true,
validator: imgValidate3,
trigger: 'change'
}
],
startTime: [
{
required: true,
validator: startTimeValidate,
trigger: 'change'
}
],
newCoupons: [
{
required: true,
validator: newCouponsValidate,
trigger: 'change'
}
],
invitedNum: [
{
required: true,
message: '请输入邀请人数',
trigger: 'blur'
}
],
rewardCoupons: [
{
required: true,
validator: rewardCouponsValidate,
trigger: 'change'
}
],
},
urlList: []
}
},
mounted() {
this.byShopId()
},
methods: {
// 添加完成优惠券
addCouponSuccess(e) {
if (this.tableType == 1) {
this.form[this.couponKey].push({ ...e })
} else {
// this.form[this.couponKey][this.tableEditorIndex] = { ...e }
this.$set(this.form[this.couponKey], this.tableEditorIndex, { ...e })
}
},
// 添加奖励券
addRewardHandle(key, type = 1, row = {}, index = 0) {
this.tableEditorIndex = index
this.tableType = type
this.couponKey = key
if (key == 'rewardCoupons' && !this.form.invitedNum) {
this.$refs.form.validateField('invitedNum')
return
}
this.$refs.AddCoupon.show(row)
},
// 日期回调
timeChange(e) {
this.form.startTime = e[0]
this.form.endTime = e[1]
},
// 过滤input只能输入整数
inputFilterInt(e, key) {
if (!e) return
setTimeout(() => {
this.form[key] = e.replace(/[^\d]/g, '')
}, 50)
},
// 提交
onSubmitHandle() {
this.$refs.form.validate(async valid => {
if (valid) {
try {
this.loading = true
this.form.shopId = localStorage.getItem('shopId')
await tbShopShare(this.form)
this.loading = false
this.$notify({
title: '成功',
message: `保存成功`,
type: 'success'
});
} catch (error) {
this.loading = false
console.log(error)
}
}
})
},
// 获取店铺设置
async byShopId() {
try {
const res = await byShopId()
if (res.id) {
this.form = res
this.createdAt = [res.startTime, res.endTime]
this.urlList = [res.shareImg, res.invitedImg, res.beInvitedImg]
}
} catch (error) {
console.log(error);
}
}
}
}
</script>
<style scoped lang="scss">
.img_list {
display: flex;
flex-wrap: wrap;
gap: 10px;
.item {
width: 100px;
height: 100px;
display: flex;
align-items: center;
justify-content: center;
background-color: #F5F7FA;
position: relative;
overflow: hidden;
&.upload {
border: 1px dashed #ddd;
}
&:hover {
cursor: pointer;
.del {
transform: translateY(0);
}
}
.del {
width: 100%;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
position: absolute;
left: 0;
bottom: 0;
background-color: rgba(255, 0, 0, 0.6);
backdrop-filter: blur(3px);
color: #fff;
font-size: 12px;
transform: translateY(100%);
transition: all .2s ease-in-out;
}
.img {
width: 100%;
height: 100%;
display: block;
}
.icon {
font-size: 20px;
color: #ddd;
}
}
}
.preview_wrap {
width: 328px;
height: 368px;
background-color: #EDEDED;
position: relative;
padding: 20px 10px;
.message_wrap {
display: flex;
justify-content: flex-end;
.msg {
display: flex;
.content {
width: 200px;
background-color: #fff;
border-radius: 4px;
padding: 10px 10px 6px;
.name {
display: flex;
align-items: center;
line-height: 10px;
.logo {
width: 20px;
height: 20px;
border-radius: 50%;
}
.t {
font-size: 10px;
color: #999;
margin-left: 6px;
}
}
.btm {
font-size: 10px;
color: #999;
line-height: 10px;
display: flex;
align-items: center;
border-top: 1px solid #ececec;
padding-top: 6px;
.icon {
font-size: 14px;
color: rgb(87, 87, 253);
margin-right: 6px;
}
}
}
.avatar {
width: 40px;
height: 40px;
margin-left: 10px;
}
}
}
.footer {
background-color: #F6F6F6;
width: 100%;
position: absolute;
left: 0;
bottom: 0;
display: flex;
align-items: center;
padding: 0 10px;
gap: 10px;
padding-top: 10px;
padding-bottom: 40px;
&::after {
content: "";
width: 100px;
height: 4px;
border-radius: 4px;
position: absolute;
bottom: 10px;
left: 50%;
margin-left: -50px;
background-color: #333;
}
.ipt {
flex: 1;
height: 36px;
background-color: #fff;
border-radius: 4px;
}
.icon {
font-size: 28px;
color: #333;
}
}
}
</style>

5
src/views/application/invite_friend.vue
View File

@ -6,22 +6,25 @@
<el-tab-pane label="邀请记录" name="3"></el-tab-pane>
</el-tabs>
<Setting v-if="activeName == 1" />
<Share v-if="activeName == 2" />
<Record v-if="activeName == 3" />
</div>
</template>
<script>
import Setting from './components/invite_friend/setting.vue'
import Share from './components/invite_friend/share.vue'
import Record from './components/invite_friend/record.vue'
export default {
name: 'invite_friend',
components: {
Setting,
Share,
Record
},
data() {
return {
activeName: '1'
activeName: '2'
}
},
methods: {}

135
src/views/coupon_manage/add_coupon.vue
View File

@ -6,29 +6,35 @@
</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" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;margin-right: 66px;">
<el-form-item v-if="form.type == 1" label="使用门槛" prop="fullAmount">
<el-input v-model="form.fullAmount" oninput="value= value.replace(/[^\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" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;">
</el-form-item>
<el-form-item v-if="form.type == 1" label="" prop="discountAmount">
<el-input v-model="form.discountAmount" oninput="value= value.replace(/[^\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 == 'fixed'" 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 v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime" style="width: 100%;">
<el-date-picker
v-model="validityTime"
type="daterange"
@ -40,12 +46,7 @@
@change="validityChange"
/>
</el-form-item>
<el-form-item label="有效期（天）" prop="validDays">
<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,7 +79,7 @@
@change="useTimeChange"
/>
</el-form-item>
<el-form-item label="发放数量" prop="number">
<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" />
@ -86,27 +87,81 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
<el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
</span>
</div>
<!-- 商品券 -->
<div v-if="form.type == 2" class="content">
<div v-if="form.type == 2">
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
<el-form-item label="商品券券名" prop="title">
<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 style="margin: 0!important;" />
<el-form-item style="margin: 0!important;" />
<el-form-item label="发放数量" prop="number">
<el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 289px;" />
<el-form-item label="使用门槛" prop="fullAmount">
全额满<el-input v-model="form.fullAmount" oninput="value= value.replace(/[^\d|\.]/g, '')" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
</el-form-item>
<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 == 'fixed'" 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 v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime" style="width: 100%;">
<el-date-picker
v-model="validityTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['06:00:00', '23:59:59']"
value-format="yyyy-MM-dd HH:mm:ss"
@change="validityChange"
/>
</el-form-item>
<!-- <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>
</el-input>
<el-tooltip class="item" effect="dark" content="领取后0天后0点0分" placement="top-start">
<i class="el-icon-question" />
</el-tooltip>
</el-form-item> -->
<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="指定时间段" 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" style="width: 100%;">
<el-time-picker
v-model="useTime"
is-range
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
value-format="HH:mm"
@change="useTimeChange"
/>
</el-form-item>
<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>
</el-form-item>
<el-form-item label="使用门槛">
全额满<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>
<el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...form.products])">
@ -124,10 +179,9 @@
</div>
</div>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
<el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
</span>
</div>
@ -186,6 +240,20 @@ export default {
trigger: 'blur'
}
],
fullAmount: [
{
required: true,
message: '填写满减金额',
trigger: 'blur'
}
],
discountAmount: [
{
required: true,
message: '填写满减金额',
trigger: 'blur'
}
],
number: [
{
required: true,
@ -253,6 +321,7 @@ export default {
*/
tabClick(item) {
console.log(this.form)
this.form = this.resetForm
this.form.number = ''
this.form.type = item.type
this.$refs.form.resetFields()
@ -311,7 +380,7 @@ export default {
res.map(async item => {
if (!await this.checkShop(item.id)) {
this.form.products.push({
id: item.id,
productId: item.id,
name: item.name,
num: null
})
@ -319,7 +388,7 @@ export default {
})
} else {
this.form.products.push({
id: res[0].id,
productId: res[0].id,
name: res[0].name,
num: null
})

2
src/views/coupon_manage/coupon_list.vue
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>

7
src/views/order_manage/components/orderDetail.vue
View File

@ -139,11 +139,11 @@
<template v-slot="scope">
<template v-if="scope.row.status!='unpaid'">
<el-button v-if="canTuikuan(scope.row)" type="text" size="mini" @click="tuikuan(scope.row)"><span >退款</span></el-button>
<span class="color-999" v-else>已退款</span>
<span class="color-999" v-if="isTui(scope.row)">已退款</span>
</template>
<template v-if="scope.row.status=='unpaid'">
<el-button v-if="canTuicai(scope.row)" type="text" size="mini" @click="tuiCai(scope.row)"><span >退菜</span></el-button>
<span class="color-999" v-else>已退菜</span>
<span class="color-999" v-if="scope.row=='return'">已退菜</span>
</template>
</template>
</el-table-column>
@ -292,6 +292,9 @@ export default {
console.log('drawer close')
this.$emit('close');
},
isTui(item){
return $util.isTui(item);
},
canTuikuan(item){
return $util.canTuiKuan(this.detail,item);
},

3
src/views/order_manage/order_goods_util.js
View File

@ -11,6 +11,9 @@ export function returnPackFee(arr) {
}
export function canTuicai(orderInfo,item){
if(orderInfo.status=='unpaid'&&orderInfo.isPostpaid!==null&&orderInfo.isPostpaid==0){
return false
}
return orderInfo.status=='unpaid'&&orderInfo.useType!='dine-in-before'&& item.status!='return'
}
export function canTuiKuan(orderInfo,item){

33
src/views/tool/Instead/components/quans.vue
View File

@ -165,9 +165,9 @@
<script>
import { $activateByOrderId } from "@/api/table";
import {
returnProductCouponAllPrice,
returnProductCouponAllPrice,returnProductCoupon,
returnProductCouponPrice,
returnFullReductionCouponAllPrice,
returnFullReductionCouponAllPrice,returnNewGoodsList
} from "../util";
let $originFullReductionCoupon = [];
export default {
@ -327,15 +327,15 @@ export default {
} else {
this.quansSelArr.unshift(row);
}
if(!this.fullReductionCouponSel.id){
return
if (!this.fullReductionCouponSel.id) {
return;
}
if (
this.orderPrice -
this.fullReductionCouponDiscount -
this.goodsDiscount <
this.fullReductionCouponSel.fullAmount
this.fullReductionCouponSel.fullAmount
) {
this.fullReductionCouponSel = { id: "" };
this.quansSelArr.splice(0, 1);
@ -396,21 +396,16 @@ export default {
memberId: data.memberId,
});
quansRes.fullReductionCoupon = quansRes.fullReductionCoupon.filter(
(v) => this.orderPrice >= v.fullAmount
(v) => {
return this.orderPrice >= v.fullAmount && v.use;
}
);
const canDikouGoodsArr = returnNewGoodsList(this.goodsArr|| [])
$originFullReductionCoupon = quansRes.fullReductionCoupon;
this.quans.productCoupon = quansRes.productCoupon
.map((v) => {
return {
...v,
discountAmount: returnProductCouponPrice(
v,
this.goodsArr,
this.vipUser
),
};
})
.filter((v) => v.discountAmount > 0);
this.quans.productCoupon = quansRes.productCoupon.map(v=>{
const coup = returnProductCoupon(v, canDikouGoodsArr,this.vipUser)
return coup
}).filter(v=>v.use)
// this.quans = quans;
this.filterFullReductionCoupon();
this.quansSelArr = this.propSelCoup;

26
src/views/tool/Instead/index.vue
View File

@ -639,6 +639,22 @@
>
退菜
</div>
<!-- <div
class="btn"
>
单品改价
</div>
<div
class="btn"
>
等叫
</div>
<div
class="btn no-wrap u-font-12"
>
取消全部等叫
</div> -->
<!-- <div
class="btn"
:class="{ disabled: order.old.list.length <= 0 }"
@ -1736,7 +1752,11 @@ export default {
},
yinFuJinE() {
const total = this.currentPayMoney - (this.points.toMoney || 0);
return total.toFixed(2);
if(this.isCreateOrder){
return total.toFixed(2);
}else{
return this.allPrice;
}
},
disableTuicai() {
return (
@ -2776,7 +2796,7 @@ export default {
prve[index].num += cur.num;
} else {
prve.push({
userCouponId: cur.couponId,
userCouponId: cur.id,
num: cur.num,
});
}
@ -3875,7 +3895,7 @@ export default {
this.$router.replace({ path: "/tool/table_list" });
} else {
this.$router.replace({ path: "/tool/Instead/index" });
// this.$router.go(0);
this.$router.go(0);
// this.reset();
// this.$router.replace({ path: "/tool/Instead/index" });
}

29
src/views/tool/Instead/util.js
View File

@ -139,8 +139,28 @@ export function returnNewGoodsList(arr) {
let goodsMap={}
return arr.filter(v => !isTui(v))
}
//根据当前购物车商品以及数量,已选券对应商品数量，判断该商品券是否可用
export function returnCoupCanUse(goodsArr=[],coup,selCoupArr=[]) {
if(!coup.use){
return false
}
const findGoods=goodsArr.filter(v=>v.productId==coup.proId)
if(!findGoods.length){
return false
}
const findGoodsTotalNumber=findGoods.reduce((prve,cur)=>{
return prve+cur.num*1
},0)
const selCoupNumber=selCoupArr.filter(v=>v.proId==coup.proId).reduce((prve,cur)=>{
return prve+cur.num*1
},0)
if(selCoupNumber>=findGoodsTotalNumber){
return false
}
return findGoodsTotalNumber<(coup.num+selCoupNumber)?false:true
}
//查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
export function returnProductCoupon(coup, goodsArr, vipUser) {
export function returnProductCoupon(coup, goodsArr, vipUser,selCoupArr=[]) {
const newGoodsArr = returnNewGoodsList(goodsArr)
const item = newGoodsArr.find(v => v.productId == coup.proId);
if(!item){
@ -148,8 +168,11 @@ export function returnProductCoupon(coup, goodsArr, vipUser) {
}
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
const canUse=!v.use?false:(discountAmount>0)
return { ...coup, discountAmount: price,use:canUse}
const discountAmount=(price*coup.num).toFixed(2)
console.log(discountAmount);
const canUse=!coup.use?false:(discountAmount>0&&returnCoupCanUse(goodsArr,coup,selCoupArr))
// const canUse=discountAmount>0
return { ...coup, discountAmount: discountAmount,use:canUse}
}
/**