fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit a9561202ff9c167e516d107c1643f438d1aaae9a 2 parents 5e58e55f e00d605e

Merge branch 'dev5.2' into test5.2

Inline Side-by-side
Showing 2 changed files with 18 additions and 5 deletions
... ... @@ -677,6 +677,7 @@
</div>
</div>
</td>
<td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="sale1T1L4R.big_image" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ... @@ -711,6 +712,7 @@
</div>
</div>
</td>
<td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="sale1T1L4R.list" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ... @@ -1139,7 +1141,7 @@
<input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
</div>
</div>
<div class="col-sm-3">
<div class="col-sm-3" style="display: none">
<label>背景色</label>&emsp;
<input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
</div>
... ... @@ -1188,6 +1190,7 @@
</div>
</div>
</td>
<td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="newUserFloor.banner_image" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ... @@ -1213,7 +1216,7 @@
<input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
</div>
</div>
<div class="col-sm-3">
<div class="col-sm-3" style="display: none">
<label>背景色</label>&emsp;
<input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
</div>
... ... @@ -1262,6 +1265,7 @@
</div>
</div>
</td>
<td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="popularSingleProduct.banner_image" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ... @@ -1993,7 +1997,7 @@
<input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
</div>
</div>
<div class="col-sm-3">
<div class="col-sm-3" style="display: none">
<label>背景色</label>&emsp;
<input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
</div>
... ... @@ -2042,6 +2046,7 @@
</div>
</div>
</td>
<td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="vipUse.banner_image" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ... @@ -2103,6 +2108,7 @@
</div>
</div>
</td>
<td align="center"><button class="btn btn-danger btn-sm delBtn" data-event="newProductFloor.list" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ...
... ... @@ -128,12 +128,12 @@ function timeToSeconds(time) {
var e = new common.edit("#baseform");
console.log(e);
var dialog = common.dialog.confirm(hint, artTemplate("template", item), function() {
e.submit(url, function (option) {
console.log(option.data);
option.data.startTime = new Date(option.data.startTime).getTime() / 1000;
option.data.endTime = new Date(option.data.endTime).getTime() / 1000;
... ... @@ -147,6 +147,13 @@ function timeToSeconds(time) {
return false;
});
e.on("validate", function() {
var matchWordName = $("#baseform").find("#matchWordName").val();
if (matchWordName.indexOf("，") >= 0) {
return "请使用英文 , 分割";
}
});
e.init();
... ...