Authored by mlge

Merge branch 'test6.8.6' of http://git.yoho.cn/platform/platform-cms into test6.8.6

... ... @@ -47,7 +47,7 @@
<dependency>
<groupId>com.yohobuy.platform</groupId>
<artifactId>platform-dal</artifactId>
<version>1.0.3-6.8.5-SNAPSHOT</version>
<version>1.0.3-6.8.6-SNAPSHOT</version>
</dependency>
</dependencies>
... ...
... ... @@ -60,7 +60,7 @@
<tr style="height: 20px">
<td >
<span style="color:red">*</span><label>选择图片</label>
<a id="addImage" class="btn-default" >选择图片+</a>
<a id="addImage" class="btn btn-primary" >选择图片+</a>
<input id="imgs" name="articleImages" hidden="hidden"/>
</td>
</tr>
... ... @@ -73,7 +73,7 @@
<tr style="height: 60px">
<td>
<label>关联商品</label> <br>
<a id="addSkn" class="btn-primary" onclick="getEditDialog()" style="font-size: 15px">选择商品+</a>
<a id="addSkn" class="btn btn-primary" onclick="getEditDialog()" style="font-size: 15px">选择商品+</a>
<input id="skns" name="articleSkns" hidden="hidden"/>
</td>
... ... @@ -87,7 +87,7 @@
</tr>
<tr>
<td valign="bottom">
<input id="subBotton" class="btn-primary" type="button" style="font-size: 20px; margin-top: 0px;margin-bottom: 0px;" value="保存"/>
<input id="subBotton" class="btn btn-primary" type="button" style="font-size: 20px; margin-top: 0px;margin-bottom: 0px;" value="保存"/>
</td>
</tr>
</table>
... ... @@ -114,12 +114,12 @@
selectOnNavigation : true,
valueField: 'text',
textField: 'value',
url : contextPath + "/grassArticle/platPublishUser",
url : serverContextPath + "/grassArticle/platPublishUser",
loadFilter: function (data) {
var list = [];
var obj = {};
debugger;
for (var i = 0; i < data.data.length; i++) {
var obj = {};
obj['text'] = data.data[i];
obj['value'] = data.data[i];
list.push(obj);
... ... @@ -184,7 +184,8 @@
if (data) {
data = $.parseJSON(data);
if (data.code == 200) {
alert('保存成功');
// $.messager.show({ title : "提示", msg : "成功!" });
alert("保存成功");
window.location.reload();
} else {
... ...
... ... @@ -23,8 +23,8 @@
</style>
</head>
<body class="easyui-layout" >
<div region="north" style="height: 200px;">
<body class="easyui-layout" fit="true" style="overflow-y: scroll" >
<div region="north" style="height: 20%;">
<script>
document.write(addHead('种草管理', '内容管理'));
</script>
... ... @@ -51,8 +51,8 @@
</div></div>
<div region="center" id="activityList" style="margin-left: 20px">
<table id="activityListTable"></table>
<div region="center" id="activityList" style="margin-left: 20px" >
<table id="activityListTable" ></table>
</div>
</body>
... ...