Commit 8b6dd601 authored by Mac's avatar Mac

1

parent e142f6f6
...@@ -18,18 +18,7 @@ ...@@ -18,18 +18,7 @@
</el-input> </el-input>
<span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span> <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div> </div>
<!-- <div class="searchInput" style="width:250px">--> <span style="margin-left:15px">用户:</span>
<!-- <el-input style="display:inline-block;width:225px;height:30px"-->
<!-- placeholder="请输入用户ID"-->
<!-- v-model="msg.UserId"-->
<!-- size="small"-->
<!-- @clear="getList"-->
<!-- @keyup.enter.native="getList"-->
<!-- clearable>-->
<!-- </el-input>-->
<!-- <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>-->
<!-- </div>-->
<span style="margin-left:15px">状态:</span>
<el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable @change="getList" <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable @change="getList"
placeholder="请选择"> placeholder="请选择">
<el-option label="不限" :value="0"></el-option> <el-option label="不限" :value="0"></el-option>
...@@ -95,6 +84,16 @@ ...@@ -95,6 +84,16 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="Name"
label="奖品信息">
<template slot-scope="scope">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.PrizeImage + ')',backgroundSize:'cover'}"></div>
<div flex="dir:left cross:center">
{{scope.row.PrizeName}}
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="Type" prop="Type"
label="状态"> label="状态">
...@@ -126,13 +125,13 @@ ...@@ -126,13 +125,13 @@
prop="CreateDate"> prop="CreateDate">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="中奖订单" <!-- label="中奖订单"-->
prop="RangeType" width="300"> <!-- prop="RangeType" width="300">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span style="font-size: 12px;color: #409EFF" v-for="(x,y) in scope.row.OrderList" :key="y">{{x.OrderId}}{{y+1==scope.row.OrderList.length?'':'、'}}</span> <!-- <span style="font-size: 12px;color: #409EFF" v-for="(x,y) in scope.row.OrderList" :key="y">{{x.OrderId}}{{y+1==scope.row.OrderList.length?'':'、'}}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
...@@ -141,9 +140,11 @@ ...@@ -141,9 +140,11 @@
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="查看中奖订单" placement="top" >
<img src="../../assets/img/userman/detail.png" alt="" class="imgstyle" @click="see(scope.row)" >
</el-tooltip>
<el-tooltip class="item" effect="dark" content="兑换" placement="top" v-if="scope.row.State==1"> <el-tooltip class="item" effect="dark" content="兑换" placement="top" v-if="scope.row.State==1">
<img src="../../assets/img/userman/pass.png" alt="" class="imgstyle" @click="grant(scope.row,1)" v-if="scope.row.State==1"> <img src="../../assets/img/userman/duihuan.png" alt="" class="imgstyle" @click="grant(scope.row,1)" v-if="scope.row.State==1">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="失效" placement="top" v-if="scope.row.State==1"> <el-tooltip class="item" effect="dark" content="失效" placement="top" v-if="scope.row.State==1">
<img src="../../assets/img/userman/nopass.png" alt="" class="imgstyle" @click="grant(scope.row,2)" v-if="scope.row.State==1"> <img src="../../assets/img/userman/nopass.png" alt="" class="imgstyle" @click="grant(scope.row,2)" v-if="scope.row.State==1">
...@@ -160,6 +161,17 @@ ...@@ -160,6 +161,17 @@
:total="count"> :total="count">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog
title="中奖订单"
:visible.sync="dialogVisible"
width="30%"
>
<span style="font-size: 12px;color: #409EFF" v-for="(x,y) in detail" :key="y">{{x.OrderNo}}{{y+1==detail.length?'':'、'}}</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -189,6 +201,8 @@ ...@@ -189,6 +201,8 @@
Id: 0, Id: 0,
Moblie: '' Moblie: ''
}, },
detail:[],
dialogVisible:false
} }
}, },
created(){ created(){
...@@ -246,6 +260,10 @@ ...@@ -246,6 +260,10 @@
); );
}); });
}, },
see(row){
this.detail = row.OrderList;
this.dialogVisible = true
},
getList(){ getList(){
this.msg.pageIndex = 1 this.msg.pageIndex = 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment