fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangwei
Commit 0539649729ef452323cd91457757a4785945d6da 2 parents 3cbe10f8 7a1fba96

Merge branch 'dev6.3' into test6.3

Inline Side-by-side
Showing 3 changed files with 132 additions and 2 deletions
@@ -91,6 +91,12 @@ @@ -91,6 +91,12 @@
91 <span>新品商品列表</span> 91 <span>新品商品列表</span>
92 </div> 92 </div>
93 </div> 93 </div>
  94 + [[else if module.contentData.template_name=='blkNewProductFloor']]
  95 + <div class="col-sm-12">
  96 + <div class="wordText">
  97 + <span>BLK新品到着商品列表</span>
  98 + </div>
  99 + </div>
94 [[else if module.contentData.template_name=='findGoodsListFloor']] 100 [[else if module.contentData.template_name=='findGoodsListFloor']]
95 <div class="col-sm-12"> 101 <div class="col-sm-12">
96 <div class="wordText"> 102 <div class="wordText">
@@ -1650,3 +1656,77 @@ @@ -1650,3 +1656,77 @@
1650 [[/each]] 1656 [[/each]]
1651 </ul> 1657 </ul>
1652 </script> 1658 </script>
  1659 +<script type="text/template" id="blkNewProductFloor-template">
  1660 + <div class="panel-body">
  1661 + <div class="row">
  1662 + <label class="col-sm-2 control-label">楼层名称:</label>
  1663 + <div class="col-sm-8">
  1664 + <input type="text" placeholder="楼层名称" class="form-control observe input-form" data-field="title" value="[[contentData.data.title]]" style="width:200px;margin-bottom: 20px" >
  1665 + </div>
  1666 + </div>
  1667 + <div class="row">
  1668 + <label class="col-sm-2 control-label">选择频道</label>
  1669 + <div class="col-sm-8">
  1670 + <select class="form-control observe input-form" name="channel" value="[[contentData.data.channel]]" data-field="channel">
  1671 + <option value="-1">选择频道</option>
  1672 + <option value="301">BLK男士</option>
  1673 + <option value="302">BLK女士</option>
  1674 + </select>
  1675 + </div>
  1676 + </div>
  1677 + </div>
  1678 +
  1679 + <div class="panel-body">
  1680 + <div class="row">
  1681 + <label class="col-sm-2 control-label">左滑链接</label>
  1682 + <div class="col-sm-8">
  1683 + <select name="goTo" class="form-control observe input-form" value="[[contentData.data.url.action]]" data-field="url.action">
  1684 + [[layout action_template]]
  1685 + </select>
  1686 + <input value="[[contentData.data.url.url]]" class="form-control observe input-form" data-field="url.url" placeholder="url"/>
  1687 + </div>
  1688 + </div>
  1689 + </div>
  1690 + <div class="panel-body">
  1691 + <div class="row">
  1692 + <label class="col-sm-2 control-label">商品属性</label>
  1693 + <div class="col-sm-8">
  1694 + <input type="checkbox" id="productType_1" value="1" name="productType_1" [[contentData.data.productType_1=="1"?"checked":""]]>
  1695 + <label>商品品牌</label>
  1696 + <input type="checkbox" id="productType_2" value="1" name="productType_2" [[contentData.data.productType_2=="1"?"checked":""]]>
  1697 + <label>商品名称</label>
  1698 + <input type="checkbox" id="productType_3" value="1" name="productType_3" [[contentData.data.productType_3=="1"?"checked":""]]>
  1699 + <label>商品价格</label>
  1700 + </div>
  1701 + </div>
  1702 + </div>
  1703 + <div class="panel-body">
  1704 + <div class="row">
  1705 + <label class="col-sm-2 control-label"></label>
  1706 + <div class="col-sm-8">
  1707 + <input type="radio" name="showType" class="showType" value="1" [[contentData.data.showType=="1"?"checked":""]]> 显示1行
  1708 + <input type="radio" name="showType" class="showType" value="2" [[contentData.data.showType=="2"?"checked":""]]> 显示2行 &emsp;
  1709 + </div>
  1710 + </div>
  1711 + </div>
  1712 +
  1713 + <div class="panel-body">
  1714 + <div class="row">
  1715 + <label class="col-sm-2 control-label">默认逻辑</label>
  1716 + <div class="col-sm-8">
  1717 + <label style="color:#CCC">取BLK新品到着默认排序前X个商品数据（1行10个，2行20个）；
  1718 + 1行显示商品数小于4个不显示整个楼层，2行显示少于8个不展示楼层
  1719 + </label>
  1720 + </div>
  1721 + </div>
  1722 + </div>
  1723 +
  1724 + <div class="panel-body">
  1725 + <div class="row">
  1726 + <label class="col-sm-2 control-label">干预SKN</label>
  1727 + <div class="col-sm-8">
  1728 + <input type="text" placeholder="多个SKN用英文逗号隔开，输入的SKN按照顺序排在BLK新品到着默认排序的数据前" class="observe form-control input-form" data-field="skns" value="[[contentData.data.skns]]" style="width:550px;">
  1729 + </div>
  1730 + </div>
  1731 + </div>
  1732 + </script>
@@ -1778,6 +1778,23 @@ var Button = [ @@ -1778,6 +1778,23 @@ var Button = [
1778 "title":"" 1778 "title":""
1779 }, 1779 },
1780 "isNewFloor":"1" 1780 "isNewFloor":"1"
  1781 + },{
  1782 + button_name: "BLK新品到着商品列表",
  1783 + template_name: "blkNewProductFloor",
  1784 + template_intro: "BLK新品到着商品列表",
  1785 + __title:"BLK新品到着商品列表",
  1786 + dialog: "blkNewProductFloor-template",
  1787 + data: {
  1788 + "channel":"",
  1789 + "title":"",
  1790 + "url": {
  1791 + "action": "",
  1792 + "url": ""
  1793 + },
  1794 + "showType":"",
  1795 + "skns":"",
  1796 + },
  1797 + isNewFloor:"1"
1781 } 1798 }
1782 ]; 1799 ];
1783 1800
@@ -123,6 +123,13 @@ var Bll = { @@ -123,6 +123,13 @@ var Bll = {
123 module.contentData.data.recommendChannel=''; 123 module.contentData.data.recommendChannel='';
124 } 124 }
125 } 125 }
  126 + if(module.contentData.template_name == 'blkNewProductFloor'){
  127 + if(module.contentData.data.productType_1==''&&module.contentData.data.productType_2==''&&module.contentData.data.productType_3==''){
  128 + common.util.__tip('商品属性不能为空!', 'warning');
  129 + return false;
  130 + }
  131 +
  132 + }
126 var couponFlag = true; 133 var couponFlag = true;
127 //好店推荐切换radio，增加/删除校验 134 //好店推荐切换radio，增加/删除校验
128 var shopRecommendFlag = false; 135 var shopRecommendFlag = false;
@@ -926,7 +933,30 @@ $(document).on("change", '#recommend-is_show', function () { @@ -926,7 +933,30 @@ $(document).on("change", '#recommend-is_show', function () {
926 Bll.module.contentData.data.title.is_show = 1 - Bll.module.contentData.data.title.is_show; 933 Bll.module.contentData.data.title.is_show = 1 - Bll.module.contentData.data.title.is_show;
927 Bll.renderDialog("editorRecommendFloor-template"); 934 Bll.renderDialog("editorRecommendFloor-template");
928 }); 935 });
929 - 936 +$(document).on("change", '#productType_1', function () {
  937 + if ($(this).is(':checked')) {
  938 + Bll.module.contentData.data.productType_1 = 1;
  939 + }else{
  940 + Bll.module.contentData.data.productType_1 = '';
  941 + }
  942 + Bll.renderDialog("blkNewProductFloor-template");
  943 +});
  944 +$(document).on("change", '#productType_2', function () {
  945 + if ($(this).is(':checked')) {
  946 + Bll.module.contentData.data.productType_2 = 1;
  947 + }else{
  948 + Bll.module.contentData.data.productType_2 = '';
  949 + }
  950 + Bll.renderDialog("blkNewProductFloor-template");
  951 +});
  952 +$(document).on("change", '#productType_3', function () {
  953 + if ($(this).is(':checked')) {
  954 + Bll.module.contentData.data.productType_3 = 1;
  955 + }else{
  956 + Bll.module.contentData.data.productType_3 = '';
  957 + }
  958 + Bll.renderDialog("blkNewProductFloor-template");
  959 +});
930 $(document).on("change", '.is_show_secondFloor', function () { 960 $(document).on("change", '.is_show_secondFloor', function () {
931 Bll.module.contentData.data.is_show_secondFloor = $(this).val(); 961 Bll.module.contentData.data.is_show_secondFloor = $(this).val();
932 var beginTime = Bll.module.contentData.begin_show_time; 962 var beginTime = Bll.module.contentData.begin_show_time;
@@ -1109,7 +1139,10 @@ $(document).on("click", '.priceStyle', function () { @@ -1109,7 +1139,10 @@ $(document).on("click", '.priceStyle', function () {
1109 Bll.module.contentData.data.priceStyle = $(this).val(); 1139 Bll.module.contentData.data.priceStyle = $(this).val();
1110 Bll.renderDialog("tfGoodsList-template"); 1140 Bll.renderDialog("tfGoodsList-template");
1111 }); 1141 });
1112 - 1142 +$(document).on("click", '.showType', function () {
  1143 + Bll.module.contentData.data.showType = $(this).val();
  1144 + Bll.renderDialog("blkNewProductFloor-template");
  1145 +});
1113 $(document).on("click", '.jumpType', function () { 1146 $(document).on("click", '.jumpType', function () {
1114 Bll.module.contentData.data.jumpType = $(this).val(); 1147 Bll.module.contentData.data.jumpType = $(this).val();
1115 Bll.renderDialog("tfGoodsList-template"); 1148 Bll.renderDialog("tfGoodsList-template");