Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

beetlsql3-dev
wgf 2 years ago
commit 555bccc0f7

@ -357,7 +357,7 @@ var Common = {
if(pastMonth<10) pastMonth="0"+pastMonth;
if(pastDay<10) pastDay="0"+pastDay;
let time = pastYear + '-' + pastMonth + '-' + pastDay;
let time = pastYear + '-' + pastMonth + '-' + pastDay + " 00:00";
return time;
/*var d = new Date();

@ -110,7 +110,7 @@
<td>
<select name="useType" lay-filter="select_useType_1">
<option value="0">请选择</option>
<option value="1" {{item.useType=='1'?'selected':''}}>购买</option>
<option value="1" {{(item.useType=='1'||item.useType=='0'||$.isEmpty(item.useType))?'selected':''}}>购买</option>
<option value="2" {{item.useType=='2'?'selected':''}}>试用</option>
</select>
</td>
@ -201,7 +201,7 @@
<td>
<select name="useType" lay-filter="select_useType_2">
<option value="0">请选择</option>
<option value="1" {{item.useType=='1'?'selected':''}}>购买</option>
<option value="1" {{(item.useType=='1'||item.useType=='0'||$.isEmpty(item.useType))?'selected':''}}>购买</option>
<option value="2" {{item.useType=='2'?'selected':''}}>试用</option>
</select>
</td>
@ -345,10 +345,9 @@
xtList[i].subsystemBottomBar = $(this).val();
});
loadTime("useStartTime_xt_" + i,v);
loadTime("useStartTime_xt_" + i);
loadTime("useEndTime_xt_" + i);
loadTime("useEndTime_xt_" + i,v);
//子系统登录页logo设计
updateLogo("subsystemIndexLogo_xt_" + i);
@ -392,9 +391,9 @@
kcList[i].secondLevelName = $(this).val();
});
loadTime("useStartTime_kc_" + i);
loadTime("useStartTime_kc_" + i,v);
loadTime("useEndTime_kc_" + i);
loadTime("useEndTime_kc_" + i,v);
updateLogo("secondLevelLogo_kc_" + i);//二级课程logo设置
@ -427,11 +426,24 @@
//开始结束时间
function loadTime(id) {
function loadTime(id,data) {
var timeValue = data.useStartTime;
if(data.useType == 0 || $.isEmpty(data.useType)){
var timeValue = Common.getNowDate(0);
if(id.indexOf("useEndTime") > -1){
timeValue = Common.getNowDate(1095);
}
}else {
if(id.indexOf("useEndTime") > -1){
timeValue = data.useEndTime;
}
}
laydate.render({
elem: '#' + id
, type: 'datetime'
, format: 'yyyy-MM-dd HH:mm'
, value: [timeValue]
, done: function (value, date, endDate) {
var i = $("#" + id).parents("tr").attr("index");//当前编辑行号
if (id.indexOf("useStartTime_xt") >= 0) {

Loading…
Cancel
Save