fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 周奇琪
Commit b8a1d90293332a0359afbbbce56666b22153f970 2 parents dd6d45fb 23c40509

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

Inline Side-by-side
Showing 4 changed files with 6 additions and 6 deletions
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。 19 * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
20 * window.UMEDITOR_HOME_URL = "/xxxx/xxxx/"; 20 * window.UMEDITOR_HOME_URL = "/xxxx/xxxx/";
21 */ 21 */
22 - window.UMEDITOR_HOME_URL="http://localhost:30012/"; 22 + window.UMEDITOR_HOME_URL="http://"+location.host+"/";
23 var URL = window.UMEDITOR_HOME_URL || (function(){ 23 var URL = window.UMEDITOR_HOME_URL || (function(){
24 24
25 function PathStack() { 25 function PathStack() {
@@ -71,7 +71,7 @@ $.ajax({ @@ -71,7 +71,7 @@ $.ajax({
71 data.salesPhrase = productExtBo.salesPhrase; 71 data.salesPhrase = productExtBo.salesPhrase;
72 data.isHostsell = productExtBo.isHostsell; 72 data.isHostsell = productExtBo.isHostsell;
73 $.each(data, function(key, value) { 73 $.each(data, function(key, value) {
74 - if (vale) { 74 + if (value) {
75 data[key] = value; 75 data[key] = value;
76 } else { 76 } else {
77 data[key] = ''; 77 data[key] = '';
@@ -101,7 +101,7 @@ exports.res = [ @@ -101,7 +101,7 @@ exports.res = [
101 {name:'isLimited',type:'String'}, 101 {name:'isLimited',type:'String'},
102 {name:'isPromotionalGifts',type:'String'}, 102 {name:'isPromotionalGifts',type:'String'},
103 {name:'productName',type:'String'}, 103 {name:'productName',type:'String'},
104 - {name:'productTag',type:'Number'}, 104 + {name:'productTag',type:'String'},
105 {name:'retailPriceStr',type:'String'}, 105 {name:'retailPriceStr',type:'String'},
106 {name:'salesPriceStr',type:'String'}, 106 {name:'salesPriceStr',type:'String'},
107 {name:'expectShelfTimeStr',type:'String'}, 107 {name:'expectShelfTimeStr',type:'String'},
@@ -157,7 +157,7 @@ exports.res = [ @@ -157,7 +157,7 @@ exports.res = [
157 {name:'isLimited',type:'String'}, 157 {name:'isLimited',type:'String'},
158 {name:'isPromotionalGifts',type:'String'}, 158 {name:'isPromotionalGifts',type:'String'},
159 {name:'productName',type:'String'}, 159 {name:'productName',type:'String'},
160 - {name:'productTag',type:'Number'}, 160 + {name:'productTag',type:'String'},
161 {name:'retailPriceStr',type:'String'}, 161 {name:'retailPriceStr',type:'String'},
162 {name:'salesPriceStr',type:'String'}, 162 {name:'salesPriceStr',type:'String'},
163 {name:'expectShelfTimeStr',type:'String'}, 163 {name:'expectShelfTimeStr',type:'String'},
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 </select> 117 </select>
118 </div> 118 </div>
119 119
120 - <label class="col-sm-1 control-label">店铺 </label> 120 + <label class="col-sm-1 control-label">管理店铺 </label>
121 <div class="col-sm-2"> 121 <div class="col-sm-2">
122 <select id="shopId" class="form-control"> 122 <select id="shopId" class="form-control">
123 <option value="[[shopId||'-1']]">[[shopName||'店铺']]</option> 123 <option value="[[shopId||'-1']]">[[shopName||'店铺']]</option>
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 126
127 127
128 128
129 - <label class="col-sm-1 control-label">供应商</label> 129 + <label class="col-sm-1 control-label">JIT供应商</label>
130 <div class="col-sm-2"> 130 <div class="col-sm-2">
131 <select id="supplierId" class="form-control"> 131 <select id="supplierId" class="form-control">
132 <option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option> 132 <option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option>