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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-06 15:37:49 +08:00
commit a97c077ee8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,10 +91,10 @@
<div class="sshi"> <div class="sshi">
<div class="tj-text">未使用卡量</div> <div class="tj-text">未使用卡量</div>
<el-divider></el-divider> <el-divider></el-divider>
<div class="tj-num" v-if="twolist&&twolist.length == 0 ">暂无数据...</div> <div class="tj-num" v-if="threelist&&threelist.length == 0 ">暂无数据...</div>
<div> <div>
</div> </div>
<div class="ds"v-for="(item,index) in twolist" :key="index" > <div class="ds"v-for="(item,index) in threelist" :key="index" >
<div class="tj-num"> <div class="tj-num">
<div class="one-size"> <div class="one-size">
@ -127,10 +127,10 @@
<div class="sshi"> <div class="sshi">
<div class="tj-text">已使用卡量</div> <div class="tj-text">已使用卡量</div>
<el-divider></el-divider> <el-divider></el-divider>
<div class="tj-num" v-if="threelist&&threelist.length == 0 ">暂无数据...</div> <div class="tj-num" v-if="twolist&&twolist.length == 0 ">暂无数据...</div>
<div> <div>
</div> </div>
<div class="ds"v-for="(item,index) in threelist" :key="index" > <div class="ds"v-for="(item,index) in twolist" :key="index" >
<div class="tj-num"> <div class="tj-num">
<div class="one-size"> <div class="one-size">

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

@ -327,7 +327,7 @@
activeStatus:'0' activeStatus:'0'
}, },
queryParams:{ queryParams:{
type:'柴油', type:'汽油',
oilType:'', oilType:'',
activeStatus:'', activeStatus:'',
pageNo:1, pageNo:1,