Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop

@@ -32,7 +32,7 @@ var dist_dir = {
 };
 };
 
 
 var cdn_domain = 'http://cdn.yoho.cn/';
 var cdn_domain = 'http://cdn.yoho.cn/';
-var md5=crypto.createHash('md5').update(new Date().toString()).digest('hex');;
+var md5="-"+crypto.createHash('md5').update(new Date().toString()).digest('hex');;
 
 
 var ftpConfig = {
 var ftpConfig = {
     host: '218.94.75.58',
     host: '218.94.75.58',

@@ -4,10 +4,11 @@ var edit=require('../common/edit');
     var e=new edit("#basicForm");
     var e=new edit("#basicForm");
     //brandTonality
     //brandTonality
     e.on("validate",function(){
     e.on("validate",function(){
-        var num=+$("#brandTonality").val();
-        if(num>100||num<1){
+        var num=$.trim($("#brandTonality").val());
+        if(+num>100||+num<1){
             return "调性指数（范围：1-100）";
             return "调性指数（范围：1-100）";
         }
         }
+        
         return true;
         return true;
     });
     });
     e.init();
     e.init();

@@ -26,7 +26,6 @@ for (key in config.spm.dependencies) {
 }
 }
 var entry={index:[],libs:[]};
 var entry={index:[],libs:[]};
 
 
-console.log(commons);
 entry.libs=commons;
 entry.libs=commons;
 
 
 
 
@@ -38,7 +37,6 @@ var readfile=function(dir,callback){
       if (fs.statSync(filePath).isFile() && /.*\.js$/i.test(file)) {
       if (fs.statSync(filePath).isFile() && /.*\.js$/i.test(file)) {
           callback && callback(filePath);
           callback && callback(filePath);
       }else{
       }else{
-        console.log(file+"***********************");
         if(file!="common"&&file!="util"){
         if(file!="common"&&file!="util"){
           readfile(filePath,callback);
           readfile(filePath,callback);
         }
         }

-exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.1.0"},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.1.0"}}
+exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.1.0","md5":"-26113ff46bc61c952a8a18344e61b2c5"},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.1.0","md5":"-26113ff46bc61c952a8a18344e61b2c5"}}

@@ -208,9 +208,9 @@
                             </div>
                             </div>
 
 
                             <div class="form-group">
                             <div class="form-group">
-                                <label class="col-sm-2 control-label">调性指数</label>
+                                <label class="col-sm-2 control-label">调性指数<span class="red">*</span></label>
                                 <div class="col-sm-2">
                                 <div class="col-sm-2">
-                                    <input type="number" id="brandTonality" name="brandTonality" class="form-control" pattern="^[0-100]$" placeholder="调性指数（范围：1-100）" value="{{brandTonality}}">
+                                    <input type="number" id="brandTonality" name="brandTonality" class="form-control"  placeholder="调性指数（范围：1-100）" value="{{brandTonality}}">
                                 </div>
                                 </div>
                             </div>
                             </div>