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

Skip to content

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

修改前端bug

parent aa934f36
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 14 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralDetail.html
View file @ 1ff7d427
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
title: '获得积分', title: '获得积分',
}, },
{ {
field: 'reason', field: 'content',
title: '变更原因' title: '变更原因'
} }
] ]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralList.html
View file @ 1ff7d427
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
// exportUrl: prefix + "/export", // exportUrl: prefix + "/export",
// sortName: "createdAt", // sortName: "createdAt",
// sortOrder: "desc", // sortOrder: "desc",
pagination: false,
modalName: "积分", modalName: "积分",
columns: [ columns: [
{ {
...@@ -130,7 +131,6 @@ ...@@ -130,7 +131,6 @@
url: prefix + '/change/status', url: prefix + '/change/status',
data, data,
success:function(e) { success:function(e) {
console.log(e)
$("button[name=refresh]").click(); $("button[name=refresh]").click();
} }
}) })
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
var userIds = $.table.selectColumns("uid"); var userIds = $.table.selectColumns("uid");
// var dataParam = $("#export-form").serializeArray(); // var dataParam = $("#export-form").serializeArray();
var tipMsg = "确定导出所有数据吗？"; var tipMsg = "确定导出所有数据吗？";
console.log(userIds, 'kakn')
if($.common.isNotEmpty(userIds)){ if($.common.isNotEmpty(userIds)){
tipMsg = "确定导出勾选" + userIds.length + "条数据吗？"; tipMsg = "确定导出勾选" + userIds.length + "条数据吗？";
// dataParam.push({ "name": "uid", "value": userIds }); // dataParam.push({ "name": "uid", "value": userIds });
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStore.html
View file @ 1ff7d427
...@@ -146,9 +146,7 @@ ...@@ -146,9 +146,7 @@
$.modal.openTab("积分明细列表", url); $.modal.openTab("积分明细列表", url);
} }
function openShelvesModal(id, status, notice) { function openShelvesModal(id, status, notice) {
// console.log('111111')
$.modal.confirm(notice, function() { $.modal.confirm(notice, function() {
console.log(id, status)
$.ajax({ $.ajax({
type: 'put', type: 'put',
url: '/stone/item/change/status', url: '/stone/item/change/status',
...@@ -157,7 +155,6 @@ ...@@ -157,7 +155,6 @@
status status
}, },
success:function(e) { success:function(e) {
console.log(e)
layer.msg("操作成功！") layer.msg("操作成功！")
$("button[name=refresh]").click() $("button[name=refresh]").click()
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html
View file @ 1ff7d427
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<body> <body>
<form id="form-user-add" class="layui-form"> <form id="form-user-add" class="layui-form">
<div class="main_type"> <div id="scoreType" class="main_type">
<span class="labelName">商品类型：</span> <span class="labelName">商品类型：</span>
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<input type="radio" value="0" name="typeOne" checked><span>全场</span> <input type="radio" value="0" name="typeOne" checked><span>全场</span>
...@@ -306,7 +306,6 @@ ...@@ -306,7 +306,6 @@
processData: false, processData: false,
type: 'POST', type: 'POST',
success: function (data) { success: function (data) {
console.log(data, data.data.ossPath, '????')
$summernote.summernote('insertImage', 'https://img.zhengzai.tv/' + data.data.ossPath) $summernote.summernote('insertImage', 'https://img.zhengzai.tv/' + data.data.ossPath)
} }
}); });
...@@ -326,8 +325,9 @@ ...@@ -326,8 +325,9 @@
let data = { let data = {
itemId: itemId itemId: itemId
} }
$("#scoreType").hide();
$("#searchIpt").attr('disabled', true);
promiseMethods(ctx + "stone/item/details",'get',data).then(res=>{ promiseMethods(ctx + "stone/item/details",'get',data).then(res=>{
console.log(res, '???')
let data = res.data; let data = res.data;
if (res.code == 0) { if (res.code == 0) {
showPicture = data.img; showPicture = data.img;
...@@ -335,6 +335,7 @@ ...@@ -335,6 +335,7 @@
$("#searchIpt").val(data.targetTitle); $("#searchIpt").val(data.targetTitle);
$("#integralNum").val(data.score); $("#integralNum").val(data.score);
$("#inventory").val(data.generalTotal); $("#inventory").val(data.generalTotal);
showId = data.generalTotal;
// $("#goodsDetail").val(data.details); // $("#goodsDetail").val(data.details);
$('#summernote').summernote('code', data.details) $('#summernote').summernote('code', data.details)
$('.summernote').eq(1).summernote('code', data.notice) $('.summernote').eq(1).summernote('code', data.notice)
...@@ -412,7 +413,6 @@ ...@@ -412,7 +413,6 @@
} ) } )
// $("#searchIpt").val(name); // $("#searchIpt").val(name);
showId = id; showId = id;
console.log(showId, 'showId')
}; };
$("#searchIpt").focus(function(){ $("#searchIpt").focus(function(){
getMallList() getMallList()
...@@ -468,7 +468,6 @@ ...@@ -468,7 +468,6 @@
}); });
function create() { function create() {
console.log($('#searchIpt').val(),showPicture,$('#integralNum').val(),$('#moneyNum').val(),$('#inventory').val(),$('#summernote').summernote('code'),$('#summernoteNotice').summernote('code'))
if (!$('#searchIpt').val() || !showPicture || !$('#integralNum').val() || !$('#moneyNum').val() || !$('#inventory').val() || !$('#summernote').summernote('code') || !$('.summernote').eq(1).summernote('code')) { if (!$('#searchIpt').val() || !showPicture || !$('#integralNum').val() || !$('#moneyNum').val() || !$('#inventory').val() || !$('#summernote').summernote('code') || !$('.summernote').eq(1).summernote('code')) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html
View file @ 1ff7d427
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
} }
// prizeList: data, // prizeList: data,
$("#startTime").val($.common.dateFormat(res.startTime, 'yyyy-MM-dd HH:mm:ss')); $("#startTime").val($.common.dateFormat(res.startTime, 'yyyy-MM-dd HH:mm:ss'));
timeType = timeType; timeType = res.timeType;
if (timeType == 2) { if (timeType == 2) {
$("input[name='sendType'][value='2']").attr('checked', true).siblings().removeAttr('checked'); $("input[name='sendType'][value='2']").attr('checked', true).siblings().removeAttr('checked');
} }
......
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