11.20前端
This commit is contained in:
@QQNZX
parent
5009a627aa
commit
53524364dc
@ -4,6 +4,7 @@
|
||||
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
|
||||
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
||||
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
||||
<!-- <h1 v-else class="sidebar-title" style="color: #00ff80" >{{ title }} </h1>-->
|
||||
</router-link>
|
||||
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
|
||||
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
<el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
|
||||
<template slot="title">
|
||||
<item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
|
||||
<item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
|
||||
</template>
|
||||
<sidebar-item
|
||||
v-for="child in item.children"
|
||||
@ -20,6 +20,7 @@
|
||||
:base-path="resolvePath(child.path)"
|
||||
class="nest-menu"
|
||||
/>
|
||||
|
||||
</el-submenu>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
:default-active="activeMenu"
|
||||
:collapse="false"
|
||||
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
|
||||
:text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
|
||||
text-color="#ffffff"
|
||||
:unique-opened="true"
|
||||
:active-text-color="settings.theme"
|
||||
active-text-color="#409eff"
|
||||
:collapse-transition="false"
|
||||
mode="vertical"
|
||||
style="margin-bottom: 80px;"
|
||||
|
||||
@ -44,6 +44,12 @@
|
||||
|
||||
<el-table v-loading="loading" :data="activeConsumptionList" @selection-change="handleSelectionChange">
|
||||
|
||||
<el-table-column
|
||||
type="index"
|
||||
align="center"
|
||||
label="排序"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="活动编号" align="center" prop="id" />
|
||||
|
||||
<el-table-column label="活动名称" align="center" prop="name" />
|
||||
@ -305,22 +311,32 @@
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" >
|
||||
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="会员等级">
|
||||
<el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" > </el-option>
|
||||
@ -621,7 +637,7 @@ export default {
|
||||
activeStartTime: [
|
||||
{ required: true, message: '必填项不能为空', trigger: 'blur' },
|
||||
],
|
||||
activeEndTime00: [
|
||||
activeEndTime: [
|
||||
{ required: true, message: '必填项不能为空', trigger: 'blur' },
|
||||
],
|
||||
adaptUserType: [
|
||||
@ -666,6 +682,9 @@ export default {
|
||||
this.listUserGrade()
|
||||
},
|
||||
methods: {
|
||||
indexMethod(index) {
|
||||
return index * 2;
|
||||
},
|
||||
/** 查询消费有礼活动列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
@ -1044,5 +1063,6 @@ export default {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
font-size: 18px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -43,7 +43,12 @@
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="activeDiscountList" @selection-change="handleSelectionChange">
|
||||
|
||||
<el-table-column
|
||||
type="index"
|
||||
align="center"
|
||||
label="排序"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="活动编号" align="center" prop="id" />
|
||||
<el-table-column label="活动名称" align="center" prop="name" />
|
||||
<el-table-column label="会员等级" align="center" prop="dieselUserLevel" >
|
||||
@ -90,7 +95,7 @@
|
||||
</el-card>
|
||||
<!-- 添加或修改折扣营销对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="活动名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入活动名称" />
|
||||
</el-form-item>
|
||||
@ -113,22 +118,34 @@
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
|
||||
|
||||
|
||||
|
||||
<el-form-item label="可用油品" prop="adaptOil" >
|
||||
<el-checkbox-group v-model="form.adaptOil">
|
||||
<el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
|
||||
|
||||
@ -43,7 +43,12 @@
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="activeFullminusList" @selection-change="handleSelectionChange">
|
||||
|
||||
<el-table-column
|
||||
type="index"
|
||||
align="center"
|
||||
label="排序"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="活动编号" align="center" prop="id" />
|
||||
<el-table-column label="活动名称" align="center" prop="name" />
|
||||
<el-table-column label="会员等级" align="center" prop="dieselUserLevel" >
|
||||
@ -120,22 +125,34 @@
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
|
||||
|
||||
|
||||
|
||||
<el-form-item label="可用油品" prop="adaptOil" >
|
||||
<el-checkbox-group v-model="form.adaptOil">
|
||||
<el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
|
||||
|
||||
@ -44,7 +44,12 @@
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="activeNewlywedsList" @selection-change="handleSelectionChange">
|
||||
|
||||
<el-table-column
|
||||
type="index"
|
||||
align="center"
|
||||
label="排序"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="活动编号" align="center" prop="id" />
|
||||
<el-table-column label="活动名称" align="center" prop="name" />
|
||||
<el-table-column label="活动开始时间" align="center" prop="activeStartTime" width="180">
|
||||
@ -116,22 +121,28 @@
|
||||
<el-form-item label="活动名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入活动名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="有礼奖励" prop="courtesyReward" >
|
||||
<el-checkbox-group v-model="form.courtesyReward">
|
||||
|
||||
@ -813,3 +824,12 @@ export default {
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
.box-bt{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 18px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -183,27 +183,35 @@
|
||||
<el-form-item label="生效日期" prop="timeType">
|
||||
<el-radio-group v-model="form.timeType">
|
||||
<!-- 0 -->
|
||||
<el-radio label="0">
|
||||
领券后立即生效，有效期
|
||||
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityZero">
|
||||
<el-radio label="0" style="display: flex;align-items: center" >
|
||||
<div class="h-box"> <span>领券后立即生效，有效期</span> <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityZero">
|
||||
<template slot="append">天</template>
|
||||
</el-input>
|
||||
</el-input> </div>
|
||||
|
||||
|
||||
</el-radio>
|
||||
<!-- 1 -->
|
||||
|
||||
<el-radio label="1">固定有效周期，固定开始日期 <el-date-picker
|
||||
<el-radio label="1" style="display: flex;align-items: center" >
|
||||
<div class="h-box">
|
||||
<span> 固定有效周期，固定开始日期</span>
|
||||
<el-date-picker
|
||||
v-model="form.effectiveDate"
|
||||
type="date"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
有效期
|
||||
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityOne"><template slot="append">天</template></el-input>
|
||||
<span>有效期</span>
|
||||
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityOne"><template slot="append">天</template></el-input>
|
||||
</div>
|
||||
</el-radio>
|
||||
<!-- 2-->
|
||||
<el-radio label="2">领券后第 <el-input style="width: 200px" placeholder="1" v-model="form.validityDay">
|
||||
<el-radio label="2" style="display: flex;align-items: center">
|
||||
<div class="h-box">
|
||||
领券后第 <el-input style="width: 200px" placeholder="1" v-model="form.validityDay">
|
||||
<template slot="append">天生效</template>
|
||||
</el-input> 有效期 <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityTwo"><template slot="append">天</template></el-input>
|
||||
</div>
|
||||
</el-radio>
|
||||
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
@ -295,7 +303,6 @@
|
||||
<div style="display: flex;align-items: center">
|
||||
<div class="qr-code" id="qrCode" ref="qrCodeUrl"></div>
|
||||
</div>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="centerDialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
|
||||
@ -450,6 +457,7 @@ export default {
|
||||
count: null,
|
||||
qrCodeLink: null,
|
||||
status: null,
|
||||
effectiveDateType:'0'
|
||||
},
|
||||
tongji:{
|
||||
id:'',
|
||||
@ -580,8 +588,8 @@ export default {
|
||||
storeId: null,
|
||||
isonline: 0,
|
||||
name: null,
|
||||
type: null,
|
||||
discountType: null,
|
||||
type: "0",
|
||||
discountType: "0",
|
||||
oilType: [],
|
||||
fullDeduction: null,
|
||||
discountAmount: null,
|
||||
@ -717,6 +725,10 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
/deep/.el-radio{
|
||||
//display: flex !important;
|
||||
//align-items: center !important;
|
||||
}
|
||||
.hui-box{
|
||||
width: 150px ;
|
||||
height: 80px;
|
||||
@ -730,5 +742,12 @@ export default {
|
||||
font-weight: bold;
|
||||
margin: 5px 0px;
|
||||
}
|
||||
.h-box{
|
||||
|
||||
height: 60px;
|
||||
display: flex;
|
||||
|
||||
align-items: center;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@ -75,7 +75,7 @@ export default {
|
||||
this.couponList = response.data.records;
|
||||
this.total = response.data.total
|
||||
if( response.data.total == 0){
|
||||
this.$message.error("未找到兑换券")
|
||||
|
||||
}else{
|
||||
|
||||
}
|
||||
@ -98,9 +98,6 @@ export default {
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user