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

修改bug

Browse Source
This commit is contained in:
齐天大圣 2024-01-13 09:49:42 +08:00
parent f57f77d8ed
commit 7de4b95679
6 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -476,7 +476,7 @@
label="券详情"
width="100">
<template slot-scope="scope">
<span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>
<span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
</template>
</el-table-column>
<el-table-column
@ -847,7 +847,7 @@ export default {
validityZero: row.validityZero,
validityOne: row.validityOne,
validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期
giftCardTotal: 1//券数量
}

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

@ -324,7 +324,7 @@
label="券详情"
width="100">
<template slot-scope="scope">
<span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>
<span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
</template>
</el-table-column>
<el-table-column
@ -388,7 +388,7 @@
label="券详情"
width="100">
<template slot-scope="scope">
<span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>
<span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
</template>
</el-table-column>
<el-table-column
@ -752,7 +752,7 @@ export default {
validityZero: row.validityZero,
validityOne: row.validityOne,
validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期
giftCardTotal: 1//券数量
}
@ -782,7 +782,7 @@ export default {
validityZero: row.validityZero,
validityOne: row.validityOne,
validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期
giftCardTotal: 1//券数量
}

3
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -418,6 +418,9 @@ export default {
form: {},
// 表单校验
rules: {
timeType: [
{ required: true, message: '不能为空', trigger: 'change' }
],
chainStorId: [
{ required: true, message: '不能为空', trigger: 'change' }
],

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

@ -3,8 +3,7 @@
<!-- 礼品卡-->
<el-card style="margin-bottom: 20px">
<div class="top-hang">
<el-input v-model="queryParams.number" style="width: 20%;margin-right: 10px" placeholder="礼品卡号 "></el-input>
<el-input v-model="queryParams.remark" style="width: 20%;margin-right: 10px" placeholder="备注信息"></el-input>
<el-input v-model="queryParams.number" clearable style="width: 20%;margin-right: 10px" placeholder="礼品卡号 "></el-input>
<el-select v-model="queryParams.activateStatus" style="margin-right: 10px" placeholder="请选择">
<el-option
v-for="item in option"

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

@ -2,7 +2,7 @@
<div class="app-container">
<!-- 存油卡-->
<el-card style="margin-bottom: 20px">
<el-radio-group v-model="queryParams.type" @input="radiovalue">
<el-radio-group v-model="queryParams.type" @input="radiovalue(dict.label)">
<el-radio-button v-for="dict in dict.type.oil_type"
:key="dict.value"
:label="dict.label"
@ -300,6 +300,13 @@
pageNo:1,
pageSize:10,
},
queryParamss:{
type:'',
oilType:'',
activeStatus:'',
pageNo:1,
pageSize:10,
},
rules:{
oilType: [
{ required: true, message: '不能为空', trigger: 'blur' },
@ -361,13 +368,21 @@
methods:{
//
radiovalue(){
radiovalue(lable){
/*this.queryParamss.type = lable;
console.log("222222222222"+queryParamss)
getList(this.queryParamss).then(res=>{
if(res.code == 200){
this.tableData = res.data.records
this.total = res.data.total;
}
})*/
this.oilList = []
oilName(this.queryParams.type).then(res=>{
this.oilList = res.data.records
console.log('我的油站' ,res)
})
},
getlist(){
this.queryParams.pageNo=this.pageNo

2
gasStation-uni/pagesMy/Coupons/Coupons.vue
View File

@ -177,7 +177,7 @@
},
goRecharge(id, cardRecordId) {
uni.navigateTo({
url: '/pagesHome/oilRecharge/oilRecharge?id=0&cardFavorableId=' + id +
url: '/pages/refuel/refuel?id=0&cardFavorableId=' + id +
'&cardRecordId=' +
cardRecordId
})