Skip to content

I
integral-mall
Commit f40a154d by damodmg
Options

调整bug

parent aa38ccdf
Showing with 30 additions and 16 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.84b3c9128e17b961834dadc04a29a1e8.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.1d87220f45614803533c.js></script><script type=text/javascript src=/integral-mall/static/js/app.2a0ec541fa8773e957c8.js></script></body></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.84b3c9128e17b961834dadc04a29a1e8.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.1d87220f45614803533c.js></script><script type=text/javascript src=/integral-mall/static/js/app.98a1e814b5694c054da4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/app.2a0ec541fa8773e957c8.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.98a1e814b5694c054da4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/mall/coupon/list.vue
...@@ -105,6 +105,7 @@ export default { ...@@ -105,6 +105,7 @@ export default {
return (val === 0 ? this.daijinAvatar : (val === 1 ? this.zhekouAvatar: this.duihuanAvatar)); return (val === 0 ? this.daijinAvatar : (val === 1 ? this.zhekouAvatar: this.duihuanAvatar));
}, },
renderStatus(item) { renderStatus(item) {
var _releaseType = item.releaseType ; var _releaseType = item.releaseType ;
//上架日期 //上架日期
var _limit_time_begin = item.limitTimeBegin ; var _limit_time_begin = item.limitTimeBegin ;
...@@ -116,11 +117,19 @@ export default { ...@@ -116,11 +117,19 @@ export default {
var dhzt_show_html ='<span class="dm-status--primary">正常</span>' var dhzt_show_html ='<span class="dm-status--primary">正常</span>'
var dhzt_show = '正常'; var dhzt_show = '正常';
//判断是否在兑换日期内 - 未在兑换时间 //判断是否在兑换日期内 - 未在兑换时间
if(_exchange_date_type==2) { if(_virtual_stock<=0) {
if(!(new Date().getTime() >= item.exchangeFixDateBegin && new Date().getTime() <= (item.exchangeFixDateEnd + (1000*60*60*24) ))) { dhzt_show_html = '<span class="dm-status--error">无库存</span>';
dhzt_show = "无库存" ;
}
if(_exchange_date_type==2) {//exchangeDateType 1:全部 2:固定日期 3:每月 4:每周
// console.log(item.cardName,!(new Date().getTime() >= item.exchangeFixDateBegin && new Date().getTime() <= (item.exchangeFixDateEnd + (1000*60*60*24) )))
// console.log(item.cardName,new Date().getTime(),item.exchangeFixDateBegin,item.exchangeFixDateEnd)
if(!((new Date().getTime() >= item.exchangeFixDateBegin && new Date().getTime() <= (item.exchangeFixDateEnd + (1000*60*60*24) )))) {
dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>'; dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>';
dhzt_show = '未在兑换时间'; dhzt_show = '未在兑换时间';
} }
} }
if(_exchange_date_type==3) { if(_exchange_date_type==3) {
dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>'; dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>';
...@@ -147,10 +156,12 @@ export default { ...@@ -147,10 +156,12 @@ export default {
dhzt_show = '未在兑换时间'; dhzt_show = '未在兑换时间';
} }
} }
//exchangeTimeType 兑换时间类型 1:全部 2:部分时段
if(item.exchangeTimeType == 2 && item.exchangeTimeList && dhzt_show == '正常') { console.log('兑换时间类型'+item.cardName,item.exchangeTimeType==2, item.exchangeTimeList , dhzt_show )
if(item.exchangeTimeType == 2 && item.exchangeTimeList && (dhzt_show == '无库存'||dhzt_show == '正常')) {
dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>'; dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>';
dhzt_show = '未在兑换时间'; dhzt_show = '未在兑换时间';
console.log('时间类型',item.exchangeTimeList)
for(var k=0;k<item.exchangeTimeList.length;k++) { for(var k=0;k<item.exchangeTimeList.length;k++) {
var _o = item.exchangeTimeList[k] ; var _o = item.exchangeTimeList[k] ;
var start = _o.exchangeTimeBeginNumber ; var start = _o.exchangeTimeBeginNumber ;
...@@ -170,10 +181,7 @@ export default { ...@@ -170,10 +181,7 @@ export default {
dhzt_show = '定时发布'; dhzt_show = '定时发布';
} }
if(_virtual_stock<=0) {
dhzt_show_html = '<span class="dm-status--error">无库存</span>';
dhzt_show = "无库存" ;
}
if(item.status==1) { if(item.status==1) {
dhzt_show_html = '<span class="dm-status--info">已下架</span>'; dhzt_show_html = '<span class="dm-status--info">已下架</span>';
...@@ -191,7 +199,7 @@ export default { ...@@ -191,7 +199,7 @@ export default {
var pro_show_status = item.proShowStatus ; var pro_show_status = item.proShowStatus ;
var proShowStatus = "不显示" ; var proShowStatus = "不显示" ;
// var mall_show_status = "mall_show_no" ; // var mall_show_status = "mall_show_no" ;
if(item.status==2) { if(item.status==2) {//releaseType 1正常(下架) 0删除 2上架
if((item.releaseType==1 || (item.releaseType == 2 && new Date().getTime() >= (item.limitTimeBegin || 0)) ) && ( pro_show_status==1 || (pro_show_status==2 && (dhzt_show=="正常" || dhzt_show=='无库存'))) ) { if((item.releaseType==1 || (item.releaseType == 2 && new Date().getTime() >= (item.limitTimeBegin || 0)) ) && ( pro_show_status==1 || (pro_show_status==2 && (dhzt_show=="正常" || dhzt_show=='无库存'))) ) {
proShowStatus = "显示" ; proShowStatus = "显示" ;
// mall_show_status = "mall_show_ok" ; // mall_show_status = "mall_show_ok" ;
......
src/views/mall/gift/list.vue
...@@ -166,10 +166,18 @@ export default { ...@@ -166,10 +166,18 @@ export default {
var dhzt_show_html ='<span class="dm-status--primary">正常</span>' var dhzt_show_html ='<span class="dm-status--primary">正常</span>'
var dhzt_show = '正常'; var dhzt_show = '正常';
//判断是否在兑换日期内 - 未在兑换时间 //判断是否在兑换日期内 - 未在兑换时间
if(_virtual_stock<=0) {
dhzt_show_html = '<span class="dm-status--error">无库存</span>';
dhzt_show = "无库存" ;
}
if(_exchange_date_type==2) { if(_exchange_date_type==2) {
if(!(new Date().getTime() >= item.exchangeFixDateBegin && new Date().getTime() <= (item.exchangeFixDateEnd + (1000*60*60*24) ))) { if(!(new Date().getTime() >= item.exchangeFixDateBegin && new Date().getTime() <= (item.exchangeFixDateEnd + (1000*60*60*24) ))) {
dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>'; dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>';
dhzt_show = '未在兑换时间'; dhzt_show = '未在兑换时间';
return {
text:dhzt_show,
html:dhzt_show_html
};
} }
} }
if(_exchange_date_type==3) { if(_exchange_date_type==3) {
...@@ -198,7 +206,7 @@ export default { ...@@ -198,7 +206,7 @@ export default {
} }
} }
if(item.exchangeTimeType == 2 && item.exchangeTimeList && dhzt_show == '正常') { if(item.exchangeTimeType == 2 && item.exchangeTimeList && (dhzt_show == '无库存'||dhzt_show == '正常')) {
dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>'; dhzt_show_html = '<span class="dm-status--warning">未在兑换时间</span>';
dhzt_show = '未在兑换时间'; dhzt_show = '未在兑换时间';
for(var k=0;k<item.exchangeTimeList.length;k++) { for(var k=0;k<item.exchangeTimeList.length;k++) {
...@@ -220,10 +228,7 @@ export default { ...@@ -220,10 +228,7 @@ export default {
dhzt_show = '定时发布'; dhzt_show = '定时发布';
} }
if(_virtual_stock<=0) {
dhzt_show_html = '<span class="dm-status--error">无库存</span>';
dhzt_show = "无库存" ;
}
if(item.status==1) { if(item.status==1) {
dhzt_show_html = '<span class="dm-status--info">已下架</span>'; dhzt_show_html = '<span class="dm-status--info">已下架</span>';
...@@ -244,6 +249,7 @@ export default { ...@@ -244,6 +249,7 @@ export default {
proShowStatus = "显示" ; proShowStatus = "显示" ;
} }
} }
console.log('显示状态',proShowStatus)
return proShowStatus; return proShowStatus;
}, },
......
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