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

Commit 4164274f authored by 胡佳晨's avatar 胡佳晨

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

parents c51580bd 4886780f
...@@ -237,14 +237,14 @@ ...@@ -237,14 +237,14 @@
<span class="change${i+1}">票务名称</span>: <span class="change${i+1}">票务名称</span>:
</div> </div>
<div class="input-group iptOrSelect shwoSelect${i+1}""> <div class="input-group iptOrSelect shwoSelect${i+1}"">
<input id="ticketName${i+1}" type="text" data-id="${data[i].ticketId}" value="${data[i].ticketName}" class="form-control storeList" onFocus="focusMethod(this)" placeholder="请输入查询信息"> <input id="ticketName${i+1}" type="text" data-id="${data[i].ticketId}" value="${data[i].ticketName}" class="form-control storeList quzhi" onFocus="focusMethod(this)" placeholder="请输入查询信息">
<div class="input-group-btn"> <div class="input-group-btn">
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
</ul> </ul>
</div> </div>
</div> </div>
<div class="iptOrSelect shwoH5${i+1}" style="display:none;"> <div class="iptOrSelect shwoH5${i+1}" style="display:none;">
<input id="ticketName${i+1}" data-id="${data[i].ticketId}" value="${data[i].ticketName}" type="text" class="layui-input form-control h5Url" placeholder="请输入活动链接"> <input id="ticketName${i+1}" data-id="${data[i].ticketId}" value="${data[i].ticketName}" type="text" class="layui-input form-control h5Url quzhi" placeholder="请输入活动链接">
</div> </div>
</div> </div>
</div> </div>
...@@ -254,8 +254,8 @@ ...@@ -254,8 +254,8 @@
时间设置: 时间设置:
</div> </div>
<div class="select_tiem" style="display:flex;"> <div class="select_tiem" style="display:flex;">
<input type="text" class="layui-input form-control timeStart" id="startTime${i+1}" value="${data[i].startTime}" autocomplete="off" placeholder="配置活动时间"> <input type="text" class="layui-input form-control timeStart" id="startTime${i+1}" value="${data[i].startTime || ''}" autocomplete="off" placeholder="配置活动时间">
<input type="text" class="layui-input form-control timeEnd" id="endTime${i+1}" value="${data[i].endTime}" autocomplete="off" placeholder="配置活动时间"> <input type="text" class="layui-input form-control timeEnd" id="endTime${i+1}" value="${data[i].endTime || ''}" autocomplete="off" placeholder="配置活动时间">
</div> </div>
</div> </div>
<div class="set_function_time" style="width: 40%;"> <div class="set_function_time" style="width: 40%;">
...@@ -315,14 +315,14 @@ ...@@ -315,14 +315,14 @@
<span class="change${num}">票务名称</span>: <span class="change${num}">票务名称</span>:
</div> </div>
<div class="input-group iptOrSelect shwoSelect${num}""> <div class="input-group iptOrSelect shwoSelect${num}"">
<input id="ticketName${num}" data-id="" value="" type="text" class="form-control storeList" onFocus="focusMethod(this)" placeholder="请输入查询信息"> <input id="ticketName${num}" data-id="" value="" type="text" class="form-control storeList quzhi" onFocus="focusMethod(this)" placeholder="请输入查询信息">
<div class="input-group-btn"> <div class="input-group-btn">
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
</ul> </ul>
</div> </div>
</div> </div>
<div class="iptOrSelect shwoH5${num}" style="display:none;"> <div class="iptOrSelect shwoH5${num}" style="display:none;">
<input id="ticketName${num}" data-id="" value="" type="text" class="layui-input form-control h5Url" placeholder="请输入活动链接"> <input id="ticketName${num}" data-id="" value="" type="text" class="layui-input form-control h5Url quzhi" placeholder="请输入活动链接">
</div> </div>
</div> </div>
</div> </div>
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
let data = [] let data = []
Array.prototype.forEach.call(itmeLength,function (item,index,arr) { Array.prototype.forEach.call(itmeLength,function (item,index,arr) {
obj.activityUrl = item.querySelector('#ticketName'+(index+1)+'').value; obj.activityUrl = item.querySelector('.quzhi').value;
obj.bannerId = item.getAttribute('data-id'); obj.bannerId = item.getAttribute('data-id');
obj.bannerType = type; obj.bannerType = type;
obj.createTime = item.getAttribute('data-createTime'); obj.createTime = item.getAttribute('data-createTime');
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
obj.picUrl = item.querySelector('.imgBox').getAttribute('src'); obj.picUrl = item.querySelector('.imgBox').getAttribute('src');
obj.startTime = item.querySelector('.timeStart').value; obj.startTime = item.querySelector('.timeStart').value;
obj.endTime = item.querySelector('.timeEnd').value; obj.endTime = item.querySelector('.timeEnd').value;
obj.updateTime = item.getAttribute('data-upData'); // obj.updateTime = item.getAttribute('data-upData');
if (item.querySelector('#jumpSelect'+(index+1)+'').value == 2) { if (item.querySelector('#jumpSelect'+(index+1)+'').value == 2) {
obj.ticketId = item.querySelector('.h5Url').getAttribute('data-id'); obj.ticketId = item.querySelector('.h5Url').getAttribute('data-id');
obj.ticketName = item.querySelector('.h5Url').value; obj.ticketName = item.querySelector('.h5Url').value;
......
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