Merge branch 'dev_品牌装修去掉必填' into gray

@@ -11,9 +11,9 @@
                     <div class="panel-body">
                         <div class="row">
                             <div class="form-group">
-                                <label class="col-sm-2 control-label">品牌logo <span class="red">*</span></label>
+                                <label class="col-sm-2 control-label">品牌logo</label>
                                 <div class="col-sm-8">
-                                       <input type="file" id="brandIco" name="brandIco" value="<%data.brandIco%>" required placeholder="品牌logo" />
+                                       <input type="file" id="brandIco" name="brandIco" value="<%data.brandIco%>" placeholder="品牌logo" />
                                     <div style="color: red; margin-top: 10px;margin-left: 100px;position: absolute;">
                                         尺寸：300*124  <br/>
                                     </div>
@@ -31,7 +31,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label class="col-sm-2 control-label">品牌介绍 <span class="red">*</span></label>
+                                <label class="col-sm-2 control-label">品牌介绍</label>
                                 <div class="col-sm-8">
                                     <script id="brandIntro" type="text/plain" style="width:100%;height:200px;"></script>
                                     <input type="hidden" id="HidBrand" name="brandIntro" value="<%data.brandIntro%>">

@@ -21,9 +21,7 @@ e.on("validate", function () {
             return "调性指数（范围：1-100）";
         }
     }
-    if ($.trim(UMdescriptioner.getContent()) === ''){
-        return "品牌介绍不能为空！"
-    }
+    
     return true;
 });
 e.init();