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

@@ -19,7 +19,7 @@
      * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
      * window.UMEDITOR_HOME_URL = "/xxxx/xxxx/";
      */
-    window.UMEDITOR_HOME_URL="http://localhost:30012/";
+    window.UMEDITOR_HOME_URL="http://"+location.host+"/";
     var URL = window.UMEDITOR_HOME_URL || (function(){
 
         function PathStack() {

@@ -71,7 +71,7 @@ $.ajax({
 		data.salesPhrase = productExtBo.salesPhrase;
 		data.isHostsell = productExtBo.isHostsell;
 		$.each(data, function(key, value) {
-			if (vale) {
+			if (value) {
 				data[key] = value;
 			} else {
 				data[key] = '';

@@ -101,7 +101,7 @@ exports.res = [
             {name:'isLimited',type:'String'},
             {name:'isPromotionalGifts',type:'String'},
             {name:'productName',type:'String'},
-            {name:'productTag',type:'Number'},
+            {name:'productTag',type:'String'},
             {name:'retailPriceStr',type:'String'},
             {name:'salesPriceStr',type:'String'},
             {name:'expectShelfTimeStr',type:'String'},
@@ -157,7 +157,7 @@ exports.res = [
             {name:'isLimited',type:'String'},
             {name:'isPromotionalGifts',type:'String'},
             {name:'productName',type:'String'},
-            {name:'productTag',type:'Number'},
+            {name:'productTag',type:'String'},
             {name:'retailPriceStr',type:'String'},
             {name:'salesPriceStr',type:'String'},
             {name:'expectShelfTimeStr',type:'String'},

@@ -117,7 +117,7 @@
               </select>
             </div>
 
-            <label class="col-sm-1 control-label">店铺 </label>
+            <label class="col-sm-1 control-label">管理店铺 </label>
             <div class="col-sm-2">
               <select id="shopId" class="form-control">
                   <option value="[[shopId||'-1']]">[[shopName||'店铺']]</option>
@@ -126,7 +126,7 @@
 
            
            
-            <label class="col-sm-1 control-label">供应商</label>
+            <label class="col-sm-1 control-label">JIT供应商</label>
             <div class="col-sm-2">
               <select id="supplierId" class="form-control">
                   <option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option>