dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11.20

Browse Source
This commit is contained in:
WN 2024-11-20 18:00:45 +08:00
parent bdf5a93298
commit 5ed75e1fb8
8 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -184,8 +184,9 @@
width="50%"
ref="drawer"
center
style="padding-bottom: 5px"
>
<div class="demo-drawer__content">
<!-- <div class="demo-drawer__content">-->
<el-form :model="form" ref="ruleForm" :rules="rules" :inline="true" :label-position="labelPosition" label-width="100px" >
<el-form-item label="活动名称" prop="activeName">
@ -352,11 +353,11 @@
>
</el-input>
</div>
<div class="demo-drawer__footer">
<el-button @click="cancelForm">取 消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">保 存</el-button>
</div>
</div>
<!-- </div>-->
<span slot="footer" class="dialog-footer">
<el-button @click="cancelForm">取 消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">保 存</el-button>
</span>
</el-dialog>
<!-- 弹窗-->
<el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
@ -434,16 +435,16 @@
</el-form-item>
<el-form-item label="适用油品油号" prop="oilLimit">
<div class="d-s" style="cursor: pointer">
<div class="d-s" @click="ruleForm.oilLimit = 1">
<div class="d-s" @click="ruleForm.oilLimit = 1" style="width: 10%">
<img src="../../../assets/images/wx.png" v-if="ruleForm.oilLimit != 1" style="width: 20px;height: 20px;">
<img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 1" style="width: 20px;height: 20px;">
<div style="width: 60px;">不限</div>
</div>
<div class="d-s" @click="ruleForm.oilLimit = 2" >
<div class="d-s" @click="ruleForm.oilLimit = 2" style="width: 90%" >
<img src="../../../assets/images/wx.png" v-if="ruleForm.oilLimit != 2" style="width: 20px;height: 20px;">
<img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 2" style="width: 20px;height: 20px;">
<div style="width: 60px;">自定义</div>
<el-select v-if="ruleForm.oilLimit == 2" v-model="ruleForm.oilNumber" placeholder="请选择油品油号（可多选）" multiple style="margin-left: 10px; width: 700px;">
<el-select v-if="ruleForm.oilLimit == 2" v-model="ruleForm.oilNumber" placeholder="请选择油品油号（可多选）" multiple style="margin-left: 10px; width: 100%;">
<el-option :label="item.oilName" :value="item.oilId" v-for="(item,index) in oilnumList" :key="index"></el-option>
</el-select>
</div>

8
fuintAdmin/src/views/EventMarketing/center/index.vue
View File

@ -9,7 +9,7 @@
</div>
<div class="rp-box">
<!-- 营销活动-->
<div class="bai-box" style="overflow: auto" v-show="tabindex == 0">
<div class="bai-box" style="height:84vh;overflow: auto" v-show="tabindex == 0">
<div class="d-s">
<div class="gang"></div>
<div style="font-weight: bold">会员营销</div>
@ -217,7 +217,7 @@
<el-button icon="el-icon-refresh-right" @click="resetQuery">重置</el-button>
</div>
</div>
<div style="height: 66vh;overflow: auto">
<div style="height: 68.9vh;overflow: auto">
<el-table
:data="tableData"
border
@ -317,7 +317,7 @@
<el-button icon="el-icon-refresh-right" @click="resetOldQuery">重置</el-button>
</div>
</div>
<div style="height: 66vh;overflow: auto">
<div style="height: 68.9vh;overflow: auto">
<el-table
:data="oldTableData"
border
@ -743,7 +743,7 @@ export default {
.bai-box {
width: 100%;
height: 85vh;
height: 100%;
background: #fff;
border-radius: 10px;
box-sizing: border-box;

10
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -248,7 +248,7 @@
<el-form :model="ruleForm2" ref="ruleForm2" label-width="100px" class="demo-ruleForm">
<el-form-item label="活动编号" prop="activeNum">
<el-input v-model="ruleForm2.activeNum"></el-input>
<el-input v-model="ruleForm2.activeNum" style="width: 360px"></el-input>
</el-form-item>
@ -336,12 +336,12 @@
</el-select>
</el-form-item>
<el-form-item label="密码形式" prop="pwdType">
<div class="d-s">
<!-- <div class="d-s">-->
<el-radio-group v-model="ruleForm.pwdType">
<el-radio :label="'0'">免密</el-radio>
<el-radio :label="'1'">加密</el-radio>
</el-radio-group>
</div>
<!-- </div>-->
</el-form-item>
<el-form-item label="礼品卡说明" prop="remark">
<el-input type="textarea" v-model="ruleForm.remark"></el-input>
@ -807,7 +807,7 @@ export default {
}
.table-box{
width: 100%;
height: 68vh;
height: 70vh;
overflow: auto;
scrollbar-width: none;
//padding: 15px;
@ -919,7 +919,7 @@ export default {
.card-boxs {
width: 100%;
height: 83.5vh;
height: 84.4vh;
background: #fff;
box-sizing: border-box;
padding: 15px;

28
fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
View File

@ -25,7 +25,7 @@
<el-button type="primary" @click="addCertificate">新增优惠券</el-button>
</div>
</div>
<div style="height: 68.5vh;overflow: auto">
<div style="height: 69vh;overflow: auto">
<el-table border :data="tableData" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column prop="number" label="优惠券编号"></el-table-column>
@ -124,20 +124,20 @@
<div class="d-s" style="justify-content: space-between">
<!-- 左-->
<div class="dialog-lift">
<div style="display: flex;align-items: center">
<el-form-item label="优惠券编号 " label-width="180px" required prop="number" style="width: 100%;margin-bottom: 0px;margin-right: 10px">
<div style="display: flex;align-items: center;margin-bottom: 20px">
<el-form-item label="优惠券编号 " label-width="180px" required prop="number" style="width: 100%;margin-right: 10px;margin-bottom: 0">
<el-input v-model="ruleForm.number" placeholder="请输入优惠券编号" disabled></el-input>
</el-form-item>
<el-button type="primary" icon="el-icon-refresh" circle @click="refreshNumber()"
v-if="!this.disabledBol"></el-button>
</div>
<el-form-item label="是否允许收银台送券" label-width="180px" required style="width: 100%;margin-bottom: 2px" prop="sySend">
<el-form-item label="是否允许收银台送券" label-width="180px" required style="width: 100%;" prop="sySend">
<el-radio-group v-model="ruleForm.sySend">
<el-radio :label="'0'">否</el-radio>
<el-radio :label="'1'">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="生效日期设置" label-width="180px" required style="width: 100%;margin-bottom: 2px" prop="timeType">
<el-form-item label="生效日期设置" label-width="180px" required style="width: 100%;" prop="timeType">
<div class="d-s">
<el-radio-group v-model="ruleForm.timeType">
<el-radio :label="'1'">领取
@ -148,7 +148,7 @@
</el-radio-group>
</div>
</el-form-item>
<el-form-item label="生效日期" label-width="180px" required style="width: 100%;margin-bottom: 2px" v-if="ruleForm.timeType=='2'"
<el-form-item label="生效日期" label-width="180px" required style="width: 100%;" v-if="ruleForm.timeType=='2'"
prop="effectiveDateStart">
<el-date-picker
v-model="ruleForm.effectiveDateStart"
@ -166,7 +166,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="是否与其他优惠同时使用" label-width="180px" required style="width: 100%;margin-bottom: 2px" prop="useWithOther">
<el-form-item label="是否与其他优惠同时使用" label-width="180px" required style="width: 100%;" prop="useWithOther">
<el-radio-group v-model="ruleForm.useWithOther">
<el-radio :label="'0'">不可以</el-radio>
<el-radio :label="'1'">可以</el-radio>
@ -244,7 +244,7 @@
</el-time-picker>
</el-form-item>
</div>
<el-form-item label="不适用时间段" v-if="ruleForm.availableOrUn == '1'" prop="unAvailableType" required>
<el-form-item label="不适用时间段" v-if="ruleForm.availableOrUn == '1'" label-width="180px" prop="unAvailableType" required>
<el-radio-group v-model="ruleForm.unAvailableType">
<div style="display: flex; width: 500px;margin-bottom: 15px;">
@ -269,7 +269,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="时间段" v-if="ruleForm.availableOrUn == '1'" label-width="70px" prop="unAvailablePeriodStart" required>
<el-form-item label="时间段" v-if="ruleForm.availableOrUn == '1'" label-width="180px" prop="unAvailablePeriodStart" required>
<el-time-picker
v-model="ruleForm.unAvailablePeriodStart"
format="HH:mm"
@ -431,12 +431,12 @@
</div>
</div>
<el-form-item style="text-align: center">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="addBlock(ruleForm)">保存</el-button>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="addBlock(ruleForm)">保存</el-button>
</div>
</el-dialog>
</div>
</template>
@ -1426,7 +1426,7 @@ export default {
.card-boxs {
width: 100%;
height: 83.5vh;
height: 84.4vh;
background: #fff;
box-sizing: border-box;
padding: 15px;

16
fuintAdmin/src/views/integral/gift/add.vue
View File

@ -511,7 +511,7 @@ export default {
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分类" prop="categoryId">
<el-form-item label="分类名称" prop="categoryId">
<el-select clearable v-model="dataForm.categoryId" placeholder="请选择礼品分类" style="width:100%">
<el-option label="-不分类-" value=""></el-option>
<el-option
@ -616,12 +616,6 @@ export default {
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="礼品排序" prop="sort">
<el-input-number v-model="dataForm.sort" :min="1" :max="10" label=""
style="width:100%"></el-input-number>
</el-form-item>
</el-col>
<el-col v-if="showList.jf" :span="12">
<el-form-item v-show="showList.jf" label="兑换积分" prop="exchangePoints">
<el-input v-model="dataForm.exchangePoints" placeholder="" style="width:100%">
@ -629,13 +623,19 @@ export default {
</el-input>
</el-form-item>
</el-col>
<el-col v-if="showList.je" :span="8">
<el-col v-if="showList.je" :span="12">
<el-form-item label="兑换金额" prop="exchangeAmount">
<el-input v-model="dataForm.exchangeAmount" placeholder="" maxlength="30" style="width:100%">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="礼品排序" prop="sort">
<el-input-number v-model="dataForm.sort" :min="1" :max="10" label=""
style="width:100%"></el-input-number>
</el-form-item>
</el-col>
<el-col v-if="showList.jfjq" :span="7">
<el-form-item label="加钱比例" prop="moneyRatio">
<el-input v-model="dataForm.moneyRatio" placeholder="" maxlength="30" style="width:100%">

4
fuintAdmin/src/views/integral/gift/gift.vue
View File

@ -1255,10 +1255,10 @@ export default {
height: 98px;
}
.card-change{
height: 86vh;
height: 86.5vh;
}
.table_box{
height: 68vh;
height: 69vh;
overflow: auto;
scrollbar-width: none;
}

2
fuintAdmin/src/views/integral/giftCategory/index.vue
View File

@ -273,6 +273,6 @@ export default {
<style scoped lang="scss">
.card-change{
height: 86vh;
height: 86.5vh;
}
</style>

4
fuintAdmin/src/views/integral/settings/index.vue
View File

@ -61,7 +61,7 @@
</el-form>
<div style="width: 1600px; margin-top: 150px; display: flex;justify-content: center ">
<div style="width: 1600px; display: flex;justify-content: center;position: absolute;bottom: 15px ">
<el-button type="primary" @click="submit">保存</el-button>
</div>
@ -73,7 +73,7 @@
</el-form-item>
</el-form>
<div style="width: 1600px; margin-top: 150px; display: flex;justify-content: center ">
<div style="width: 1600px; display: flex;justify-content: center;position: absolute;bottom: 15px ">
<el-button type="primary" @click="submit">保存</el-button>
</div>
</div>