记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 467f9676 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

parents 6cb6c0bf b70ac307
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/topBanner.html
View file @ 467f9676
...@@ -104,6 +104,9 @@ ...@@ -104,6 +104,9 @@
.iptOrSelect { .iptOrSelect {
flex: 1; flex: 1;
} }
#activeTags {
display: none;
}
</style> </style>
</head> </head>
<body> <body>
...@@ -136,6 +139,9 @@ ...@@ -136,6 +139,9 @@
<button type="button" class="btn btn-warning" style="margin-right: 12px;" onclick="addItem(0)">添加banner</button> <button type="button" class="btn btn-warning" style="margin-right: 12px;" onclick="addItem(0)">添加banner</button>
<span id="tall">(最多允许添加10张图，宽度为764像素，高度为1018像素)</span> <span id="tall">(最多允许添加10张图，宽度为764像素，高度为1018像素)</span>
</div> </div>
<div id="activeTags" class="tags">
<span id="tall">(请上传宽度为382像素的图片！)</span>
</div>
</div> </div>
<div id="bannerList" class="banner_list"> <div id="bannerList" class="banner_list">
...@@ -186,10 +192,11 @@ ...@@ -186,10 +192,11 @@
if (type == 2) { if (type == 2) {
$("#tall").html(''); $("#tall").html('');
$("#tags").hide(); $("#tags").hide();
$("#showMiddleBanner").show(); $("#activeTags").show();
} else { } else {
type = 1 type = 1
$("#tags").show();
$("#activeTags").hide();
} }
let data = { let data = {
type type
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql
View file @ 467f9676
...@@ -767,6 +767,7 @@ create table goblin_shopping_cart ...@@ -767,6 +767,7 @@ create table goblin_shopping_cart
number int default 0 comment '数量', number int default 0 comment '数量',
marketing_id varchar(64) default '' comment '默认的营销id[活动id]', marketing_id varchar(64) default '' comment '默认的营销id[活动id]',
del_tag int default 0 comment '删除标记[0-未删除|1-已删除]', del_tag int default 0 comment '删除标记[0-未删除|1-已删除]',
type varchar(200) default '' comment 'type前端传的',
created_at datetime, created_at datetime,
updated_at datetime, updated_at datetime,
comment text, comment text,
......
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