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

11.16

Browse Source
This commit is contained in:
@QQNZX 2023-11-17 15:12:06 +08:00
parent d184f6cccd
commit 0935f6b5f4
8 changed files with 45 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintAdmin/src/components/Fuint/Doc/index.vue
View File

@ -1,6 +1,7 @@
<template>
<div title="帮助文档" class="nav-icon">
<svg-icon icon-class="question" @click="goto" />
<!-- <svg-icon icon-class="question" @click="goto" />-->
<i class="el-icon-s-platform" @click="goto" style="font-size: 24px"></i>
</div>
</template>
@ -9,7 +10,9 @@ export default {
name: 'FuintDoc',
data() {
return {
url: 'https://www.fuint.cn/docs/index/'
// url: 'https://www.fuint.cn/docs/index/'
url: 'http://192.168.0.181:82/#/homeindex?id=0'
}
},
methods: {

2
fuintAdmin/src/components/ScreenData/index.vue
View File

@ -12,7 +12,7 @@
},
methods:{
goToWebsite() {
window.open('http://admin.sgkjsc.cn/#/')
window.open('https://www.wanjunshijie.com/demo/shujudaping/zhihuizhaoming/vue3/#/home')
this.toggleFullscreen()
},
toggleFullscreen() {

2
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -44,7 +44,7 @@
<el-table v-loading="loading" :data="activeConsumptionList" @selection-change="handleSelectionChange">
<el-table-column label="活动id" align="center" prop="id" />
<el-table-column label="活动编号" align="center" prop="id" />
<el-table-column label="活动名称" align="center" prop="name" />
<el-table-column label="满足金额" align="center" prop="participationConditionMoney" >

72
fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
View File

@ -44,23 +44,15 @@
<el-table v-loading="loading" :data="activeDiscountList" @selection-change="handleSelectionChange">
<el-table-column label="活动id" align="center" prop="id" />
<el-table-column label="活动编号" align="center" prop="id" />
<el-table-column label="活动名称" align="center" prop="name" />
<el-table-column label="柴油会员等级" align="center" prop="dieselUserLevel" >
<el-table-column label="会员等级" align="center" prop="dieselUserLevel" >
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.dieselUserLevel "> V{{item}}会员 </span>
</template>
</el-table-column>
<el-table-column label="汽油会员等级" align="center" prop="gasolineUserLevel" >
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.gasolineUserLevel "> V{{item}}会员 </span>
</template>
</el-table-column>
<el-table-column label="天然气会员等级 " align="center" prop="naturalUserLevel" >
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.naturalUserLevel "> V{{item}}会员 </span>
<span v-for="(item,index) in scope.row.dieselUserLevel "> {{item}} </span>
</template>
</el-table-column>
<el-table-column label="活动状态 " align="center" prop="status" >
<template slot-scope="scope">
<span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>启用</el-tag > </span>
@ -142,45 +134,14 @@
<el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="柴油会员等级" prop="dieselUserLevel">
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="请选择柴油会员等级">
<el-option label="V1会员" value="1"></el-option>
<el-option label="V2会员" value="2"></el-option>
<el-option label="V3会员" value="3"></el-option>
<el-option label="V4会员" value="4"></el-option>
<el-option label="V5会员" value="5"></el-option>
<el-option label="V6会员" value="6"></el-option>
<el-option label="V7会员" value="7"></el-option>
<el-option label="V8会员" value="8"></el-option>
<el-option label="V9会员" value="9"></el-option>
</el-select>
</el-form-item>
<el-form-item label="汽油会员等级" prop="gasolineUserLevel">
<el-select v-model="form.gasolineUserLevel" multiple clearable placeholder="请选择汽油会员等级">
<el-option label="V1会员" value="1"></el-option>
<el-option label="V2会员" value="2"></el-option>
<el-option label="V3会员" value="3"></el-option>
<el-option label="V4会员" value="4"></el-option>
<el-option label="V5会员" value="5"></el-option>
<el-option label="V6会员" value="6"></el-option>
<el-option label="V7会员" value="7"></el-option>
<el-option label="V8会员" value="8"></el-option>
<el-option label="V9会员" value="9"></el-option>
</el-select>
</el-form-item>
<el-form-item label="天然气会员等级" prop="naturalUserLevel">
<el-select v-model="form.naturalUserLevel" multiple clearable placeholder="请选择天然气会员等级">
<el-option label="V1会员" value="1"></el-option>
<el-option label="V2会员" value="2"></el-option>
<el-option label="V3会员" value="3"></el-option>
<el-option label="V4会员" value="4"></el-option>
<el-option label="V5会员" value="5"></el-option>
<el-option label="V6会员" value="6"></el-option>
<el-option label="V7会员" value="7"></el-option>
<el-option label="V8会员" value="8"></el-option>
<el-option label="V9会员" value="9"></el-option>
<el-form-item label="请选择会员等级" prop="dieselUserLevel" >
<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>
</el-select>
</el-form-item>
<el-form-item label="参与条件" prop="participationCondition">
<el-select v-model="form.participationCondition" clearable placeholder="请选择天参与条件">
<el-option label="不限制" value="0"></el-option>
@ -215,6 +176,7 @@
<script>
import { listActiveDiscount, getActiveDiscount, delActiveDiscount, addActiveDiscount, updateActiveDiscount } from "@/api/EventMarketing/activeDiscount";
import {getActiveConsumption, getoilName, updateActiveConsumption} from "@/api/EventMarketing/activeConsumption";
import {listUserGrade} from "@/api/staff/user/usergrade";
export default {
name: "ActiveDiscount",
@ -222,6 +184,7 @@ export default {
return {
discount:'',
amount:'',
userGradeList:[],
oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#'],
// 遮罩层
loading: true,
@ -303,6 +266,7 @@ export default {
created() {
this.getList();
this.getoilName();
this.listUserGrade()
},
methods: {
/** 查询折扣营销列表 */
@ -323,6 +287,14 @@ export default {
})
},
listUserGrade(){
listUserGrade().then(res=>{
if(res.code == 200){
this.userGradeList = res.data.records
}
})
},
// 新增
addactiveDiscountChildList(){
let data = {

31
fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
View File

@ -44,23 +44,15 @@
<el-table v-loading="loading" :data="activeFullminusList" @selection-change="handleSelectionChange">
<el-table-column label="活动id" align="center" prop="id" />
<el-table-column label="活动编号" align="center" prop="id" />
<el-table-column label="活动名称" align="center" prop="name" />
<el-table-column label="柴油会员等级" align="center" prop="dieselUserLevel" >
<el-table-column label="会员等级" align="center" prop="dieselUserLevel" >
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.dieselUserLevel "> V{{item}}会员 </span>
</template>
</el-table-column>
<el-table-column label="汽油会员等级" align="center" prop="gasolineUserLevel" >
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.gasolineUserLevel "> V{{item}}会员 </span>
</template>
</el-table-column>
<el-table-column label="天然气会员等级 " align="center" prop="naturalUserLevel" >
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.naturalUserLevel "> V{{item}}会员 </span>
<span v-for="(item,index) in scope.row.dieselUserLevel "> {{item}} </span>
</template>
</el-table-column>
<el-table-column label="活动状态 " align="center" prop="status" >
<template slot-scope="scope">
<span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>启用</el-tag > </span>
@ -149,10 +141,10 @@
<el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="请选择会员等级" prop="userGraid" >
<el-checkbox-group v-model="form.adaptOil">
<el-checkbox v-for="(item,index) in userGradeList" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
</el-checkbox-group>
<el-form-item label="请选择会员等级" prop="dieselUserLevel" >
<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>
</el-select>
</el-form-item>
<el-form-item label="参与条件" prop="participationCondition">
<el-select v-model="form.participationCondition" clearable placeholder="请选择天参与条件">
@ -298,7 +290,10 @@ export default {
},
listUserGrade(){
listUserGrade().then(res=>{
this.userGradeList = res.data.records
if(res.code == 200){
this.userGradeList = res.data.records
}
})
},
// 新增

2
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -45,7 +45,7 @@
<el-table v-loading="loading" :data="activeNewlywedsList" @selection-change="handleSelectionChange">
<el-table-column label="活动id" align="center" prop="id" />
<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">
<template slot-scope="scope">

2
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -42,7 +42,7 @@
style="width: 100%">
<el-table-column
prop="id"
label="活动ID"
label="活动编号"
width="110">
</el-table-column>
<el-table-column

2
fuintCashierWeb/public/index.html
View File

@ -113,7 +113,7 @@
top: 0;
width: 51%;
height: 100%;
background: #9df1f1;
background: #409eff;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);