fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit 011794323104b1f2a34db7af67a7cddac5cbb8ab 2 parents 9494c8db 079c3645

Merge branch 'feature/feature_v4.6_20160525' into yohobuy_portal_dev_v4.6_20160601

Inline Side-by-side
Showing 5 changed files with 22 additions and 18 deletions
... ... @@ -87,7 +87,7 @@ drag.prototype = {
//数组排序后返回
_self.getArry(_self.dragItemList);
}else{
_self.move(obj,_self.dragItemPos[obj.index]);
//_self.move(obj,_self.dragItemPos[obj.index]);
}
}
... ...
... ... @@ -364,6 +364,8 @@ $(document).on("mouseover", ".dragItem1", function () {
drag.Initialize();
});
$(document).on("mouseleave", ".dragItem1", function () {
document.onmousemove = null;
document.onmouseup = null;
new common.drag("#add-content").destroy();
});
... ...
... ... @@ -72,7 +72,7 @@ var Bll = {
module.activities = res.data;
}, true);
} else {
delete module.activities;
module.activities = [];
}
}
!!~index ? Bll.contentDatas[currIndex][index] = module : Bll.contentDatas[currIndex].push(module);
... ... @@ -764,6 +764,8 @@ $(document).on("mouseover", "#add-content .dragItem", function () {
});
$(document).on("mouseleave", "#add-content .dragItem", function () {
document.onmousemove = null;
document.onmouseup = null;
new common.drag("#add-content").destroy();
});
... ...
... ... @@ -2,11 +2,11 @@
* Created by ty on 2016/5/26.
* 分类管理路由
*/
//exports.domain = require('../config/common.js').domain;
exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://172.16.6.115:8080/platform';//王伟
//exports.domain = 'http://192.168.102.216:8180/platform'; //测试环境
//exports.domain = 'http://172.16.6.231:8080/platform';
exports.domain = 'http://172.16.6.225:8080/platform';
//exports.domain = 'http://172.16.6.225:8080/platform';
//exports.domain = 'http://192.168.102.216:8086/platform';
exports.res = [
... ...
... ... @@ -12,7 +12,7 @@
<tbody>
<tr>
<td align="center">[[index+1]]</td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="left.[[index]].src"/></td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="left.[[index]].src" required/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
... ... @@ -23,7 +23,7 @@
</div>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="left.[[index]].url.url"/>
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="left.[[index]].url.url"/>
</div>
</div>
</td>
... ... @@ -86,7 +86,7 @@
<tbody>
<tr>
<td align="center">[[index+1]]</td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="[[index]].src"/></td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="[[index]].src" required/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
... ... @@ -97,7 +97,7 @@
</div>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="[[index]].url.url"/>
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="[[index]].url.url"/>
</div>
</div>
</td>
... ... @@ -126,7 +126,7 @@
<div class="form-group">
<label class="col-sm-2">导航名称(PC):</label>
<div class="col-sm-5">
<input type="text" value="[[item.navigateNamePC]]" class="form-control observe" data-field="categoryList.[[index]].navigateNamePC">
<input type="text" value="[[item.navigateNamePC]]" class="form-control observe" data-field="categoryList.[[index]].navigateNamePC" required>
</div>
<label class="col-sm-2">导航图片(APP)</label>
<input type="file" name="file" value="[[item.navigateImageSrcApp]]" class="observe" data-field="categoryList.[[index]].navigateImageSrcApp"/>
... ... @@ -166,11 +166,11 @@
<li>
<div class="form-group">
<label>品类名称：</label>
<input type="text" placeholder="品类名称" value="[[item.categoryName]]" class="observe" data-field="[[index]].categoryName" required="required">
<input type="text" placeholder="品类名称" value="[[item.categoryName]]" class="observe" data-field="[[index]].categoryName" required>
<select name="goTo" class="observe" value="[[item.url.action]]" data-field="[[index]].url.action">
[[layout action_template]]
</select>
<input type="text" placeholder="url" value="[[item.url.url]]" data-field="[[index]].url.url" class="observe" required="required"/>
<input type="text" placeholder="url" value="[[item.url.url]]" data-field="[[index]].url.url" class="observe"/>
<a type="button" class="btn btn-danger btn-xs delBtn" data-event="textNav.data" data-index="[[index]]">删除</a>
</div>
</li>
... ... @@ -183,7 +183,7 @@
<div class="form-group">
<div class="col-sm-6">
<label>标题:</label>&emsp;&emsp;
<input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name">
<input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name" required>
</div>
<div class="col-sm-6">
<label>更多名称:</label>
... ... @@ -220,7 +220,7 @@
<div class="form-group">
<div class="col-sm-6">
<label>标题:</label>&emsp;&emsp;
<input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name">
<input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name" required>
</div>
<div class="col-sm-6">
<label>更多名称:</label>
... ... @@ -252,7 +252,7 @@
<tbody>
<tr>
<td align="center">[[index+1]]</td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="image.[[index]].src"/></td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="image.[[index]].src" required/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
... ... @@ -263,7 +263,7 @@
</div>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="image.[[index]].url.url"/>
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="image.[[index]].url.url"/>
</div>
</div>
</td>
... ... @@ -279,7 +279,7 @@
<div class="form-group">
<div class="col-sm-6">
<label>标题:</label>&emsp;&emsp;
<input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name">
<input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name" required>
</div>
<div class="col-sm-6">
<label>更多名称:</label>
... ... @@ -305,7 +305,7 @@
<tbody>
<tr>
<td align="center">[[index+1]]</td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src"/></td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src" required/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
... ... @@ -316,7 +316,7 @@
</div>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="list.[[index]].url.url"/>
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="list.[[index]].url.url"/>
</div>
</div>
</td>
... ...