Merge branch 'tmp2' into test6.9.3

@@ -1377,6 +1377,7 @@
                 <input type="radio" name="shopSource" class="shopSource" value="1" [[contentData.data.shopSource=="1"?"checked":""]]> 固定推荐
                 <input type="radio" name="shopSource" class="shopSource" value="2" [[contentData.data.shopSource=="2"?"checked":""]]> 个性化推荐 &emsp;
                 <input type="radio" name="shopSource" class="shopSource" value="3" [[contentData.data.shopSource=="3"?"checked":""]]> 新品到着 &emsp;
+                <input type="radio" name="shopSource" class="shopSource" value="4" [[contentData.data.shopSource=="4"?"checked":""]]> 品牌列表 &emsp;
                 <input type="hidden" id="shopSource" for="radio" value="[[contentData.data.shopSource]]" />
             </div>
         </div>
@@ -1385,11 +1386,11 @@
         <div class="row">
             <label class="col-sm-2 control-label">店铺ID</label>
             <div class="col-sm-8">
-                <input value="[[contentData.data.shopIds]]" class="form-control observe input-form" data-field="shopIds" placeholder="只能填写4个店铺ID,英文逗号分隔" style="width: 400px"/>
+                <input value="[[contentData.data.shopIds]]" class="form-control observe input-form" data-field="shopIds" placeholder="店铺ID,英文逗号分隔" style="width: 400px"/>
             </div>
         </div>
     </div>
-    <div class="panel-body recommendChannelShow" [[contentData.data.shopSource==""||contentData.data.shopSource=="1"||contentData.data.shopSource=="3"?"hidden":""]] [[contentData.data.dataSource=="2"?"display":""]]>
+    <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":""]]>
         <div class="row">
             <label class="col-sm-2 control-label">推荐频道</label>
             <div class="col-sm-8">

@@ -1159,11 +1159,11 @@ $(document).on("click", '.url_type', function () {
 $(document).on("click", '.shopSource', function () {
     var _shopSource = $(this).val();
     Bll.module.contentData.data.shopSource = _shopSource;
-    if(_shopSource=='1') {
+    if(_shopSource=='1' || _shopSource == '4') {
         $(".shopIdShow").css('display', 'block');
         $(".recommendChannelShow").css('display', 'none');
     }else if(_shopSource=='3'){
-        $(".recommendChannelShow").css('display', 'noe');
+        $(".recommendChannelShow").css('display', 'none');
         $(".shopIdShow").css('display', 'none');
     }else{
         $(".recommendChannelShow").css('display', 'block');