fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 姜敏
Commit d76aee1770e3b819b9d95007d4b8671ddd313128 1 parent d0f3801e

4.5资源位部分合并到4.3版本中

Inline Side-by-side
Showing 5 changed files with 171 additions and 71 deletions
1 var Button = [ 1 var Button = [
2 { 2 {
3 - button_name:"文本",  
4 - dialog:"template_dialog_text", 3 + button_name: "文本",
  4 + dialog: "template_dialog_text",
5 data: {text: ""}, 5 data: {text: ""},
6 template_name: "text" 6 template_name: "text"
7 }, 7 },
8 { 8 {
9 template_intro: "一张图片", 9 template_intro: "一张图片",
10 - button_name:"一张图",  
11 - dialog:"template_dialog_grid", 10 + button_name: "一张图",
  11 + dialog: "template_dialog_grid",
12 template_name: "singleImage", 12 template_name: "singleImage",
13 data: [{ 13 data: [{
14 "url": { 14 "url": {
@@ -21,9 +21,9 @@ var Button = [ @@ -21,9 +21,9 @@ var Button = [
21 }] 21 }]
22 }, 22 },
23 { 23 {
24 - button_name:"添加小图", 24 + button_name: "添加小图",
25 template_name: "smallPic", 25 template_name: "smallPic",
26 - dialog:"template_dialog_grid", 26 + dialog: "template_dialog_grid",
27 data: [{ 27 data: [{
28 "url": { 28 "url": {
29 "action": "", 29 "action": "",
@@ -44,8 +44,8 @@ var Button = [ @@ -44,8 +44,8 @@ var Button = [
44 }, 44 },
45 { 45 {
46 template_intro: "焦点图", 46 template_intro: "焦点图",
47 - button_name:"焦点图",  
48 - dialog:"focus-template", 47 + button_name: "焦点图",
  48 + dialog: "focus-template",
49 template_name: "focus", 49 template_name: "focus",
50 data: [ 50 data: [
51 { 51 {
@@ -59,9 +59,9 @@ var Button = [ @@ -59,9 +59,9 @@ var Button = [
59 }, 59 },
60 { 60 {
61 template_intro: "添加商品", 61 template_intro: "添加商品",
62 - button_name:"添加商品", 62 + button_name: "添加商品",
63 template_name: "goods", 63 template_name: "goods",
64 - dialog:"template_dialog_goods", 64 + dialog: "template_dialog_goods",
65 data: [ 65 data: [
66 // { 66 // {
67 // src:"", 67 // src:"",
@@ -71,9 +71,9 @@ var Button = [ @@ -71,9 +71,9 @@ var Button = [
71 }, 71 },
72 { 72 {
73 template_intro: "添加商品组", 73 template_intro: "添加商品组",
74 - button_name:"添加商品组", 74 + button_name: "添加商品组",
75 template_name: "goodsGroup", 75 template_name: "goodsGroup",
76 - dialog:"template_dialog_remgoods", 76 + dialog: "template_dialog_remgoods",
77 data: [ 77 data: [
78 { 78 {
79 cover: {cover: "", maxSortId: ""}, 79 cover: {cover: "", maxSortId: ""},
@@ -89,9 +89,10 @@ var Button = [ @@ -89,9 +89,10 @@ var Button = [
89 }, 89 },
90 { 90 {
91 "template_name": "appIconList", 91 "template_name": "appIconList",
92 - button_name:"图标入口", 92 + button_name: "图标入口",
93 "template_intro": "图标", 93 "template_intro": "图标",
94 - dialog:"icon-template", 94 + "number": 4,
  95 + dialog: "icon-template",
95 "data": [ 96 "data": [
96 { 97 {
97 "url": { 98 "url": {
@@ -105,10 +106,10 @@ var Button = [ @@ -105,10 +106,10 @@ var Button = [
105 ] 106 ]
106 }, 107 },
107 { 108 {
108 - button_name:"推荐(1T-1L-4R)", 109 + button_name: "推荐(1T-1L-4R)",
109 template_intro: "一张大图一个大的推荐和4个小图推荐", 110 template_intro: "一张大图一个大的推荐和4个小图推荐",
110 template_name: "recommendContentOne", 111 template_name: "recommendContentOne",
111 - dialog:"recommendContentOne-template", 112 + dialog: "recommendContentOne-template",
112 "data": { 113 "data": {
113 "title": { 114 "title": {
114 "name": "", 115 "name": "",
@@ -144,7 +145,7 @@ var Button = [ @@ -144,7 +145,7 @@ var Button = [
144 button_name: "推荐(1T-6F)", 145 button_name: "推荐(1T-6F)",
145 template_name: "recommendContentTwo", 146 template_name: "recommendContentTwo",
146 template_intro: "一张大图和6个小图推荐", 147 template_intro: "一张大图和6个小图推荐",
147 - dialog:"recommendContentTwo-template", 148 + dialog: "recommendContentTwo-template",
148 "data": { 149 "data": {
149 "title": { 150 "title": {
150 "name": "", 151 "name": "",
@@ -180,7 +181,7 @@ var Button = [ @@ -180,7 +181,7 @@ var Button = [
180 button_name: "标题广告", 181 button_name: "标题广告",
181 "template_name": "singleNameImage", 182 "template_name": "singleNameImage",
182 "template_intro": "带标题的图片广告", 183 "template_intro": "带标题的图片广告",
183 - dialog:"singleNameImage-template", 184 + dialog: "singleNameImage-template",
184 "data": { 185 "data": {
185 "title": "", 186 "title": "",
186 "src": "", 187 "src": "",
@@ -195,7 +196,7 @@ var Button = [ @@ -195,7 +196,7 @@ var Button = [
195 button_name: "推荐(1T-12F)", 196 button_name: "推荐(1T-12F)",
196 template_intro: "一张大图12个小图推荐", 197 template_intro: "一张大图12个小图推荐",
197 template_name: "recommendContentThree", 198 template_name: "recommendContentThree",
198 - dialog:"recommendContentThree-template", 199 + dialog: "recommendContentThree-template",
199 "data": { 200 "data": {
200 "big_image": [ 201 "big_image": [
201 { 202 {
@@ -223,34 +224,42 @@ var Button = [ @@ -223,34 +224,42 @@ var Button = [
223 button_name: "潮人搭配", 224 button_name: "潮人搭配",
224 template_intro: "潮人搭配", 225 template_intro: "潮人搭配",
225 template_name: "trendsetterCollocation", 226 template_name: "trendsetterCollocation",
226 - dialog:"noEdit-template", 227 + dialog: "noEdit-template",
227 data: {} 228 data: {}
228 }, 229 },
229 { 230 {
230 button_name: "潮品话题", 231 button_name: "潮品话题",
231 template_intro: "潮品话题", 232 template_intro: "潮品话题",
232 template_name: "trendgoodsTopic", 233 template_name: "trendgoodsTopic",
233 - dialog:"noEdit-template", 234 + dialog: "noEdit-template",
234 data: {} 235 data: {}
235 }, 236 },
236 { 237 {
237 button_name: "推荐品牌", 238 button_name: "推荐品牌",
238 template_intro: "推荐品牌", 239 template_intro: "推荐品牌",
239 template_name: "appHotBrands", 240 template_name: "appHotBrands",
240 - dialog:"brands-template", 241 + dialog: "brands-template",
241 "data": { 242 "data": {
242 "title": { 243 "title": {
243 "title": "" 244 "title": ""
244 }, 245 },
245 "is_show_name": "N", 246 "is_show_name": "N",
246 - "list": [] 247 + "list": [],
  248 + "image": {
  249 + "src": "",
  250 + "alt": "",
  251 + "url": {
  252 + "action": "",
  253 + "url": ""
  254 + }
  255 + }
247 } 256 }
248 }, 257 },
249 { 258 {
250 button_name: "自定义品牌", 259 button_name: "自定义品牌",
251 template_intro: "自定义品牌", 260 template_intro: "自定义品牌",
252 template_name: "customBrands", 261 template_name: "customBrands",
253 - dialog:"brands-template", 262 + dialog: "brands-template",
254 "data": { 263 "data": {
255 "title": { 264 "title": {
256 "title": "", 265 "title": "",
@@ -264,7 +273,7 @@ var Button = [ @@ -264,7 +273,7 @@ var Button = [
264 button_name: "一个链接", 273 button_name: "一个链接",
265 template_intro: "一个链接", 274 template_intro: "一个链接",
266 template_name: "link", 275 template_name: "link",
267 - dialog:"template_dialog_link", 276 + dialog: "template_dialog_link",
268 data: [ 277 data: [
269 {"url": {"action": "", "url": ""}} 278 {"url": {"action": "", "url": ""}}
270 ] 279 ]
@@ -273,7 +282,7 @@ var Button = [ @@ -273,7 +282,7 @@ var Button = [
273 button_name: "添加促销", 282 button_name: "添加促销",
274 template_intro: "促销专区", 283 template_intro: "促销专区",
275 template_name: "promotion", 284 template_name: "promotion",
276 - dialog:"promotion-template", 285 + dialog: "promotion-template",
277 data: { 286 data: {
278 "promotionId": "" 287 "promotionId": ""
279 } 288 }
@@ -282,7 +291,7 @@ var Button = [ @@ -282,7 +291,7 @@ var Button = [
282 button_name: "轮播banner", 291 button_name: "轮播banner",
283 template_intro: "轮播banner", 292 template_intro: "轮播banner",
284 template_name: "carouselBanner", 293 template_name: "carouselBanner",
285 - dialog:"carouselBanner-template", 294 + dialog: "carouselBanner-template",
286 "data": { 295 "data": {
287 "speed": "", 296 "speed": "",
288 "list": [ 297 "list": [
@@ -297,7 +306,7 @@ var Button = [ @@ -297,7 +306,7 @@ var Button = [
297 button_name: "kids推荐品牌", 306 button_name: "kids推荐品牌",
298 template_intro: "kids推荐品牌", 307 template_intro: "kids推荐品牌",
299 template_name: "kidsBrands", 308 template_name: "kidsBrands",
300 - dialog:"brands-template", 309 + dialog: "brands-template",
301 "data": { 310 "data": {
302 "params": { 311 "params": {
303 "param": "", 312 "param": "",
@@ -316,7 +325,7 @@ var Button = [ @@ -316,7 +325,7 @@ var Button = [
316 button_name: "推荐(L1-RT1-RF2)", 325 button_name: "推荐(L1-RT1-RF2)",
317 template_intro: "推荐(L1-RT1-RF2)", 326 template_intro: "推荐(L1-RT1-RF2)",
318 template_name: "recommendContentFour", 327 template_name: "recommendContentFour",
319 - dialog:"recommendContentFour-template", 328 + dialog: "recommendContentFour-template",
320 "data": { 329 "data": {
321 "left": { 330 "left": {
322 "title": "", 331 "title": "",
@@ -366,7 +375,7 @@ var Button = [ @@ -366,7 +375,7 @@ var Button = [
366 button_name: "添加楼层", 375 button_name: "添加楼层",
367 template_intro: "添加楼层", 376 template_intro: "添加楼层",
368 template_name: "addfloor", 377 template_name: "addfloor",
369 - dialog:"icon-template", 378 + dialog: "icon-template",
370 data: [ 379 data: [
371 { 380 {
372 "url": {}, 381 "url": {},
@@ -381,7 +390,7 @@ var Button = [ @@ -381,7 +390,7 @@ var Button = [
381 button_name: "推荐(标题 + 12张图)", 390 button_name: "推荐(标题 + 12张图)",
382 template_intro: "带标题的12个小图推荐", 391 template_intro: "带标题的12个小图推荐",
383 template_name: "recommendContentFive", 392 template_name: "recommendContentFive",
384 - dialog:"recommendContentFive-template", 393 + dialog: "recommendContentFive-template",
385 data: { 394 data: {
386 "title": { 395 "title": {
387 "title": "", 396 "title": "",
@@ -403,13 +412,13 @@ var Button = [ @@ -403,13 +412,13 @@ var Button = [
403 button_name: "文本导航", 412 button_name: "文本导航",
404 template_intro: "文本链接", 413 template_intro: "文本链接",
405 template_name: "textNav", 414 template_name: "textNav",
406 - dialog:"textNav-template", 415 + dialog: "textNav-template",
407 data: [] 416 data: []
408 }, 417 },
409 { 418 {
410 - button_name:"图片列表", 419 + button_name: "图片列表",
411 template_name: "imageList", 420 template_name: "imageList",
412 - dialog:"imageList-template", 421 + dialog: "imageList-template",
413 "data": { 422 "data": {
414 "title": { 423 "title": {
415 "title": "", 424 "title": "",
@@ -420,10 +429,10 @@ var Button = [ @@ -420,10 +429,10 @@ var Button = [
420 } 429 }
421 }, 430 },
422 { 431 {
423 - button_name:"标题标签", 432 + button_name: "标题标签",
424 template_intro: "标题标签", 433 template_intro: "标题标签",
425 template_name: "title", 434 template_name: "title",
426 - dialog:"title-template", 435 + dialog: "title-template",
427 "data": { 436 "data": {
428 "title_name": "", 437 "title_name": "",
429 "more_name": "", 438 "more_name": "",
@@ -443,10 +452,10 @@ var Button = [ @@ -443,10 +452,10 @@ var Button = [
443 } 452 }
444 }, 453 },
445 { 454 {
446 - button_name:"编辑推荐", 455 + button_name: "编辑推荐",
447 template_intro: "编辑推荐", 456 template_intro: "编辑推荐",
448 template_name: "editorTalk", 457 template_name: "editorTalk",
449 - dialog:"editorTalk-template", 458 + dialog: "editorTalk-template",
450 "data": { 459 "data": {
451 "title": { 460 "title": {
452 "title": "", 461 "title": "",
@@ -456,10 +465,10 @@ var Button = [ @@ -456,10 +465,10 @@ var Button = [
456 } 465 }
457 }, 466 },
458 { 467 {
459 - button_name:"热门品类", 468 + button_name: "热门品类",
460 template_intro: "热门品类", 469 template_intro: "热门品类",
461 template_name: "hotCategory", 470 template_name: "hotCategory",
462 - dialog:"hotCategory-template", 471 + dialog: "hotCategory-template",
463 "data": { 472 "data": {
464 "title": { 473 "title": {
465 "name": "", 474 "name": "",
@@ -560,10 +569,10 @@ var Button = [ @@ -560,10 +569,10 @@ var Button = [
560 } 569 }
561 }, 570 },
562 { 571 {
563 - button_name:"有序焦点", 572 + button_name: "有序焦点",
564 template_intro: "三张左图两张右图多张中间图", 573 template_intro: "三张左图两张右图多张中间图",
565 template_name: "debrisSlider", 574 template_name: "debrisSlider",
566 - dialog:"debrisSlider-template", 575 + dialog: "debrisSlider-template",
567 "data": { 576 "data": {
568 "big_image": [ 577 "big_image": [
569 { 578 {
@@ -580,10 +589,10 @@ var Button = [ @@ -580,10 +589,10 @@ var Button = [
580 } 589 }
581 }, 590 },
582 { 591 {
583 - button_name:"新人专享", 592 + button_name: "新人专享",
584 template_intro: "新人专享", 593 template_intro: "新人专享",
585 template_name: "newUserFloor", 594 template_name: "newUserFloor",
586 - dialog:"newUserFloor-template", 595 + dialog: "newUserFloor-template",
587 data: { 596 data: {
588 "title": { 597 "title": {
589 "name": "", 598 "name": "",
@@ -607,10 +616,10 @@ var Button = [ @@ -607,10 +616,10 @@ var Button = [
607 } 616 }
608 }, 617 },
609 { 618 {
610 - button_name:"图片广告", 619 + button_name: "图片广告",
611 template_intro: "带标题的图片广告", 620 template_intro: "带标题的图片广告",
612 template_name: "imageGroup", 621 template_name: "imageGroup",
613 - dialog:"imageGroup-template", 622 + dialog: "imageGroup-template",
614 data: { 623 data: {
615 "title": "", 624 "title": "",
616 "more": "", 625 "more": "",
@@ -630,10 +639,10 @@ var Button = [ @@ -630,10 +639,10 @@ var Button = [
630 } 639 }
631 }, 640 },
632 { 641 {
633 - button_name:"自定义参数", 642 + button_name: "自定义参数",
634 template_intro: "参数集合", 643 template_intro: "参数集合",
635 template_name: "paramsGroup", 644 template_name: "paramsGroup",
636 - dialog:"paramsGroup-template", 645 + dialog: "paramsGroup-template",
637 data: { 646 data: {
638 "title": "", 647 "title": "",
639 "more": "", 648 "more": "",
@@ -647,23 +656,23 @@ var Button = [ @@ -647,23 +656,23 @@ var Button = [
647 } 656 }
648 }, 657 },
649 { 658 {
650 - button_name:"自定义参数图片", 659 + button_name: "自定义参数图片",
651 template_intro: "自定义参数图片", 660 template_intro: "自定义参数图片",
652 template_name: "", 661 template_name: "",
653 - dialog:"noEdit-template", 662 + dialog: "noEdit-template",
654 data: {} 663 data: {}
655 }, 664 },
656 { 665 {
657 - button_name:"站内公告", 666 + button_name: "站内公告",
658 template_intro: "站内公告", 667 template_intro: "站内公告",
659 template_name: "announcement", 668 template_name: "announcement",
660 - dialog:"noEdit-template" 669 + dialog: "noEdit-template"
661 }, 670 },
662 { 671 {
663 - button_name:"标题图片", 672 + button_name: "标题图片",
664 template_intro: "标题图片", 673 template_intro: "标题图片",
665 template_name: "titleImage", 674 template_name: "titleImage",
666 - dialog:"titleImage-template", 675 + dialog: "titleImage-template",
667 data: { 676 data: {
668 "title": "", 677 "title": "",
669 "more_name": "", 678 "more_name": "",
@@ -681,10 +690,10 @@ var Button = [ @@ -681,10 +690,10 @@ var Button = [
681 } 690 }
682 }, 691 },
683 { 692 {
684 - button_name:"多标签图片", 693 + button_name: "多标签图片",
685 template_intro: "多标签图片", 694 template_intro: "多标签图片",
686 template_name: "multiLabelImage", 695 template_name: "multiLabelImage",
687 - dialog:"multiLabelImage-template", 696 + dialog: "multiLabelImage-template",
688 data: { 697 data: {
689 "label": [ 698 "label": [
690 { 699 {
@@ -707,10 +716,10 @@ var Button = [ @@ -707,10 +716,10 @@ var Button = [
707 } 716 }
708 }, 717 },
709 { 718 {
710 - button_name:"搭配（2T-nF)", 719 + button_name: "搭配（2T-nF)",
711 template_intro: "搭配（2T-nF)", 720 template_intro: "搭配（2T-nF)",
712 template_name: "matchImage", 721 template_name: "matchImage",
713 - dialog:"matchImage-template", 722 + dialog: "matchImage-template",
714 data: { 723 data: {
715 "title": { 724 "title": {
716 "name": "", 725 "name": "",
@@ -762,10 +771,10 @@ var Button = [ @@ -762,10 +771,10 @@ var Button = [
762 } 771 }
763 }, 772 },
764 { 773 {
765 - button_name:"领券频道", 774 + button_name: "领券频道",
766 "template_name": "getCoupon", 775 "template_name": "getCoupon",
767 "template_intro": "领券频道", 776 "template_intro": "领券频道",
768 - dialog:"getCoupon-template", 777 + dialog: "getCoupon-template",
769 "data": [ 778 "data": [
770 { 779 {
771 "title": "标题内容", 780 "title": "标题内容",
@@ -239,6 +239,26 @@ ViewModel.contentData.forEach(function (item, index) { @@ -239,6 +239,26 @@ ViewModel.contentData.forEach(function (item, index) {
239 item.contentData.data.more_link.action = JSON.parse(temp).action || ""; 239 item.contentData.data.more_link.action = JSON.parse(temp).action || "";
240 item.contentData.data.more_link.url = JSON.parse(temp).url || ""; 240 item.contentData.data.more_link.url = JSON.parse(temp).url || "";
241 } 241 }
  242 + //推荐品牌默认加一张图片
  243 + if (item.contentData.template_name == 'appHotBrands') {
  244 + if (!item.contentData.data.image) {
  245 + item.contentData.data.image = {};
  246 + item.contentData.data.image = {
  247 + "src": "",
  248 + "alt": "",
  249 + "url": {
  250 + "action": "",
  251 + "url": ""
  252 + }
  253 + }
  254 + }
  255 + }
  256 + //默认图标一行4个
  257 + if (item.contentData.template_name == 'appIconList') {
  258 + if (!item.contentData.number) {
  259 + item.contentData.number = 4;
  260 + }
  261 + }
242 item.contentData = JSON.stringify(item.contentData); 262 item.contentData = JSON.stringify(item.contentData);
243 item.contentData = item.contentData.replace(/(gif|png|jpg|jpeg)\?[^"]*/g, '$1'); 263 item.contentData = item.contentData.replace(/(gif|png|jpg|jpeg)\?[^"]*/g, '$1');
244 item.contentData = common.util.__ObjToArray(JSON.parse(item.contentData)); 264 item.contentData = common.util.__ObjToArray(JSON.parse(item.contentData));
@@ -425,6 +445,11 @@ $(document).on("click", '.is_show_name_brand', function () { @@ -425,6 +445,11 @@ $(document).on("click", '.is_show_name_brand', function () {
425 Bll.module.contentData.data.is_show_name = $(this).val(); 445 Bll.module.contentData.data.is_show_name = $(this).val();
426 Bll.renderDialog("brands-template"); 446 Bll.renderDialog("brands-template");
427 }); 447 });
  448 +//图标入口 一行显示个数
  449 +$(document).on("click", '.number', function () {
  450 + Bll.module.contentData.number = $(this).val();
  451 + Bll.renderDialog("icon-template");
  452 +});
428 //**********************************************************************************/ 453 //**********************************************************************************/
429 ////复制 454 ////复制
430 //$(document).on("click", "#copyTab", function() { 455 //$(document).on("click", "#copyTab", function() {
@@ -31,7 +31,7 @@ var config = { @@ -31,7 +31,7 @@ var config = {
31 //domain: 'http://172.16.6.243:8088/platform', //谭玲 31 //domain: 'http://172.16.6.243:8088/platform', //谭玲
32 //domain: 'http://172.16.6.108:8088/platform', //谭玲 32 //domain: 'http://172.16.6.108:8088/platform', //谭玲
33 //domain: 'http://172.16.6.204:8088/platform', //陆斌斌 33 //domain: 'http://172.16.6.204:8088/platform', //陆斌斌
34 - yohoSearch: 'http://192.168.102.216:8087/yohosearch', 34 + yohoSearch: 'http://192.168.102.216:8080/yohosearch',
35 loggers: { 35 loggers: {
36 api: { 36 api: {
37 level: 'verbose' 37 level: 'verbose'
@@ -51,7 +51,7 @@ var config = { @@ -51,7 +51,7 @@ var config = {
51 }, 51 },
52 apiKey: 'sd4H1ecAqlp', 52 apiKey: 'sd4H1ecAqlp',
53 domain: 'http://192.168.102.202:8088/platform', 53 domain: 'http://192.168.102.202:8088/platform',
54 - yohoSearch: 'http://192.168.102.216:8087/yohosearch', 54 + yohoSearch: 'http://192.168.102.216:8080/yohosearch',
55 logsFile: '/Data/logs/node/yohobuy-portal-log/', 55 logsFile: '/Data/logs/node/yohobuy-portal-log/',
56 loggers: { 56 loggers: {
57 api: { 57 api: {
@@ -72,7 +72,7 @@ var config = { @@ -72,7 +72,7 @@ var config = {
72 }, 72 },
73 apiKey: 'sd4H1ecAqlp', 73 apiKey: 'sd4H1ecAqlp',
74 domain: 'http://192.168.102.202:8081/platform', 74 domain: 'http://192.168.102.202:8081/platform',
75 - yohoSearch: 'http://192.168.102.216:8087/yohosearch', 75 + yohoSearch: 'http://192.168.102.216:8080/yohosearch',
76 logsFile: '/Data/logs/node/yohobuy-portal-log/', 76 logsFile: '/Data/logs/node/yohobuy-portal-log/',
77 loggers: { 77 loggers: {
78 api: { 78 api: {
@@ -93,7 +93,7 @@ var config = { @@ -93,7 +93,7 @@ var config = {
93 }, 93 },
94 apiKey: 'sd4H1ecAqlp', 94 apiKey: 'sd4H1ecAqlp',
95 domain: 'http://192.168.81.6:8189/yoho-admin-portal', 95 domain: 'http://192.168.81.6:8189/yoho-admin-portal',
96 - yohoSearch: 'http://search.yohoops.org/yohosearch', 96 + yohoSearch: 'http://192.168.102.216:8080/yohosearch',
97 logsFile: '/Data/logs/node/yohobuy-portal-log/', 97 logsFile: '/Data/logs/node/yohobuy-portal-log/',
98 loggers: { 98 loggers: {
99 api: { 99 api: {
1 <!-- 添加图标、楼层 --> 1 <!-- 添加图标、楼层 -->
2 <script type="text/template" id="icon-template"> 2 <script type="text/template" id="icon-template">
  3 + [[if contentData.template_name=='appIconList']]
  4 + <div class="panel-body">
  5 + <div class="form-group">
  6 + <label class="col-sm-2">图标类型</label>
  7 +
  8 + <div class="col-sm-10">
  9 + <label style="cursor: pointer;">
  10 + <input type="radio" name="number" class="number" value="4">一行4个
  11 + </label>
  12 + <label style="cursor: pointer;">
  13 + <input type="radio" name="number" class="number" value="5">一行5个
  14 + </label>
  15 + <input type="hidden" id="number" value="[[contentData.number]]" for="radio"/>
  16 + </div>
  17 + </div>
  18 + </div>
  19 + [[/if]]
3 <div class="panel-body"> 20 <div class="panel-body">
4 <div> 21 <div>
5 <table class="table table-hover table-bordered responsive dataTable no-footer"> 22 <table class="table table-hover table-bordered responsive dataTable no-footer">
@@ -134,6 +151,9 @@ @@ -134,6 +151,9 @@
134 [[/if]] 151 [[/if]]
135 </div> 152 </div>
136 <div class="panel-body"> 153 <div class="panel-body">
  154 + <div class="form-group">
  155 + <a href="JavaScript:;" id="addBrands" class="btn btn-primary btn-xs">添加品牌</a>
  156 + </div>
137 <div> 157 <div>
138 <table class="table table-hover table-bordered responsive dataTable no-footer"> 158 <table class="table table-hover table-bordered responsive dataTable no-footer">
139 <thead> 159 <thead>
@@ -166,11 +186,55 @@ @@ -166,11 +186,55 @@
166 </tbody> 186 </tbody>
167 </table> 187 </table>
168 </div> 188 </div>
169 - <a href="JavaScript:;" id="addBrands" class="btn btn-primary btn-xs">添加品牌</a> 189 +
170 </div> 190 </div>
171 <div id="brandLists"> 191 <div id="brandLists">
172 192
173 </div> 193 </div>
  194 + <div class="panel-body">
  195 + [[if contentData.template_name=='appHotBrands']]
  196 + <div class="form-group">
  197 + <table class="table table-hover table-bordered responsive dataTable no-footer">
  198 + <thead>
  199 + <tr>
  200 + <th>图片</th>
  201 + <th>选项</th>
  202 + </tr>
  203 + </thead>
  204 + <tbody>
  205 + <tr>
  206 + <td>
  207 + <input type="file" name="file" value="[[contentData.data.image.src]]"
  208 + class="observe" required="required"
  209 + data-field="image.src"/>
  210 + </td>
  211 + <td>
  212 + <div class="form-group ">
  213 + <select name="goTo" class="form-control observe"
  214 + value="[[contentData.data.image.url.action]]"
  215 + data-field="image.url.action">
  216 + [[layout action_template]]
  217 + </select>
  218 + </div>
  219 + <div class="form-group ">
  220 + <input value="[[contentData.data.image.url.url]]"
  221 + class="form-control observe"
  222 + data-field="image.url.url" placeholder="图片链接"/>
  223 +
  224 + <p style="color:#999;margin-top: 5px;">链接中不能有英文单引号</p>
  225 + </div>
  226 + <div class="form-group ">
  227 + <input value="[[contentData.data.image.alt]]"
  228 + class="form-control observe"
  229 + data-field="image.alt" placeholder="图片描述"/>
  230 + </div>
  231 + </td>
  232 + </tr>
  233 + </tbody>
  234 + </table>
  235 + </div>
  236 + [[/if]]
  237 + </div>
174 238
175 </script> 239 </script>
176 <!--品牌选择模态--> 240 <!--品牌选择模态-->
@@ -5,15 +5,12 @@ @@ -5,15 +5,12 @@
5 </div> 5 </div>
6 </div> 6 </div>
7 [[else if module.contentData.template_name=='appIconList']] 7 [[else if module.contentData.template_name=='appIconList']]
8 -<div>  
9 - <div class="row title">[[module.contentData.template_intro]]</div>  
10 - <div class="app_icon_list">  
11 - <ul class="icon-list clearfix"> 8 +<div class="custom-pic">
  9 + <ul class="custom-pic clearfix image-list-box resource-row li[[module.contentData.number]]">
12 [[each module.contentData.data as item index]] 10 [[each module.contentData.data as item index]]
13 - <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li> 11 + <li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li>
14 [[/each]] 12 [[/each]]
15 </ul> 13 </ul>
16 - </div>  
17 </div> 14 </div>
18 [[else if module.contentData.template_name=='recommendContentOne']] 15 [[else if module.contentData.template_name=='recommendContentOne']]
19 <div class="recommend_content_one"> 16 <div class="recommend_content_one">
@@ -97,6 +94,11 @@ @@ -97,6 +94,11 @@
97 <img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"> 94 <img src="[[item.src]]" class="custom-pic-img" style="margin:2px;">
98 </li> 95 </li>
99 [[/each]] 96 [[/each]]
  97 + [[if module.contentData.data.image.src!='']]
  98 + <li>
  99 + <img src="[[module.contentData.data.image.src]]" class="custom-pic-img" style="margin:2px;">
  100 + </li>
  101 + [[/if]]
100 </ul> 102 </ul>
101 </div> 103 </div>
102 </div> 104 </div>