Authored by weiqingting

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

... ... @@ -321,7 +321,7 @@ edit.prototype={
};
callback&&callback(options);
$.ajax(options);
return false;
//return false;
},
__listen:function(key,o,callback){
var __self=this;
... ...
... ... @@ -80,7 +80,9 @@ var g = new common.grid({
{display: "内容", name: "content"},
{display: "频道", name: "channelNames"},
{display: "链接", name: "url", render: function (item) {
return '<a href="'+item.url+'">'+item.url+'</a>'
var url = item.url?item.url:"";
return '<a href="'+item.url+'" target="_blank"> '+url+'</a>' //'+item.url?item.url:""+'
}},
{display: "状态", name: "status", render: function (item) {
if (item.status === StatusEnum.ON) {
... ... @@ -278,7 +280,7 @@ function searchWordOp (prefix, url, item) {
common.dialog.confirm(prefix+templ.title, common.util.__template( t.join(""), item), function () {
//
a.submit(url,function(option){
return a.submit(url,function(option){
option.success=function(res){
res=res.data;
if(res.code=="200"){
... ...
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title"></h4>
</div>
<div class="modal-body">
<div class="form-group">
<label class="col-sm-2"><font style="color:red;">*</font>内容</label>
<div class="col-sm-2">
<input type="text" id="content" name="content" value="" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2"><font style="color:red;">*</font>开始时间</label>
<div class="col-sm-2">
<input type="text" id="content" name="content" value="" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2"><font style="color:red;">*</font>结束时间</label>
<div class="col-sm-2">
<input type="text" id="content" name="content" value="" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2"><font style="color:red;">*</font>状态</label>
<div class="col-sm-2">
<input type="radio" name="status" checked="" value="2">启用
<input type="radio" name="status" value="1">禁用
</div>
</div>
<div class="form-group">
<label class="col-sm-2">添加人</label>
<div class="col-sm-2">22</div>
</div>
<div class="form-group">
<label class="col-sm-2">添加时间</label>
<div class="col-sm-2">2015-01-11</div>
</div>
<div class="form-group">
<label class="col-sm-2">修改人</label>
<div class="col-sm-2">232</div>
</div>
<div class="form-group">
<label class="col-sm-2">修改时间</label>
<div class="col-sm-2">2015-06-12</div>
</div>
</div>
</div>
\ No newline at end of file
... ... @@ -101,7 +101,7 @@
<div class="form-group">
<label for="url" class="col-sm-2 control-label"> 链接</label>
<div class="col-sm-10">
<input type="text" name="" value="{url}" id="url" class="form-control" value="" required="required" pattern="" title="">
<input type="text" name="" value="{url}" id="url" class="form-control" value="" pattern="" title="">
</div>
</div>
</script>
... ...