java/PlayPai.git

			@@ -8,11 +8,11 @@
			<div class="ibox-content">
			<el-form :inline="true" :model="query">
			<el-form-item label="惠民卡名称：">
			<el-input v-model="query.name" placeholder="请输入"></el-input>
			<el-input v-model="query.huiMinName" placeholder="请输入"></el-input>
			</el-form-item>

			<el-form-item label="惠民卡类型：">
			<el-select v-model="query.type" placeholder="全部">
			<el-select v-model="query.huiMinType" placeholder="全部">
			<el-option label="全部" value=""></el-option>
			<el-option label="年度卡" value="year"></el-option>
			<el-option label="季度卡" value="quarter"></el-option>
			@@ -22,11 +22,21 @@
			<el-form-item label="有效期：">
			<el-date-picker
			v-model="query.dateRange"
			value-format="yyyy-MM-dd HH:mm:ss"
			type="daterange"
			range-separator="至"
			start-placeholder="开始日期"
			end-placeholder="结束日期">
			</el-date-picker>
			</el-form-item>

			<el-form-item label="惠民卡状态：">
			<el-select v-model="query.huiMinStatus" placeholder="全部">
			<el-option label="全部" value=""></el-option>
			<el-option label="未开始" value="1"></el-option>
			<el-option label="已开始" value="2"></el-option>
			<el-option label="已结束" value="3"></el-option>
			</el-select>
			</el-form-item>

			<el-form-item label="可售状态：">
			@@ -39,13 +49,30 @@
			</el-form>
			<div class="row">
			<div class="col-sm-12">
			<el-button type="primary" size="medium" style="background-color:#1ab394;color: #ffffff;border:#1ab394;" v-on:click="handleSearch" icon="el-icon-search">搜索</el-button>
			<el-button type="primary" size="medium" style="background-color:#1ab394;color: #ffffff;border:#1ab394;" v-on:click="handleAdd" icon="el-icon-circle-plus-outline">添加</el-button>
			<el-button type="primary" size="medium" style="background-color:#1ab394;color: #ffffff;border:#1ab394;" v-on:click="handleEdit" icon="el-icon-edit">编辑</el-button>
			<el-button type="primary" size="medium" style="background-color:#1ab394;color: #ffffff;border:#1ab394;" v-on:click="handleDelete" icon="el-icon-delete">删除</el-button>
			<el-button type="primary" size="medium" style="background-color:#1ab394;color: #ffffff;border:#1ab394;" v-on:click="handleShelves(1)" icon="el-icon-upload2">上架</el-button>
			<el-button type="primary" size="medium" style="background-color:#1ab394;color: #ffffff;border:#1ab394;" v-on:click="handleShelves(2)" icon="el-icon-download">下架</el-button>
			<el-button type="primary" size="medium" style="background-color:#1ab394;color: #ffffff;border:#1ab394;" v-on:click="handleViewDetail" icon="el-icon-tickets">查看详情</el-button>
			<button type="button" class="btn btn-primary" v-on:click="handleSearch">
			<i class="fa fa-search"></i>
			搜索
			</button>
			<button type="button" class="btn btn-primary" v-on:click="handleAdd">
			<i class="fa fa-plus"></i>
			添加
			</button>
			<button type="button" class="btn btn-primary" v-on:click="handleEdit">
			<i class="fa fa-edit"></i>
			编辑
			</button>
			<button type="button" class="btn btn-primary" v-on:click="handleDelete">
			<i class="fa fa-remove"></i>
			删除
			</button>
			<button type="button" class="btn btn-primary" v-on:click="handleShelves(1)">
			<i class="fa fa-check"></i>
			上架
			</button>
			<button type="button" class="btn btn-primary" v-on:click="handleShelves(2)">
			<i class="fa fa-remove"></i>
			下架
			</button>
			</div>
			</div>
			<el-table
			@@ -91,9 +118,9 @@
			<el-table-column prop="sort" label="排序"></el-table-column>
			<el-table-column prop="flag" label="活动状态" >
			<template slot-scope="scope">
			<span v-if="scope.row.flag === 1">未开始</span>
			<span v-else-if="scope.row.flag === 2">已开始</span>
			<span v-else-if="scope.row.flag === 3">已结束</span>
			<span v-if="scope.row.huiMinStatus === 1">未开始</span>
			<span v-else-if="scope.row.huiMinStatus === 2">已开始</span>
			<span v-else-if="scope.row.huiMinStatus === 3">已结束</span>
			<span v-else>未知类型</span>
			</template>
			</el-table-column>