fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit a1cdf1299796501f9701750125054a1254ce92c7 1 parent 4ce40b18

解决冲突

Inline Side-by-side
Showing 3 changed files with 29 additions and 38 deletions
... ... @@ -108,6 +108,13 @@ e.on("validate", function() {
return "请上传默认封面";
}
});
e.on("validate",function(){
var limitProductType=$("#limitProductType").val();
var activityId=$.trim($("#activityId").val());
if(limitProductType==2&&activityId==""){
return "请填写排队限购ID";
}
})
e.init();
... ... @@ -138,7 +145,6 @@ $('.limit-add-btn').click(function(option) {
// var $editor = $('#editor'), //文字，图片，视频容器
// type = $('#limit-add-form').attr('type');
<<<<<<< HEAD
var Bll={
imgVideo:function(title,item,index){
if(item.attachType==2||item.__attachType==2){item.extend="mp4"};
... ... @@ -163,30 +169,6 @@ var Bll={
g.reload();
e1.init();
}
=======
var Bll = {
imgVideo: function(title, item, index) {
common.dialog.confirm(title, common.util.__template($("#picDialogTemp").html(), item), function() {
var _html = $.trim($("#imgVideoText").val());
if (_html) {
if (item.attachType) {
//修改
g.__rows[index].attachUrl = _html;
} else {
//添加
g.__rows.push({
"attachType": item.__attachType,
"attachUrl": _html,
"isDefault": 0,
"attachName": $("#attachName").val()
});
}
g.reload();
e1.init();
}
>>>>>>> ab68be0c67e4456aa77357afd5d64fc8218d2b69
});
var a = new common.edit("#upload-wrapper");
a.on("callback", function(obj) {
... ...
... ... @@ -39,15 +39,15 @@
<div class="form-group">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-8">
<label class="radio-inline"><input type="radio" name="limitProductType" value="1">分享得限购码</label>
<label class="radio-inline"><input type="radio" name="limitProductType" value="1" checked="checked">分享得限购码</label>
<label class="radio-inline"><input type="radio" name="limitProductType" value="2">排队得限购码</label>
<input type="hidden" value="{{limitProductType}}" id="limitProductType" for="radio">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">排队限购ID<span class="red">*</span>：</label>
<label class="col-sm-2 control-label">排队限购ID</label>
<div class="col-sm-8">
<input type="text" id="activityId" placeholder="排队限购ID" class="form-control" required maxlength="30" value="{{activityId}}">
<input type="text" id="activityId" placeholder="排队限购ID" class="form-control" maxlength="30" value="{{activityId}}">
</div>
</div>
<div class="form-group">
... ...
... ... @@ -18,19 +18,28 @@
</ul>
<div>
<div style="width: 30%;float: left;">
<div class="col-sm-4">
<h4>选择模板</h4>
</div>
<div class="col-sm-8">
<label class="radio-inline">
<input type="radio" name="brandLevel" value="KA">KA </label>
<label class="radio-inline">
<input type="radio" name="brandLevel" value="A">A </label>
<label class="radio-inline">
<input type="radio" name="brandLevel" value="B">B </label>
<label class="radio-inline">
<input type="radio" name="brandLevel" value="C">C </label>
</div>
<label class="radio-inline"><input type="radio" name="brandLevel" value="1">基础模板</label>
<label class="radio-inline"><input type="radio" name="brandLevel" value="2">模板2</label>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default">
<div class="panel-body">
<div class="rows" id="template">
<div class="g-header">
</div>
<div class="g-menus">
</div>
</div>
</div>
</div>
... ...