Commit aeaa3260 by zhangmeng

积分商城

parent db390f2c
<!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.a5ff52e64b683c3b25f3a7d6f44cc4a3.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.2c46d216dfb5b5181405.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.a5ff52e64b683c3b25f3a7d6f44cc4a3.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.5aeea5a4f56fb30a20af.js></script></body></html>
\ No newline at end of file
......@@ -82,6 +82,10 @@ export default {
},
},
methods:{
// 删除分组
deleteGroup(id) {
this.$tips({type:'warning',message:'TODO'})
},
async getIntegralMallProInfo() {
let res = await getIntegralMallProInfo({integralMallProId:this.$route.params.id});
if (res.errorCode === 0) {
......
......@@ -8,7 +8,10 @@
</el-form-item>
<el-form-item prop="proCategoryId" label="礼品分组">
<el-select v-model="form.proCategoryId" placeholder="请选择" class="w300">
<el-option v-for="(v,i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId"></el-option>
<el-option v-for="(v,i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId">
<span class="fl">{{v.categoryName}}</span>
<el-button class="fr" type="text" @click.stop="deleteGroup">x</el-button>
</el-option>
</el-select>
<el-button type="text" @click="createNewGroup">新建分组</el-button>
......
......@@ -68,9 +68,9 @@
<span v-if="scope.row.changeType == 3">在线发货</span>
</template>
</el-table-column>
<el-table-column label="兑换状态" align="left" prop="status" width="100px">
<el-table-column label="兑换状态" align="left" prop="status" width="120px">
<template slot-scope="scope" >
<span>{{statusFilter(scope.row.status)}}</span>
<span v-html="renderStatus(scope.row)"></span>
</template>
</el-table-column>
<el-table-column label="显示状态" align="center" prop="proShowStatus" width="120">
......@@ -140,6 +140,73 @@ export default {
this.categoryOptions.unshift({categoryName:'所有分类',integralMallCategoryId:''})
}
},
renderStatus(item) {
var _releaseType = item.releaseType ;
//上架日期
var _limit_time_begin = item.limitTimeBegin ;
//库存
var _virtual_stock = item.virtualStock ;
//兑换日期类型1:全部 2:固定日期 3:每月 4:每周
// 显示状态的优先级:已过期>无库存>定时发布>未在兑换时间
var _exchange_date_type = item.exchangeDateType ;
var dhzt_show = '正常' ;
//判断是否在兑换日期内 - 未在兑换时间
if(_exchange_date_type==2) {
if(!(new Date().getTime() >= item.exchangeFixDateBegin && new Date().getTime() <= (item.exchangeFixDateEnd + (1000*60*60*24) ))) {
dhzt_show = "未在兑换时间" ;
}
}
if(_exchange_date_type==3) {
dhzt_show = "未在兑换时间" ;
var _exchange_date_day = item.exchangeDateDay ;
var day = new Date().getDate() ;
var _arr = _exchange_date_day.split(",") ;
_arr.map(v => {
if(day == parseInt(v)) {
dhzt_show = "正常" ;
}
})
}
if(_exchange_date_type==4) {
var _exchange_date_week = item.exchangeDateWeek ;
var week = new Date().getDay() ;
if(week == 0) {
week =7 ;
}
if(_exchange_date_week.indexOf(week) == -1) {
dhzt_show = "未在兑换时间" ;
}
}
if(item.exchangeTimeType == 2 && item.exchangeTimeList && dhzt_show == '正常') {
dhzt_show = "未在兑换时间" ;
for(var k=0;k<item.exchangeTimeList.length;k++) {
var _o = item.exchangeTimeList[k] ;
var start = _o.exchangeTimeBeginNumber ;
var end = _o.exchangeTimeEndNumber ;
var _now = Date.now() ;
if(_now >= start && _now <= end) {
dhzt_show = "正常" ;
break ;
}
}
}
//定时发布
if(_releaseType == 2 && item.status==2 && new Date().getTime() < _limit_time_begin) {
dhzt_show = "定时发布<br/>" + formateDateTimeByType(new Date(_limit_time_begin),"yyyy-MM-dd hh:mm") ;
}
if(_virtual_stock<=0) {
dhzt_show = "无库存" ;
}
if(item.status==1) {
dhzt_show = "已下架" ;
}
return dhzt_show;
},
// 列表的方法
search() {
this.listParams.currentPage = 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