Showing
1 changed file
with
61 additions
and
60 deletions
@@ -21,18 +21,6 @@ common.util.__ajax({ | @@ -21,18 +21,6 @@ common.util.__ajax({ | ||
21 | var edit = new common.edit2(".modal-body", { | 21 | var edit = new common.edit2(".modal-body", { |
22 | bucket: "yhb-img01" | 22 | bucket: "yhb-img01" |
23 | }); | 23 | }); |
24 | -//输入领券码验证 | ||
25 | -$(document).on("change", "#couponID", function () { | ||
26 | - var couponID = $(this).val(); | ||
27 | - common.util.__ajax({ | ||
28 | - url: "/coupon/batchCheckCoupons", | ||
29 | - async:false, | ||
30 | - data: { | ||
31 | - params: couponID | ||
32 | - } | ||
33 | - }, function () { | ||
34 | - }); | ||
35 | -}); | ||
36 | 24 | ||
37 | var Bll = { | 25 | var Bll = { |
38 | Brands: [], | 26 | Brands: [], |
@@ -55,12 +43,13 @@ var Bll = { | @@ -55,12 +43,13 @@ var Bll = { | ||
55 | button: [{ | 43 | button: [{ |
56 | value: "保存", | 44 | value: "保存", |
57 | callback: function () { | 45 | callback: function () { |
46 | + var couponFlag = true; | ||
58 | if (Validate[module.contentData.template_name]) { | 47 | if (Validate[module.contentData.template_name]) { |
59 | Validate[module.contentData.template_name].forEach(function (item) { | 48 | Validate[module.contentData.template_name].forEach(function (item) { |
60 | - edit.on("validate", item.fn(module.contentData)) | 49 | + couponFlag = item.fn(module.contentData); |
61 | }) | 50 | }) |
62 | } | 51 | } |
63 | - if (edit.validate()) { | 52 | + if (edit.validate() && couponFlag) { |
64 | //TODO | 53 | //TODO |
65 | if (resourceObj[module.contentData.template_name]) { | 54 | if (resourceObj[module.contentData.template_name]) { |
66 | resourceObj[module.contentData.template_name](module.contentData.data); | 55 | resourceObj[module.contentData.template_name](module.contentData.data); |
@@ -81,18 +70,18 @@ var Bll = { | @@ -81,18 +70,18 @@ var Bll = { | ||
81 | Bll.__editRender(); | 70 | Bll.__editRender(); |
82 | }, | 71 | }, |
83 | __editRender: function () { | 72 | __editRender: function () { |
84 | - $('.draggable').each(function() { | ||
85 | - if($(this).children().length) { | ||
86 | - $(this).sortable().bind('sortupdate', function() { | ||
87 | - var fn = new Function("Bll","return Bll.module.contentData." + $(this).data("array")); | 73 | + $('.draggable').each(function () { |
74 | + if ($(this).children().length) { | ||
75 | + $(this).sortable().bind('sortupdate', function () { | ||
76 | + var fn = new Function("Bll", "return Bll.module.contentData." + $(this).data("array")); | ||
88 | var arr = fn(Bll); | 77 | var arr = fn(Bll); |
89 | var arr2 = [];//拖拽后顺序 | 78 | var arr2 = [];//拖拽后顺序 |
90 | var itemsUpdate = $(this).children(); | 79 | var itemsUpdate = $(this).children(); |
91 | - if(itemsUpdate.length == arr.length) { | 80 | + if (itemsUpdate.length == arr.length) { |
92 | for (var i = 0; i < itemsUpdate.length; i++) { | 81 | for (var i = 0; i < itemsUpdate.length; i++) { |
93 | arr2.push($(itemsUpdate[i]).attr("drag-index")); | 82 | arr2.push($(itemsUpdate[i]).attr("drag-index")); |
94 | } | 83 | } |
95 | - for(var i = 0; i < arr.length; i++) { | 84 | + for (var i = 0; i < arr.length; i++) { |
96 | arr2[i] = arr[arr2[i]]; | 85 | arr2[i] = arr[arr2[i]]; |
97 | } | 86 | } |
98 | arr = arr2; | 87 | arr = arr2; |
@@ -107,7 +96,7 @@ var Bll = { | @@ -107,7 +96,7 @@ var Bll = { | ||
107 | Bll.module.contentData.data = common.util.__buildobj(names, '.', Bll.module.contentData.data, function (o, name) { | 96 | Bll.module.contentData.data = common.util.__buildobj(names, '.', Bll.module.contentData.data, function (o, name) { |
108 | o[name] = obj.data; | 97 | o[name] = obj.data; |
109 | }); | 98 | }); |
110 | - console.log( Bll.module.contentData.data ); | 99 | + console.log(Bll.module.contentData.data); |
111 | }); | 100 | }); |
112 | }, | 101 | }, |
113 | //获取品牌 | 102 | //获取品牌 |
@@ -181,7 +170,6 @@ var Bll = { | @@ -181,7 +170,6 @@ var Bll = { | ||
181 | } | 170 | } |
182 | }; | 171 | }; |
183 | 172 | ||
184 | - | ||
185 | /*第一步,基础模板*/ | 173 | /*第一步,基础模板*/ |
186 | Bll.__render("#content-list", "content-template", ViewModel); | 174 | Bll.__render("#content-list", "content-template", ViewModel); |
187 | Bll.__render(".contents", "template_content_btns", {btns: Button}); | 175 | Bll.__render(".contents", "template_content_btns", {btns: Button}); |
@@ -211,7 +199,6 @@ ViewModel.contentData.forEach(function (item, index) { | @@ -211,7 +199,6 @@ ViewModel.contentData.forEach(function (item, index) { | ||
211 | /*第三部解析楼层*/ | 199 | /*第三部解析楼层*/ |
212 | Bll.__render("#add-content", "template_content", {modules: Bll.contentDatas}); | 200 | Bll.__render("#add-content", "template_content", {modules: Bll.contentDatas}); |
213 | 201 | ||
214 | - | ||
215 | /*第四部 操作按钮 添加 删除 修改*/ | 202 | /*第四部 操作按钮 添加 删除 修改*/ |
216 | $(document).on("click", ".add_btn", function () { | 203 | $(document).on("click", ".add_btn", function () { |
217 | var item = Button[$(this).data("index")]; | 204 | var item = Button[$(this).data("index")]; |
@@ -220,6 +207,23 @@ $(document).on("click", ".add_btn", function () { | @@ -220,6 +207,23 @@ $(document).on("click", ".add_btn", function () { | ||
220 | Bll.toast(-1, Bll.module); | 207 | Bll.toast(-1, Bll.module); |
221 | }); | 208 | }); |
222 | 209 | ||
210 | +/*第五步 绑定监听事件*/ | ||
211 | +$(document).on("change", ".observe", function () { | ||
212 | + var $this = $(this); | ||
213 | + var name = $this.data("field"); | ||
214 | + Bll.module.contentData.data = common.util.__buildobj(name, '.', Bll.module.contentData.data, function (obj, name) { | ||
215 | + obj[name] = $this.val(); | ||
216 | + if (name == "image_style") { | ||
217 | + delete obj["default"]; | ||
218 | + delete obj["T1F2"]; | ||
219 | + delete obj["L1R2"]; | ||
220 | + delete obj["imageList"]; | ||
221 | + obj[obj[name]] = true; | ||
222 | + } | ||
223 | + }); | ||
224 | +}); | ||
225 | + | ||
226 | +/*删除*/ | ||
223 | $(document).on("click", ".del", function () {//删除 | 227 | $(document).on("click", ".del", function () {//删除 |
224 | var index = $(this).data("index"); | 228 | var index = $(this).data("index"); |
225 | common.dialog.confirm("警告", | 229 | common.dialog.confirm("警告", |
@@ -237,6 +241,8 @@ $(document).on("click", ".del", function () {//删除 | @@ -237,6 +241,8 @@ $(document).on("click", ".del", function () {//删除 | ||
237 | 241 | ||
238 | //$("#index_" + index).remove(); | 242 | //$("#index_" + index).remove(); |
239 | }); | 243 | }); |
244 | + | ||
245 | +/*编辑*/ | ||
240 | $(document).on("click", ".edit", function () { | 246 | $(document).on("click", ".edit", function () { |
241 | var index = $(this).data("index"); | 247 | var index = $(this).data("index"); |
242 | var item = Bll.contentDatas[index]; | 248 | var item = Bll.contentDatas[index]; |
@@ -244,34 +250,19 @@ $(document).on("click", ".edit", function () { | @@ -244,34 +250,19 @@ $(document).on("click", ".edit", function () { | ||
244 | Bll.toast(index, Bll.module); | 250 | Bll.toast(index, Bll.module); |
245 | }); | 251 | }); |
246 | 252 | ||
247 | -/*第五步 绑定监听事件*/ | ||
248 | -$(document).on("change", ".observe", function () { | ||
249 | - var $this = $(this); | ||
250 | - var name = $this.data("field"); | ||
251 | - Bll.module.contentData.data = common.util.__buildobj(name, '.', Bll.module.contentData.data, function (obj, name) { | ||
252 | - obj[name] = $this.val(); | ||
253 | - if (name == "image_style") { | ||
254 | - delete obj["default"]; | ||
255 | - delete obj["T1F2"]; | ||
256 | - delete obj["L1R2"]; | ||
257 | - delete obj["imageList"]; | ||
258 | - obj[obj[name]] = true; | ||
259 | - } | ||
260 | - }); | ||
261 | -}); | ||
262 | /*根据limit判断最多添加条数, 根据event判断添加的类型, data-event:template_name + "-template"*/ | 253 | /*根据limit判断最多添加条数, 根据event判断添加的类型, data-event:template_name + "-template"*/ |
263 | -$(document).on("click", ".addBtn", function() { | 254 | +$(document).on("click", ".addBtn", function () { |
264 | var length = $(this).data("limit"); | 255 | var length = $(this).data("limit"); |
265 | var arr = $(this).data("event").split("."); | 256 | var arr = $(this).data("event").split("."); |
266 | if (arr[1] == "data") { | 257 | if (arr[1] == "data") { |
267 | if (Bll.module.contentData.data.length >= length) { | 258 | if (Bll.module.contentData.data.length >= length) { |
268 | - common.util.__tip("最多"+ length +"条!","warning"); | 259 | + common.util.__tip("最多" + length + "条!", "warning"); |
269 | return; | 260 | return; |
270 | } | 261 | } |
271 | Bll.module.contentData.data.push(addObj[arr.join("_")]); | 262 | Bll.module.contentData.data.push(addObj[arr.join("_")]); |
272 | } else { | 263 | } else { |
273 | if (Bll.module.contentData.data[arr[1]].length >= length) { | 264 | if (Bll.module.contentData.data[arr[1]].length >= length) { |
274 | - common.util.__tip("最多"+ length +"条!","warning"); | 265 | + common.util.__tip("最多" + length + "条!", "warning"); |
275 | return; | 266 | return; |
276 | } | 267 | } |
277 | Bll.module.contentData.data[arr[1]].push(addObj[arr.join("_")]); | 268 | Bll.module.contentData.data[arr[1]].push(addObj[arr.join("_")]); |
@@ -283,7 +274,7 @@ $(document).on("click", ".addBtn", function() { | @@ -283,7 +274,7 @@ $(document).on("click", ".addBtn", function() { | ||
283 | $(document).on("click", ".delBtn", function () { | 274 | $(document).on("click", ".delBtn", function () { |
284 | var arr = $(this).data("event").split("."); | 275 | var arr = $(this).data("event").split("."); |
285 | var index = $(this).data("index"); | 276 | var index = $(this).data("index"); |
286 | - if(arr[1] == "data") { | 277 | + if (arr[1] == "data") { |
287 | Bll.module.contentData.data.splice(index, 1); | 278 | Bll.module.contentData.data.splice(index, 1); |
288 | } else { | 279 | } else { |
289 | Bll.module.contentData.data[arr[1]].splice(index, 1); | 280 | Bll.module.contentData.data[arr[1]].splice(index, 1); |
@@ -291,8 +282,19 @@ $(document).on("click", ".delBtn", function () { | @@ -291,8 +282,19 @@ $(document).on("click", ".delBtn", function () { | ||
291 | Bll.renderDialog(arr[0] + "-template"); | 282 | Bll.renderDialog(arr[0] + "-template"); |
292 | }); | 283 | }); |
293 | 284 | ||
294 | - | ||
295 | -$(document).on("change", ".chkbox", function() { | 285 | +//输入领券码验证 |
286 | +$(document).on("change", "#couponID", function () { | ||
287 | + var couponID = $(this).val(); | ||
288 | + common.util.__ajax({ | ||
289 | + url: "/coupon/batchCheckCoupons", | ||
290 | + async: false, | ||
291 | + data: { | ||
292 | + params: couponID | ||
293 | + } | ||
294 | + }, function () { | ||
295 | + }); | ||
296 | +}); | ||
297 | +$(document).on("change", ".chkbox", function () { | ||
296 | 298 | ||
297 | }); | 299 | }); |
298 | 300 | ||
@@ -362,6 +364,7 @@ $(document).on("click", '.is_show_name_brand', function () { | @@ -362,6 +364,7 @@ $(document).on("click", '.is_show_name_brand', function () { | ||
362 | Bll.renderDialog("brands-template"); | 364 | Bll.renderDialog("brands-template"); |
363 | }); | 365 | }); |
364 | 366 | ||
367 | +/*保存事件*/ | ||
365 | $(document).on("click", "#sub_btn", function () { | 368 | $(document).on("click", "#sub_btn", function () { |
366 | var data = { | 369 | var data = { |
367 | "content": {}, | 370 | "content": {}, |
@@ -372,7 +375,7 @@ $(document).on("click", "#sub_btn", function () { | @@ -372,7 +375,7 @@ $(document).on("click", "#sub_btn", function () { | ||
372 | var contentData = Bll.contentDatas[i].contentData; | 375 | var contentData = Bll.contentDatas[i].contentData; |
373 | var action; | 376 | var action; |
374 | var url; | 377 | var url; |
375 | - var goodsSrc="imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90"; | 378 | + var goodsSrc = "imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90"; |
376 | addSuffix(contentData); | 379 | addSuffix(contentData); |
377 | delete contentData.button_name; | 380 | delete contentData.button_name; |
378 | delete contentData.dialog; | 381 | delete contentData.dialog; |
@@ -390,22 +393,22 @@ $(document).on("click", "#sub_btn", function () { | @@ -390,22 +393,22 @@ $(document).on("click", "#sub_btn", function () { | ||
390 | } | 393 | } |
391 | //商品 | 394 | //商品 |
392 | if (contentData.template_name == "goods") { | 395 | if (contentData.template_name == "goods") { |
393 | - for(var j=0;j<contentData.data.length;j++){ | ||
394 | - if(contentData.data[j].src){ | ||
395 | - var a=contentData.data[j].src.split("?"); | ||
396 | - a[1]=goodsSrc; | ||
397 | - contentData.data[j].src= a.join("?"); | 396 | + for (var j = 0; j < contentData.data.length; j++) { |
397 | + if (contentData.data[j].src) { | ||
398 | + var a = contentData.data[j].src.split("?"); | ||
399 | + a[1] = goodsSrc; | ||
400 | + contentData.data[j].src = a.join("?"); | ||
398 | } | 401 | } |
399 | } | 402 | } |
400 | } | 403 | } |
401 | //商品组 | 404 | //商品组 |
402 | if (contentData.template_name == "goodsGroup") { | 405 | if (contentData.template_name == "goodsGroup") { |
403 | - for(var m=0;m<contentData.data.length;m++){ | ||
404 | - if(contentData.data[m].list){ | ||
405 | - for(var n=0;n<contentData.data[m].list.length;n++){ | ||
406 | - var b=contentData.data[m].list[n].src.split("?"); | ||
407 | - b[1]=goodsSrc; | ||
408 | - contentData.data[m].list[n].src= b.join("?"); | 406 | + for (var m = 0; m < contentData.data.length; m++) { |
407 | + if (contentData.data[m].list) { | ||
408 | + for (var n = 0; n < contentData.data[m].list.length; n++) { | ||
409 | + var b = contentData.data[m].list[n].src.split("?"); | ||
410 | + b[1] = goodsSrc; | ||
411 | + contentData.data[m].list[n].src = b.join("?"); | ||
409 | } | 412 | } |
410 | 413 | ||
411 | } | 414 | } |
@@ -440,9 +443,7 @@ var addSuffix = function (contentData) { | @@ -440,9 +443,7 @@ var addSuffix = function (contentData) { | ||
440 | } | 443 | } |
441 | } | 444 | } |
442 | return contentData; | 445 | return contentData; |
443 | -} | ||
444 | - | ||
445 | - | 446 | +}; |
446 | /****************************************************************************************************/ | 447 | /****************************************************************************************************/ |
447 | /*商品,商品组*/ | 448 | /*商品,商品组*/ |
448 | 449 | ||
@@ -566,7 +567,7 @@ $(document).on("click", ".goodsSelectBtn", function () { | @@ -566,7 +567,7 @@ $(document).on("click", ".goodsSelectBtn", function () { | ||
566 | //删除图片按钮 | 567 | //删除图片按钮 |
567 | $(document).on("click", ".removepic", function () { | 568 | $(document).on("click", ".removepic", function () { |
568 | Bll.module.contentData.data.splice($(this).data("index"), 1); | 569 | Bll.module.contentData.data.splice($(this).data("index"), 1); |
569 | - console.log("Bll.module.contentData.data",Bll.module.contentData.data); | 570 | + console.log("Bll.module.contentData.data", Bll.module.contentData.data); |
570 | $("#goodspic").html(common.util.__template2($("#template_dialog_goodsimgs").html(), { | 571 | $("#goodspic").html(common.util.__template2($("#template_dialog_goodsimgs").html(), { |
571 | datas: Bll.module.contentData.data | 572 | datas: Bll.module.contentData.data |
572 | })); | 573 | })); |
-
Please register or login to post a comment