Skip to content

I
integral-mall
Commit 1a3e9aff by zhangmeng
Options

bug

parent 30ae1c49
Showing with 199 additions and 196 deletions
dist.zip
No preview for this file type
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.1a875b355f7fb3a51b80b92040f6b7df.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.468b1a0927c2f59e9881.js></script><script type=text/javascript src=/integral-mall/static/js/app.9d0049f43b425982d328.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.a38e4bbf9889d2cf2a9ea15932463f01.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.468b1a0927c2f59e9881.js></script><script type=text/javascript src=/integral-mall/static/js/app.f58ac01fbf6ca6005eca.js></script></body></html>
\ No newline at end of file
dist/static/js/app.9d0049f43b425982d328.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.f58ac01fbf6ca6005eca.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/base/index.scss
@import './reset.scss';
@import '../components/index.scss';
#app .footlogo {
position: relative;
// padding:0;
position: relative;
// padding:0;
}
#app .dm-wrap{
margin:24px;
background:#FFF;
padding:24px;
// min-height: 500px;
#app .dm-wrap {
margin: 24px;
background: #FFF;
padding: 24px;
// min-height: 500px;
}
#app .dm-form__wrap{
margin:24px;
background:#FFF;
padding:20px 32px;
// min-height: 500px;
#app .dm-form__wrap {
margin: 24px;
background: #FFF;
padding: 20px 32px;
// min-height: 500px;
}
.sms-table_info{
&>img {
width: 60px;
height: 60px;
.sms-table_info {
&>img {
width: 60px;
height: 60px;
}
}
.bottom-border{
border-bottom: 1px solid #DCDFE6;
.bottom-border {
border-bottom: 1px solid #DCDFE6;
}
.dm-title__label {
border-bottom: 1px solid #DCDFE6;
width: calc(100% + 32px);
padding: 0 0 20px 32px;
font-size: 16px;
font-weight: 700;
margin: 0 0 20px -32px;
border-bottom: 1px solid #DCDFE6;
width: calc(100% + 32px);
padding: 0 0 20px 32px;
font-size: 16px;
font-weight: 700;
margin: 0 0 20px -32px;
}
.dm-title__label--outer {
border-bottom: 1px solid #DCDFE6;
width: calc(100% + 24px);
padding: 0 0 20px 24px;
font-size: 16px;
font-weight: 700;
margin: 0 0 20px -24px;
border-bottom: 1px solid #DCDFE6;
width: calc(100% + 24px);
padding: 0 0 20px 24px;
font-size: 16px;
font-weight: 700;
margin: 0 0 20px -24px;
}
.gic-people--button {
background: #f2f3f4;
padding: 0px 0px 20px 124px;
.el-button+.el-button {
margin-left: 5px;
}
}
.gic-people--button{
background: #f2f3f4;
padding: 0px 0px 20px 124px;
.el-button+.el-button {
margin-left: 5px;
}
}
.filter--box {
background: #ebeef5;
height: 50px;
line-height: 50px;
.el-checkbox{
background: #fff;
}
.el-checkbox.is-bordered+.el-checkbox.is-bordered {
margin-left: 0;
}
}
.no-link{
.el-breadcrumb__inner {
font-weight: 400!important;
cursor: text!important;
color: #606266!important;
}
background: #ebeef5;
height: 50px;
line-height: 50px;
.el-checkbox {
background: #fff;
}
.el-checkbox.is-bordered+.el-checkbox.is-bordered {
margin-left: 0;
}
}
.no-link {
.el-breadcrumb__inner {
font-weight: 400!important;
cursor: text!important;
color: #606266!important;
}
}
::-webkit-scrollbar-track-piece {
background-color: #f0f2f5;
-webkit-border-radius: 6px;
background-color: #f0f2f5;
-webkit-border-radius: 6px;
}
::-webkit-scrollbar-button{
background-color:#e4e7ed;
::-webkit-scrollbar-button {
background-color: #e4e7ed;
}
.select-shop__tag {
margin-bottom: 5px;
margin-bottom: 5px;
}
.select-shop__tag + .select-shop__tag {
.select-shop__tag+.select-shop__tag {
margin-left: 10px;
}
.chart--nodata {
width: auto;
text-align: center;
&::before {
content: ' ';
display: block;
width: 200px;
height: 200px;
background: url(/integral-mall/static/img/chart-no-data.png) no-repeat center;
background-size: cover;
margin: 20px auto 10px auto;
}
&::after {
content: '暂无数据';
color: #808995;
margin: 0 auto;
text-align:center;
font-size:13px;
display: block;
margin-bottom: 60px;
}
width: auto;
text-align: center;
&::before {
content: ' ';
display: block;
width: 200px;
height: 200px;
background: url(/integral-mall/static/img/chart-no-data.png) no-repeat center;
background-size: cover;
margin: 20px auto 10px auto;
}
&::after {
content: '暂无数据';
color: #808995;
margin: 0 auto;
text-align: center;
font-size: 13px;
display: block;
margin-bottom: 60px;
}
}
.no-data {
width: auto;
text-align: center;
width: auto;
text-align: center;
}
.leftBar-wrap .el-menu{
background-color: #020b21;
.leftBar-wrap .el-menu {
background-color: #020b21;
}
.table__avatar{
width: 60px;
height: 60px;
border-radius: 4px;
margin-right:8px;
.table__avatar {
width: 60px;
height: 60px;
border-radius: 4px;
margin-right: 8px;
display: inline-block;
}
.fw500 {
font-weight: 500;
font-weight: 500;
}
.dm-button--add {
width: 100%;
height: 40px;
line-height: 40px;
border: 1px dashed #e4e7ed;
border-radius: 2px;
text-align: center;
margin:10px 0;
cursor: pointer;
&:hover{
border: 1px dashed #1890ff;
color:#1890ff;
}
}
.sync-imgtext__dialog{
.el-dialog__body{
padding:0 20px 30px;
}
}
.dialog__body__nopadding {
.el-dialog__body{
padding:0 20px 30px;
}
width: 100%;
height: 40px;
line-height: 40px;
border: 1px dashed #e4e7ed;
border-radius: 2px;
text-align: center;
margin: 10px 0;
cursor: pointer;
&:hover {
border: 1px dashed #1890ff;
color: #1890ff;
}
}
.table-name--ellipsis{
width: 90px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
white-space: normal;
.sync-imgtext__dialog {
.el-dialog__body {
padding: 0 20px 30px;
}
}
.dialog__body__nopadding {
.el-dialog__body {
padding: 0 20px 30px;
}
}
.table-name--ellipsis {
width: 90px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
white-space: normal;
}
.left-aside-contain {
/deep/ .el-submenu__title:hover {
background-color: #020b21;
}
/deep/ .el-submenu__title:hover {
background-color: #020b21;
}
}
.el-menu.el-menu--popup {
background: #020b21;
border-radius: 4px;
}
/* 左侧菜单 */
.leftBar-wrap .el-menu{
background-color: #020b21;
.leftBar-wrap .el-menu {
background-color: #020b21;
}
.leftBar-wrap .cardmenu-item .el-submenu__title,.leftBar-wrap .cardmenu-item .el-menu-item,.leftBar-wrap .cardmenu-item .el-submenu .el-menu-item{
height: 40px;
line-height: 40px;
.leftBar-wrap .cardmenu-item .el-submenu__title,
.leftBar-wrap .cardmenu-item .el-menu-item,
.leftBar-wrap .cardmenu-item .el-submenu .el-menu-item {
height: 40px;
line-height: 40px;
}
.leftBar-wrap .el-submenu__title:hover {
background-color: #020b21;
background-color: #020b21;
}
.leftBar-wrap .cardmenu-item li.el-menu-item:hover i{
/*background-color: #409EFF;*/
color: #fff;
.leftBar-wrap .cardmenu-item li.el-menu-item:hover i {
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-menu-item:hover span{
/*background-color: #409EFF;*/
color: #fff;
.leftBar-wrap .cardmenu-item li.el-menu-item:hover span {
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu:hover i{
/*background-color: #409EFF;*/
color: #fff;
.leftBar-wrap .cardmenu-item li.el-submenu:hover i {
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu:hover span{
/*background-color: #409EFF;*/
color: #fff;
.leftBar-wrap .cardmenu-item li.el-submenu:hover span {
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label{
/*background-color: #409EFF;*/
color: #fff;
cursor: pointer;
.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label {
/*background-color: #409EFF;*/
color: #fff;
cursor: pointer;
}
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title i{
color: #fff;
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title i {
color: #fff;
}
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title span{
color: #fff;
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title span {
color: #fff;
}
.el-menu.el-menu--popup .el-menu-item.is-active label {
color: #fff;
}
color: #fff;
}
\ No newline at end of file
src/views/mall/coupon/list.vue
......@@ -157,8 +157,8 @@ export default {
return dhzt_show;
},
renderShowStatus(item) {
//商品显示状态 1:上架状态就显示 2:兑换状态下显示
var dhzt_show = this.renderStatus(item);
//商品显示状态 1:上架状态就显示 2:兑换状态下显示
var dhzt_show = this.renderStatus(item);
var pro_show_status = item.proShowStatus ;
var proShowStatus = "不显示" ;
// var mall_show_status = "mall_show_no" ;
......
src/views/mall/gift/list.vue
......@@ -95,13 +95,10 @@ import { getPageGiftList, getCategoryList, deleteProService ,setHotStatusService
import updateCount from '../common/update-count';
import {formateDateTimeByType} from '@/utils/index.js';
export default {
name: 'coupon-list',
name: 'gift-list',
components: {
updateCount
},
computed:{
},
data () {
return {
defaultAvatar:require('../../../assets/img/head_default.png'),
......@@ -208,15 +205,13 @@ export default {
return dhzt_show;
},
renderShowStatus(item) {
//商品显示状态 1:上架状态就显示 2:兑换状态下显示
var dhzt_show = this.renderStatus(item);
//商品显示状态 1:上架状态就显示 2:兑换状态下显示
var dhzt_show = this.renderStatus(item);
var pro_show_status = item.proShowStatus ;
var proShowStatus = "不显示" ;
// var mall_show_status = "mall_show_no" ;
if(item.status==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=='无库存'))) ) {
proShowStatus = "显示" ;
// mall_show_status = "mall_show_ok" ;
}
}
return proShowStatus;
......@@ -228,26 +223,30 @@ export default {
this.getPageGiftList();
},
handleSizeChange(val) {
this.listParams.pageSize = val;
this.getPageGiftList();
this.listParams.pageSize = val;
this.getPageGiftList();
},
handleCurrentChange(val) {
this.listParams.currentPage = val;
this.getPageGiftList();
this.listParams.currentPage = val;
this.getPageGiftList();
},
async getPageGiftList() {
this.loading = true;
let res = await getPageGiftList(this.listParams);
this.tableList = [];
let result = res.result.rows || [];
result.map(v => {
v.integralCostFlag = false;
v.cashCostFlag = false;
v.virtualStockFlag = false;
v.allExchangeNumberFlag = false;
this.tableList.push(v);
})
this.total = res.result.total;
try {
let res = await getPageGiftList(this.listParams);
this.tableList = [];
let result = res.result.rows || [];
result.map(v => {
v.integralCostFlag = false;
v.cashCostFlag = false;
v.virtualStockFlag = false;
v.allExchangeNumberFlag = false;
this.tableList.push(v);
})
this.total = res.result.total;
} catch(err) {
this.$tips({type:'warning',message:'加载列表失败'});
}
this.loading = false;
},
// 删除
......@@ -276,19 +275,9 @@ export default {
this.getPageGiftList();
}).catch(err => {
this.getPageGiftList();
console.log(err)
this.$tips({type: 'error',message: '删除失败!'});
})
},
statusFilter(val) {
let result = '--';
this.releaseTypeOptions.map(v => {
if (v.value === val) {
result = v.label;
}
});
return result;
},
//列表 排序
sortList(obj) {
this.listParams.sortColumn = obj.prop;
......
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