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 09:15:04 +08:00
commit 2d3c930650
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,12 +11,12 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态"> <!-- <el-form-item label="状态">-->
<el-select v-model="queryParams.status" clearable placeholder="请选择活动状态"> <!-- <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">-->
<el-option label="启用" value="0"></el-option> <!-- <el-option label="启用" value="0"></el-option>-->
<el-option label="禁用" value="1"></el-option> <!-- <el-option label="禁用" value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="上线/下线"> <el-form-item label="上线/下线">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否上线"> <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否上线">
<el-option label="上线" value="0"></el-option> <el-option label="上线" value="0"></el-option>
@ -99,8 +99,8 @@
<el-table-column label="活动状态" align="center" prop="status" > <el-table-column label="活动状态" align="center" prop="status" >
<template slot-scope="scope"> <template slot-scope="scope">
<span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>启用</el-tag > </span> <span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>上线</el-tag > </span>
<span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">禁用</el-tag> </span> <span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">已下线</el-tag> </span>
</template> </template>
</el-table-column> </el-table-column>

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

@ -10,12 +10,12 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态"> <!-- <el-form-item label="状态">-->
<el-select v-model="queryParams.status" clearable placeholder="请选择活动状态"> <!-- <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">-->
<el-option label="启用" value="0"></el-option> <!-- <el-option label="启用" value="0"></el-option>-->
<el-option label="禁用" value="1"></el-option> <!-- <el-option label="禁用" value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="是否在线" prop="isonline"> <el-form-item label="是否在线" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线"> <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
<el-option label="在线" value="0"></el-option> <el-option label="在线" value="0"></el-option>
@ -81,8 +81,8 @@
<el-table-column label="活动状态 " align="center" prop="status" > <el-table-column label="活动状态 " align="center" prop="status" >
<template slot-scope="scope"> <template slot-scope="scope">
<span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>启用</el-tag > </span> <span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>在线</el-tag > </span>
<span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">禁用</el-tag> </span> <span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">下线</el-tag> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="活动时间" align="center" prop="adaptUserType" > <el-table-column label="活动时间" align="center" prop="adaptUserType" >

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

@ -10,12 +10,12 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态"> <!-- <el-form-item label="状态">-->
<el-select v-model="queryParams.status" clearable placeholder="请选择活动状态"> <!-- <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">-->
<el-option label="启用" value="0"></el-option> <!-- <el-option label="启用" value="0"></el-option>-->
<el-option label="禁用" value="1"></el-option> <!-- <el-option label="禁用" value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="是否在线" prop="isonline"> <el-form-item label="是否在线" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线"> <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
<el-option label="在线" value="0"></el-option> <el-option label="在线" value="0"></el-option>
@ -73,8 +73,8 @@
</el-table-column> </el-table-column>
<el-table-column label="活动状态 " align="center" prop="status" > <el-table-column label="活动状态 " align="center" prop="status" >
<template slot-scope="scope"> <template slot-scope="scope">
<span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>启用</el-tag > </span> <span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>在线</el-tag > </span>
<span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">禁用</el-tag> </span> <span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">下线</el-tag> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="活动时间" align="center" prop="adaptUserType" > <el-table-column label="活动时间" align="center" prop="adaptUserType" >