fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit 4e7c2f0162c65799ecf294bc0b3dd41f136e2932 1 parent 2159d005

4.6->修改分类管理host，修改drag元素会被弹窗顶下去的问题，修改资源分类部分字段为非必须

Inline Side-by-side
Showing 5 changed files with 22 additions and 18 deletions
@@ -87,7 +87,7 @@ drag.prototype = { @@ -87,7 +87,7 @@ drag.prototype = {
87 //数组排序后返回 87 //数组排序后返回
88 _self.getArry(_self.dragItemList); 88 _self.getArry(_self.dragItemList);
89 }else{ 89 }else{
90 - _self.move(obj,_self.dragItemPos[obj.index]); 90 + //_self.move(obj,_self.dragItemPos[obj.index]);
91 } 91 }
92 } 92 }
93 93
@@ -360,6 +360,8 @@ $(document).on("mouseover", ".dragItem1", function () { @@ -360,6 +360,8 @@ $(document).on("mouseover", ".dragItem1", function () {
360 drag.Initialize(); 360 drag.Initialize();
361 }); 361 });
362 $(document).on("mouseleave", ".dragItem1", function () { 362 $(document).on("mouseleave", ".dragItem1", function () {
  363 + document.onmousemove = null;
  364 + document.onmouseup = null;
363 new common.drag("#add-content").destroy(); 365 new common.drag("#add-content").destroy();
364 }); 366 });
365 367
@@ -72,7 +72,7 @@ var Bll = { @@ -72,7 +72,7 @@ var Bll = {
72 module.activities = res.data; 72 module.activities = res.data;
73 }, true); 73 }, true);
74 } else { 74 } else {
75 - delete module.activities; 75 + module.activities = [];
76 } 76 }
77 } 77 }
78 !!~index ? Bll.contentDatas[currIndex][index] = module : Bll.contentDatas[currIndex].push(module); 78 !!~index ? Bll.contentDatas[currIndex][index] = module : Bll.contentDatas[currIndex].push(module);
@@ -737,6 +737,8 @@ $(document).on("mouseover", "#add-content .dragItem", function () { @@ -737,6 +737,8 @@ $(document).on("mouseover", "#add-content .dragItem", function () {
737 }); 737 });
738 738
739 $(document).on("mouseleave", "#add-content .dragItem", function () { 739 $(document).on("mouseleave", "#add-content .dragItem", function () {
  740 + document.onmousemove = null;
  741 + document.onmouseup = null;
740 new common.drag("#add-content").destroy(); 742 new common.drag("#add-content").destroy();
741 }); 743 });
742 744
@@ -2,11 +2,11 @@ @@ -2,11 +2,11 @@
2 * Created by ty on 2016/5/26. 2 * Created by ty on 2016/5/26.
3 * 分类管理路由 3 * 分类管理路由
4 */ 4 */
5 -//exports.domain = require('../config/common.js').domain; 5 +exports.domain = require('../config/common.js').domain;
6 //exports.domain = 'http://172.16.6.115:8080/platform';//王伟 6 //exports.domain = 'http://172.16.6.115:8080/platform';//王伟
7 //exports.domain = 'http://192.168.102.216:8180/platform'; //测试环境 7 //exports.domain = 'http://192.168.102.216:8180/platform'; //测试环境
8 //exports.domain = 'http://172.16.6.231:8080/platform'; 8 //exports.domain = 'http://172.16.6.231:8080/platform';
9 -exports.domain = 'http://172.16.6.225:8080/platform'; 9 +//exports.domain = 'http://172.16.6.225:8080/platform';
10 //exports.domain = 'http://192.168.102.216:8086/platform'; 10 //exports.domain = 'http://192.168.102.216:8086/platform';
11 11
12 exports.res = [ 12 exports.res = [
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <tbody> 12 <tbody>
13 <tr> 13 <tr>
14 <td align="center">[[index+1]]</td> 14 <td align="center">[[index+1]]</td>
15 - <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="left.[[index]].src"/></td> 15 + <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="left.[[index]].src" required/></td>
16 <td> 16 <td>
17 <div class="form-group"> 17 <div class="form-group">
18 <div class="col-sm-10"> 18 <div class="col-sm-10">
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 </div> 23 </div>
24 <div class="form-group"> 24 <div class="form-group">
25 <div class="col-sm-10"> 25 <div class="col-sm-10">
26 - <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="left.[[index]].url.url"/> 26 + <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="left.[[index]].url.url"/>
27 </div> 27 </div>
28 </div> 28 </div>
29 </td> 29 </td>
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 <tbody> 86 <tbody>
87 <tr> 87 <tr>
88 <td align="center">[[index+1]]</td> 88 <td align="center">[[index+1]]</td>
89 - <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="[[index]].src"/></td> 89 + <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="[[index]].src" required/></td>
90 <td> 90 <td>
91 <div class="form-group"> 91 <div class="form-group">
92 <div class="col-sm-10"> 92 <div class="col-sm-10">
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 </div> 97 </div>
98 <div class="form-group"> 98 <div class="form-group">
99 <div class="col-sm-10"> 99 <div class="col-sm-10">
100 - <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="[[index]].url.url"/> 100 + <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="[[index]].url.url"/>
101 </div> 101 </div>
102 </div> 102 </div>
103 </td> 103 </td>
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 <div class="form-group"> 126 <div class="form-group">
127 <label class="col-sm-2">导航名称(PC):</label> 127 <label class="col-sm-2">导航名称(PC):</label>
128 <div class="col-sm-5"> 128 <div class="col-sm-5">
129 - <input type="text" value="[[item.navigateNamePC]]" class="form-control observe" data-field="categoryList.[[index]].navigateNamePC"> 129 + <input type="text" value="[[item.navigateNamePC]]" class="form-control observe" data-field="categoryList.[[index]].navigateNamePC" required>
130 </div> 130 </div>
131 <label class="col-sm-2">导航图片(APP)</label> 131 <label class="col-sm-2">导航图片(APP)</label>
132 <input type="file" name="file" value="[[item.navigateImageSrcApp]]" class="observe" data-field="categoryList.[[index]].navigateImageSrcApp"/> 132 <input type="file" name="file" value="[[item.navigateImageSrcApp]]" class="observe" data-field="categoryList.[[index]].navigateImageSrcApp"/>
@@ -166,11 +166,11 @@ @@ -166,11 +166,11 @@
166 <li> 166 <li>
167 <div class="form-group"> 167 <div class="form-group">
168 <label>品类名称：</label> 168 <label>品类名称：</label>
169 - <input type="text" placeholder="品类名称" value="[[item.categoryName]]" class="observe" data-field="[[index]].categoryName" required="required"> 169 + <input type="text" placeholder="品类名称" value="[[item.categoryName]]" class="observe" data-field="[[index]].categoryName" required>
170 <select name="goTo" class="observe" value="[[item.url.action]]" data-field="[[index]].url.action"> 170 <select name="goTo" class="observe" value="[[item.url.action]]" data-field="[[index]].url.action">
171 [[layout action_template]] 171 [[layout action_template]]
172 </select> 172 </select>
173 - <input type="text" placeholder="url" value="[[item.url.url]]" data-field="[[index]].url.url" class="observe" required="required"/> 173 + <input type="text" placeholder="url" value="[[item.url.url]]" data-field="[[index]].url.url" class="observe"/>
174 <a type="button" class="btn btn-danger btn-xs delBtn" data-event="textNav.data" data-index="[[index]]">删除</a> 174 <a type="button" class="btn btn-danger btn-xs delBtn" data-event="textNav.data" data-index="[[index]]">删除</a>
175 </div> 175 </div>
176 </li> 176 </li>
@@ -183,7 +183,7 @@ @@ -183,7 +183,7 @@
183 <div class="form-group"> 183 <div class="form-group">
184 <div class="col-sm-6"> 184 <div class="col-sm-6">
185 <label>标题:</label>&emsp;&emsp; 185 <label>标题:</label>&emsp;&emsp;
186 - <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name"> 186 + <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name" required>
187 </div> 187 </div>
188 <div class="col-sm-6"> 188 <div class="col-sm-6">
189 <label>更多名称:</label> 189 <label>更多名称:</label>
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 <div class="form-group"> 220 <div class="form-group">
221 <div class="col-sm-6"> 221 <div class="col-sm-6">
222 <label>标题:</label>&emsp;&emsp; 222 <label>标题:</label>&emsp;&emsp;
223 - <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name"> 223 + <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name" required>
224 </div> 224 </div>
225 <div class="col-sm-6"> 225 <div class="col-sm-6">
226 <label>更多名称:</label> 226 <label>更多名称:</label>
@@ -252,7 +252,7 @@ @@ -252,7 +252,7 @@
252 <tbody> 252 <tbody>
253 <tr> 253 <tr>
254 <td align="center">[[index+1]]</td> 254 <td align="center">[[index+1]]</td>
255 - <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="image.[[index]].src"/></td> 255 + <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="image.[[index]].src" required/></td>
256 <td> 256 <td>
257 <div class="form-group"> 257 <div class="form-group">
258 <div class="col-sm-10"> 258 <div class="col-sm-10">
@@ -263,7 +263,7 @@ @@ -263,7 +263,7 @@
263 </div> 263 </div>
264 <div class="form-group"> 264 <div class="form-group">
265 <div class="col-sm-10"> 265 <div class="col-sm-10">
266 - <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="image.[[index]].url.url"/> 266 + <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="image.[[index]].url.url"/>
267 </div> 267 </div>
268 </div> 268 </div>
269 </td> 269 </td>
@@ -279,7 +279,7 @@ @@ -279,7 +279,7 @@
279 <div class="form-group"> 279 <div class="form-group">
280 <div class="col-sm-6"> 280 <div class="col-sm-6">
281 <label>标题:</label>&emsp;&emsp; 281 <label>标题:</label>&emsp;&emsp;
282 - <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name"> 282 + <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name" required>
283 </div> 283 </div>
284 <div class="col-sm-6"> 284 <div class="col-sm-6">
285 <label>更多名称:</label> 285 <label>更多名称:</label>
@@ -305,7 +305,7 @@ @@ -305,7 +305,7 @@
305 <tbody> 305 <tbody>
306 <tr> 306 <tr>
307 <td align="center">[[index+1]]</td> 307 <td align="center">[[index+1]]</td>
308 - <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src"/></td> 308 + <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src" required/></td>
309 <td> 309 <td>
310 <div class="form-group"> 310 <div class="form-group">
311 <div class="col-sm-10"> 311 <div class="col-sm-10">
@@ -316,7 +316,7 @@ @@ -316,7 +316,7 @@
316 </div> 316 </div>
317 <div class="form-group"> 317 <div class="form-group">
318 <div class="col-sm-10"> 318 <div class="col-sm-10">
319 - <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="list.[[index]].url.url"/> 319 + <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="list.[[index]].url.url"/>
320 </div> 320 </div>
321 </div> 321 </div>
322 </td> 322 </td>