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

Skip to content

L
liquidnet-bus-v1
Commit c7f1fdaf authored by dongchun's avatar dongchun
Browse files
Options

修改标签库

parent 369602d2
Hide whitespace changes
Inline Side-by-side
Showing with 331 additions and 21 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfTagController.java
View file @ c7f1fdaf
...@@ -101,7 +101,7 @@ public class GoblinSelfTagController extends BaseController { ...@@ -101,7 +101,7 @@ public class GoblinSelfTagController extends BaseController {
selfTag.setTagName(tagName); selfTag.setTagName(tagName);
selfTag.setTagPic(tagPic); selfTag.setTagPic(tagPic);
selfTag.setTagType("0"); selfTag.setTagType("0");
selfTag.setTagBelong("1"); selfTag.setTagBelong("0");
return toAjax(goblinSelfTagService.save(selfTag)); return toAjax(goblinSelfTagService.save(selfTag));
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/extag/extag.html
View file @ c7f1fdaf
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
} }
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: '/goblin/tag/addSave', url: '/goblin/extag/addSave',
data: data, data: data,
success: function(res) { success: function(res) {
console.log(res) console.log(res)
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/tag/tag.html
View file @ c7f1fdaf
...@@ -2,12 +2,171 @@ ...@@ -2,12 +2,171 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('标签列表')"/> <th:block th:include="include :: header('标签列表')"/>
<th:block th:include="include :: bootstrap-fileinput-css" />
<style>
.layui-layer-btn0 {
padding: 0;
}
#addClassify {
display: none;
width: 540px;
padding: 20px;
}
#addClassify .selectClassify {
display: flex;
align-items: center;
}
#addClassify .selectClassify label {
display: flex;
margin-right: 20px;
align-items: center;
}
#addClassify .selectClassify label input {
margin: 0;
margin-right: 2px;
}
.shadeCss,.layui-layer-shade {
background-color: rgb(0, 0, 0, 0.5) !important;
}
.select-list ul {
display: flex;
justify-content: space-between;
}
.selectClassifyOne span {
width: 80px;
}
.tagStore .fixed-table-toolbar {
display: flex;
}
.tagStore .fixed-table-toolbar .bs-bars {
flex: 1;
}
.tagStore .fixed-table-toolbar .bs-bars .btn-group-sm {
display: flex;
justify-content: space-between;
}
.leftSearchBox {
display: flex;
align-items: center;
}
.leftSearchBox input, .leftSearchBox select {
width: 200px;
height: 34px;
margin-right: 12px;
}
.ibox-content {
border-style: none;
padding: 0;
}
.kv-hidden {
display: none !important;
}
.layui-layer-btn0, .layui-layer-btn1 {
font-size: 12px;
font-weight: normal;
margin: 0 3px;
margin-right: 7px;
margin-left: 7px;
padding: 0 15px;
color: #fff;
border: 1px solid #0064b6;
background: #0071ce;
border-radius: 3px;
display: inline-block;
height: 30px;
line-height: 30px;
text-align: center;
vertical-align: middle;
background-repeat: no-repeat;
text-decoration: none;
outline: none;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
}
.layui-layer-btn1 {
color: #404a58;
border: 1px solid #c0c4cd;
background: #fff;
border-radius: 3px;
margin-left: 0;
}
.layui-layer-btn0:hover {
color: #fff;
}
#addClassify {
padding: 0;
display: none;
width: 540px;
padding-top: 20px;
}
#addClassify .selectClassify {
display: flex;
align-items: center;
padding: 0 20px;
}
#addClassify .selectClassify label {
display: flex;
margin-right: 20px;
align-items: center;
}
#addClassify .selectClassify label input {
margin: 0;
margin-right: 2px;
}
.shadeCss,.layui-layer-shade {
background-color: rgb(0, 0, 0, 0.5) !important;
}
.select-list ul {
display: flex;
justify-content: space-between;
}
.selectClassifyOne {
display: flex;
align-items: center;
margin: 12px 0;
padding: 0 20px;
}
.tagStore .fixed-table-toolbar {
display: flex;
}
.tagStore .fixed-table-toolbar .bs-bars {
flex: 1;
}
.tagStore .fixed-table-toolbar .bs-bars .btn-group-sm {
display: flex;
justify-content: space-between;
}
.leftSearchBox {
display: flex;
align-items: center;
}
.leftSearchBox input, .leftSearchBox select {
width: 200px;
height: 34px;
margin-right: 12px;
}
.ibox-content {
border-style: none;
padding: 0;
}
.kv-hidden {
display: none !important;
}
.bottomBtn {
text-align: right;
padding: 10px 15px 12px;
background: #f0f4f7;
border-top: 1px #c7c7c7 solid;
}
</style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="" shiro:hasPermission="goblin:extag:add"> <a class="btn btn-success" id="button-open-10" shiro:hasPermission="goblin:extag:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goblin:extag:rmv"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goblin:extag:rmv">
...@@ -19,13 +178,60 @@ ...@@ -19,13 +178,60 @@
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
<div id="addClassify">
<div class="selectClassify">
<span>上传图标：</span>
<img id="viewImg" src="" alt="" style="max-height:150px;">
<div class="ibox-content">
<div class="form-group">
<div class="file-loading">
<input id="fileinput" type="file" name="file" data-browse-on-zone-click="true" data-theme="fas">
</div>
</div>
</div>
</div>
<div class="selectClassifyOne">
<span>标签名称：</span>
<input class="form-control" id="musicName" type="text" placeholder="请输入分类名称">
</div>
<div class="bottomBtn">
<a href="javascript:;" class="layui-layer-btn0" onclick="yes()">确定</a>
<a class="layui-layer-btn1 layui-layer-btn1" onclick="closeModal()">取消</a>
</div>
</div>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: bootstrap-fileinput-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlg = [[${@permission.hasPermi('goblin:tag:edit')}]]; var editFlg = [[${@permission.hasPermi('goblin:tag:edit')}]];
var rmvFlg = [[${@permission.hasPermi('goblin:extag:rmv')}]]; var rmvFlg = [[${@permission.hasPermi('goblin:extag:rmv')}]];
let tagId = '';
var prefix = ctx + "goblin/tag"; var prefix = ctx + "goblin/tag";
$(function () { $(function () {
$("#fileinput").fileinput({
'theme': 'explorer-fas',
'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
"uploadExtraData": {
"pathName" : "banner",
"buckType" : 1
},
autoReplace: true,
showCaption: false,
showPreview: false,
showRemove: false,
showUpload: false,
showCancel: false,
showClose: false,
autoReplace: true,
dropZoneTitle: "请上传文件",
maxFileCount: 1
}).on("filebatchselected", function (event, files) { //默认上传
$(this).fileinput("upload");
})
.on("fileuploaded", function (event, data) { //上传回调事件
showPicture = 'https://img.zhengzai.tv/' + data.response.data.ossPath;
$("#viewImg").attr('src', showPicture)
})
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
removeUrl: prefix + "/rmv", removeUrl: prefix + "/rmv",
...@@ -53,15 +259,73 @@ ...@@ -53,15 +259,73 @@
title: '操作', title: '操作',
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = `<a class="btn btn-success btn-xs ' + editFlg + '" href="javascript:void(0)" onclick="openMode('${row.tagId}','${row.tagName}','${row.tagPic}')"><i class="fa fa-edit"></i>编辑</a> <a class="btn btn-danger btn-xs ' + rmvFlg + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.tagId + '\')"><i class="fa fa-trash"></i>删除</a>`;
actions.push('<a class="btn btn-success btn-xs ' + editFlg + '" href="javascript:void(0)" onclick=""><i class="fa fa-edit"></i>编辑</a> '); return actions;
actions.push('<a class="btn btn-danger btn-xs ' + rmvFlg + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.tagId + '\')"><i class="fa fa-trash"></i>删除</a>');
return actions.join('');
} }
}] }]
}; };
$.table.init(options); $.table.init(options);
}); });
$("#button-open-10").click(function(){
mode();
})
function openMode(id, name, tagPic) {
console.log(id, name, tagPic, '?不触发吗')
tagId = id;
mode();
$("#musicName").val(name);
$("#viewImg").attr('src', tagPic);
}
function mode() {
layer.open({
type: 1,
shade: true,
title: '创建分类', //不显示标题
content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
success: function () {
$(".layui-layer-shade").addClass('shadeCss')
},
cancel: function(res){
reset()
console.log(res, '2111')
// layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
}
});
}
function reset() {
id = '';
$("#musicName").val('');
$("#viewImg").attr('src', '');
}
function yes(index, layero) {
console.log(index, layero)
let data = {
tagName: $("#musicName").val(),
tagPic: $("#viewImg").attr('src')
}
let url = '/goblin/tag/addSave';
console.log(tagId, 'tagId')
if (tagId) {
data.tagId = tagId
url = '/goblin/tag/editSave';
}
$.ajax({
type: 'post',
url: url,
data,
success: function(res) {
console.log(res)
if (res.code == 0) {
closeModal();
$("button[name=refresh]").click()
}
}
})
}
function closeModal () {
reset()
$(".layui-layer-close1").click();
}
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityStoreList.html
View file @ c7f1fdaf
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
// } // }
function goDetail(name, storeId, time, marketId) { function goDetail(name, storeId, time, marketId) {
console.log(name, storeId, time, marketId, '????') console.log(name, storeId, time, marketId, '????')
$.modal.openTab(name, prefix2 + "/storeDetail?storeId=" + storeId + '&time=' + time + '&marketId=' + marketId) $.modal.openTab(name, prefix2 + "/storeDetail?storeId=" + storeId + '&time=' + time + '&marketId=' + marketId + '&activityName=' + name)
} }
$("#button-open-11").click(function(){ $("#button-open-11").click(function(){
$("button[name=refresh]").click() $("button[name=refresh]").click()
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/addNewActivity.html
View file @ c7f1fdaf
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</span> </span>
<div class="activityStore"> <div class="activityStore">
<button class="btn btn-primary" onclick="addItem()" style="margin-bottom: 12px;">新增</button> <button class="btn btn-primary" onclick="addItem()" style="margin-bottom: 12px;">新增</button>
<div class="activityStore_item" id="activityStore_item"> <div class="activityStore_item" id="activityStore_item" data-newTag="1">
<div class="input-group" style="margin-right: 12px;"> <div class="input-group" style="margin-right: 12px;">
<input type="text" class="form-control storeList item1" placeholder="搜索店铺名称"> <input type="text" class="form-control storeList item1" placeholder="搜索店铺名称">
<div class="input-group-btn"> <div class="input-group-btn">
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
let count = 1; let count = 1;
var prefix2 = ctx + "local"; var prefix2 = ctx + "local";
let marketId = ''; let marketId = '';
let editDatas = 0;
$(function() { $(function() {
let name = 'id'; let name = 'id';
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
...@@ -161,6 +162,7 @@ ...@@ -161,6 +162,7 @@
console.log(res, 'res') console.log(res, 'res')
let basisData = res[0]; let basisData = res[0];
let { data } = res[1]; let { data } = res[1];
editDatas = data.length;
$("#selectShow").val(basisData.data.name); $("#selectShow").val(basisData.data.name);
$("#startTime").val(basisData.data.startTime); $("#startTime").val(basisData.data.startTime);
$("#endTime").val(basisData.data.endTime); $("#endTime").val(basisData.data.endTime);
...@@ -211,10 +213,11 @@ ...@@ -211,10 +213,11 @@
}); });
} }
function addItem (item) { function addItem (item) {
console.log(item)
count++; count++;
let body = ''; let body = '';
if (item) { if (item) {
body+=`<div class="activityStore_item"> body+=`<div class="activityStore_item" data-newTag="">
<div class="input-group" style="margin-right: 12px;"> <div class="input-group" style="margin-right: 12px;">
<input type="text" class="form-control storeList item${count}" data-id="${item.storeId}" value="${item.storeName}" placeholder="搜索店铺名称"> <input type="text" class="form-control storeList item${count}" data-id="${item.storeId}" value="${item.storeName}" placeholder="搜索店铺名称">
<div class="input-group-btn"> <div class="input-group-btn">
...@@ -225,7 +228,7 @@ ...@@ -225,7 +228,7 @@
<input type="text" class="layui-input form-control timeSp startTime${count}" id="startTime" value="${item.showTime}" autocomplete="off" placeholder="配置活动时间"> <input type="text" class="layui-input form-control timeSp startTime${count}" id="startTime" value="${item.showTime}" autocomplete="off" placeholder="配置活动时间">
</div>` </div>`
} else { } else {
body+=`<div class="activityStore_item"> body+=`<div class="activityStore_item" data-newTag="1">
<div class="input-group" style="margin-right: 12px;"> <div class="input-group" style="margin-right: 12px;">
<input type="text" class="form-control storeList item${count}" placeholder="搜索店铺名称"> <input type="text" class="form-control storeList item${count}" placeholder="搜索店铺名称">
<div class="input-group-btn"> <div class="input-group-btn">
...@@ -277,13 +280,26 @@ ...@@ -277,13 +280,26 @@
} }
function save () { function save () {
let obj = {}; let obj = {};
let data = []; let data = []; // 新增集合
let data2 = []; // 修改集合
let domData = $(".activityStore_item"); let domData = $(".activityStore_item");
Array.prototype.forEach.call(domData,function(item,index){ Array.prototype.forEach.call(domData,function(item,index){
obj['marketId'] = marketId; obj['marketId'] = marketId;
obj['showTime'] = item.querySelector('.timeSp').value; obj['showTime'] = item.querySelector('.timeSp').value;
obj['storeId'] = item.querySelector('.storeList').getAttribute('data-id'); obj['storeId'] = item.querySelector('.storeList').getAttribute('data-id');
obj['delTag'] = 0;
if (item.getAttribute('data-newTag')) {
obj['newTag'] = 1;
} else {
obj['newTag'] = 0;
}
data.push({...obj}); data.push({...obj});
// if (index < editDatas) {
// } else {
// data2.push({...obj});
// }
}) })
console.log(data) console.log(data)
promiseMethods('/goblin/marketing/zhengzai/store','post', JSON.stringify(data), 'application/json').then(res => { promiseMethods('/goblin/marketing/zhengzai/store','post', JSON.stringify(data), 'application/json').then(res => {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/setGoodsRole.html
View file @ c7f1fdaf
...@@ -68,9 +68,34 @@ ...@@ -68,9 +68,34 @@
}); });
}); });
$(function () { $(function () {
let marketId = 'marketId';
let storeId = 'storeId';
let marketSpuId = 'marketSpuId';
var reg = new RegExp("(^|&)"+ marketId +"=([^&]*)(&|$)");
var reg2 = new RegExp("(^|&)"+ storeId +"=([^&]*)(&|$)");
var reg3 = new RegExp("(^|&)"+ marketSpuId +"=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
var r2 = window.location.search.substr(1).match(reg2);
var r3 = window.location.search.substr(1).match(reg3);
let params = {
marketId: unescape(r[2]),
storeId: unescape(r2[2]),
marketSpuId: unescape(r3[2])
};
let data = [];
$.ajax({
url: '/goblin/marketing/zhengzai/sku',
type: 'post',
data: params,
success: function(params) {
console.log(params)
data = res.params;
}
})
return
var options = { var options = {
id: 'setTable', id: 'setTable',
url: prefix + "/list", // url: '/goblin/marketing/zhengzai/sku',
createUrl: prefix2 + "/addNewActivity", createUrl: prefix2 + "/addNewActivity",
detailUrl: prefix2 + "/addNewActivity?id={id}", detailUrl: prefix2 + "/addNewActivity?id={id}",
removeUrl: prefix + "/cancel/{id}", removeUrl: prefix + "/cancel/{id}",
...@@ -84,6 +109,7 @@ ...@@ -84,6 +109,7 @@
showColumns: false, showColumns: false,
showToggle: false, showToggle: false,
pagination: false, pagination: false,
data: data,
columns: [ columns: [
{ {
field: 'valFace', field: 'valFace',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/storeDetail.html
View file @ c7f1fdaf
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<h3><span></span>基础信息</h3> <h3><span></span>基础信息</h3>
</div> </div>
<div class="content_store_name"> <div class="content_store_name">
<span>项目名称：</span><p>2022北京草莓音乐节</p> <span>项目名称：</span><p id="titleName">2022北京草莓音乐节</p>
</div> </div>
<div class="content_store_name"> <div class="content_store_name">
...@@ -170,6 +170,7 @@ ...@@ -170,6 +170,7 @@
let name = 'storeId'; let name = 'storeId';
let time = 'time'; let time = 'time';
let marketId = 'marketId'; let marketId = 'marketId';
let activityName = 'activityName';
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var reg2 = new RegExp("(^|&)"+ time +"=([^&]*)(&|$)"); var reg2 = new RegExp("(^|&)"+ time +"=([^&]*)(&|$)");
var reg3 = new RegExp("(^|&)"+ marketId +"=([^&]*)(&|$)"); var reg3 = new RegExp("(^|&)"+ marketId +"=([^&]*)(&|$)");
...@@ -177,9 +178,9 @@ ...@@ -177,9 +178,9 @@
var r2 = window.location.search.substr(1).match(reg2); var r2 = window.location.search.substr(1).match(reg2);
var r3 = window.location.search.substr(1).match(reg3); var r3 = window.location.search.substr(1).match(reg3);
$("#time").html(unescape(r2[2])); $("#time").html(unescape(r2[2]));
$("#storeId").val(); $("#titleName").text(GetQueryString(activityName));
$("#marketId").val(); $("#storeId").val(unescape(r[2]));
console.log(unescape(r[2]),unescape(r2[2]),unescape(r3[2]), 'sha') $("#marketId").val(unescape(r3[2]));
let data = { let data = {
marketId: unescape(r3[2]), marketId: unescape(r3[2]),
storeId: unescape(r[2]), storeId: unescape(r[2]),
...@@ -257,15 +258,18 @@ ...@@ -257,15 +258,18 @@
$.table.init(options); $.table.init(options);
} }
}) })
}); });
var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]]; var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]]; var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
var prefix = ctx + "candy/coupon/mgt"; var prefix = ctx + "candy/coupon/mgt";
var prefix2 = ctx + "local"; var prefix2 = ctx + "local";
function GetQueryString(name){
function setGoodsRole () { var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
let url = prefix2 + '/setGoodsRole' var r = window.location.search.substr(1).match(reg);
if(r!=null)return unescape(r[2]); return null;
}
function setGoodsRole (marketId, storeId, marketSpuId) {
let url = prefix2 + '/setGoodsRole?marketId=' + marketId + '&storeId=' + storeId + '&marketSpuId=' + marketSpuId;
console.log(url) console.log(url)
$.modal.open("标题内容", url, '1280', '680'); $.modal.open("标题内容", url, '1280', '680');
} }
......
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