Merge branch 'tmp2' into test6.9.3
Showing
2 changed files
with
5 additions
and
4 deletions
@@ -1377,6 +1377,7 @@ | @@ -1377,6 +1377,7 @@ | ||
1377 | <input type="radio" name="shopSource" class="shopSource" value="1" [[contentData.data.shopSource=="1"?"checked":""]]> 固定推荐 | 1377 | <input type="radio" name="shopSource" class="shopSource" value="1" [[contentData.data.shopSource=="1"?"checked":""]]> 固定推荐 |
1378 | <input type="radio" name="shopSource" class="shopSource" value="2" [[contentData.data.shopSource=="2"?"checked":""]]> 个性化推荐   | 1378 | <input type="radio" name="shopSource" class="shopSource" value="2" [[contentData.data.shopSource=="2"?"checked":""]]> 个性化推荐   |
1379 | <input type="radio" name="shopSource" class="shopSource" value="3" [[contentData.data.shopSource=="3"?"checked":""]]> 新品到着   | 1379 | <input type="radio" name="shopSource" class="shopSource" value="3" [[contentData.data.shopSource=="3"?"checked":""]]> 新品到着   |
1380 | + <input type="radio" name="shopSource" class="shopSource" value="4" [[contentData.data.shopSource=="4"?"checked":""]]> 品牌列表   | ||
1380 | <input type="hidden" id="shopSource" for="radio" value="[[contentData.data.shopSource]]" /> | 1381 | <input type="hidden" id="shopSource" for="radio" value="[[contentData.data.shopSource]]" /> |
1381 | </div> | 1382 | </div> |
1382 | </div> | 1383 | </div> |
@@ -1385,11 +1386,11 @@ | @@ -1385,11 +1386,11 @@ | ||
1385 | <div class="row"> | 1386 | <div class="row"> |
1386 | <label class="col-sm-2 control-label">店铺ID</label> | 1387 | <label class="col-sm-2 control-label">店铺ID</label> |
1387 | <div class="col-sm-8"> | 1388 | <div class="col-sm-8"> |
1388 | - <input value="[[contentData.data.shopIds]]" class="form-control observe input-form" data-field="shopIds" placeholder="只能填写4个店铺ID,英文逗号分隔" style="width: 400px"/> | 1389 | + <input value="[[contentData.data.shopIds]]" class="form-control observe input-form" data-field="shopIds" placeholder="店铺ID,英文逗号分隔" style="width: 400px"/> |
1389 | </div> | 1390 | </div> |
1390 | </div> | 1391 | </div> |
1391 | </div> | 1392 | </div> |
1392 | - <div class="panel-body recommendChannelShow" [[contentData.data.shopSource==""||contentData.data.shopSource=="1"||contentData.data.shopSource=="3"?"hidden":""]] [[contentData.data.dataSource=="2"?"display":""]]> | 1393 | + <div class="panel-body recommendChannelShow" [[contentData.data.shopSource==""||contentData.data.shopSource=="1"||contentData.data.shopSource=="3"||contentData.data.shopSource=="4"?"hidden":""]] [[contentData.data.dataSource=="2"?"display":""]]> |
1393 | <div class="row"> | 1394 | <div class="row"> |
1394 | <label class="col-sm-2 control-label">推荐频道</label> | 1395 | <label class="col-sm-2 control-label">推荐频道</label> |
1395 | <div class="col-sm-8"> | 1396 | <div class="col-sm-8"> |
@@ -1159,11 +1159,11 @@ $(document).on("click", '.url_type', function () { | @@ -1159,11 +1159,11 @@ $(document).on("click", '.url_type', function () { | ||
1159 | $(document).on("click", '.shopSource', function () { | 1159 | $(document).on("click", '.shopSource', function () { |
1160 | var _shopSource = $(this).val(); | 1160 | var _shopSource = $(this).val(); |
1161 | Bll.module.contentData.data.shopSource = _shopSource; | 1161 | Bll.module.contentData.data.shopSource = _shopSource; |
1162 | - if(_shopSource=='1') { | 1162 | + if(_shopSource=='1' || _shopSource == '4') { |
1163 | $(".shopIdShow").css('display', 'block'); | 1163 | $(".shopIdShow").css('display', 'block'); |
1164 | $(".recommendChannelShow").css('display', 'none'); | 1164 | $(".recommendChannelShow").css('display', 'none'); |
1165 | }else if(_shopSource=='3'){ | 1165 | }else if(_shopSource=='3'){ |
1166 | - $(".recommendChannelShow").css('display', 'noe'); | 1166 | + $(".recommendChannelShow").css('display', 'none'); |
1167 | $(".shopIdShow").css('display', 'none'); | 1167 | $(".shopIdShow").css('display', 'none'); |
1168 | }else{ | 1168 | }else{ |
1169 | $(".recommendChannelShow").css('display', 'block'); | 1169 | $(".recommendChannelShow").css('display', 'block'); |
-
Please register or login to post a comment