Skip to content

I
integral-mall
Commit f04ea474 by zhangmeng
Options

修复bug

parent 85c35c55
Showing with 38 additions and 18 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.666b41302a48f2391024def3e10cee17.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.567b5be279b1403c5cc7.js></script><script type=text/javascript src=/integral-mall/static/js/app.92be8ce46f1447df154d.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.666b41302a48f2391024def3e10cee17.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.567b5be279b1403c5cc7.js></script><script type=text/javascript src=/integral-mall/static/js/app.d6b6ad5554f214c2a1f7.js></script></body></html>
\ No newline at end of file
dist/static/js/app.92be8ce46f1447df154d.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.d6b6ad5554f214c2a1f7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/mall/gift/exchange.vue
......@@ -5,7 +5,10 @@
<el-select class="vertical-middle w150" v-model="listParams.status" placeholder="选择状态" @change="getPageExchangeLogsList">
<el-option v-for="v in statusOptions" :key="v.value" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.memberInfo" class="w300" placeholder="输入流水号/姓名/会员卡号" clearable @change="getPageExchangeLogsList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-select v-if="isWxExchange" class="vertical-middle w150" v-model="listParams.useStatus" placeholder="选择状态" @change="getPageExchangeLogsList">
<el-option v-for="v in useStatusOptions" :key="v.value" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.memberInfo" class="w300" :placeholder="isWxExchange?'输入姓名/昵称/手机号':'输入流水号/姓名/会员卡号'" clearable @change="getPageExchangeLogsList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button type="primary" class="fr" icon="iconfont icon-icon_yunxiazai fz14" @click="exportExcel"> 导出列表</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%">
......@@ -15,17 +18,23 @@
<span v-else>{{scope.row[v.prop]}}</span>
</template>
</el-table-column>
<el-table-column label="使用状态" align="left" width="100px">
<el-table-column label="领取状态" align="left" width="100px" prop="status" v-if="isWxExchange">
<template slot-scope="scope">
<span>{{scope.row.status === 1?'未领取':'已领取'}}</span>
</template>
</el-table-column>'
<el-table-column :label="isWxExchange?'使用状态':'状态'" align="left" width="100px">
<template slot-scope="scope">
<p v-if="isWxExchange">
<span type="text">{{scope.row.useStatus === 5?'已使用':'未使用'}}</span>
<p>
<span v-if="isWxExchange" type="text">{{scope.row.useStatus === 5?'已使用':'未使用'}}</span>
<span v-else type="text">{{filterStatus(scope.row.status)}}</span>
</p>
<p>
<el-button type="text" v-if="scope.row.status !== 1 && !isWxExchange" @click="queryExpress(scope.row)">查看物流</el-button>
<el-button type="text" v-else-if="isWxExchange">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId">查看详情</a>
<el-button type="text" v-else-if="scope.row.useStatus === 5 && isWxExchange">
<a target="_blank" :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId">查看详情</a>
</el-button>
<span type="text" v-else>--</span>
</p>
</template>
</el-table-column>
......@@ -62,17 +71,11 @@ import express from '../common/express';
</div>
</a>`;
}},
{label:'消耗积分',prop:'unitCostIntegral',width:'80',align:'left'},
{label:'领取状态',prop:'status',width:'100',align:'left',formatter(row){
if (_vm.isWxExchange) {
return row.status === 1?'待领取':'已领取';
} else {
return row.status === 1?'待发货':'已发货';
}
}},
{label:'消耗积分',prop:'unitCostIntegral',width:'80',align:'left'}
],
total:0,
statusOptions:[{label:'所有状态',value:-1},{label:'待发货',value:1},{label:'已发货',value:3}],
statusOptions:[],
useStatusOptions:[{label:'所有使用状态',value:-1},{label:'已使用',value:1},{label:'未使用',value:2}],
listParams:{
pageSize: 20,
currentPage: 1,
......@@ -92,13 +95,30 @@ import express from '../common/express';
},
created() {
if (this.isWxExchange) {
this.statusOptions = [{label:'所有领取状态',value:-1},{label:'未领取',value:1},{label:'已领取',value:2}];
this.$store.commit('mutations_breadcrumb',[{name:'积分商城'},{name:'礼品',path:'/gift'},{name:'微信兑换券兑换记录',path:''}]);
} else {
this.statusOptions = [{label:'所有状态',value:-1},{label:'待发货',value:1},{label:'已发货',value:3}];
this.$store.commit('mutations_breadcrumb',[{name:'积分商城'},{name:'礼品',path:'/gift'},{name:'礼品兑换记录',path:''}]);
}
this.getPageExchangeLogsList();
},
methods: {
filterStatus(status) {
let result = '--';
switch(status) {
case 0:
result = '已取消';
break;
case 1:
result = '待发货';
break;
case 3:
result = '已发货';
break;
}
return result;
},
handleSizeChange(val) {
this.listParams.pageSize = val;
this.getPageExchangeLogsList();
......
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