Authored by 匡佳华

促销活动:fix

@@ -157,14 +157,13 @@ @@ -157,14 +157,13 @@
157 }); 157 });
158 158
159 $("#promotionEditForm #limitType").combobox({ 159 $("#promotionEditForm #limitType").combobox({
  160 + prompt:"请选择",
160 textField : "text", 161 textField : "text",
161 valueField : "value", 162 valueField : "value",
162 editable: false, 163 editable: false,
163 panelHeight : 80, 164 panelHeight : 80,
164 data:[{text:"属于",value:"1"},{text:"不属于",value:"2"}], 165 data:[{text:"属于",value:"1"},{text:"不属于",value:"2"}],
165 - onLoadSuccess : function(){  
166 - $("#promotionEditForm #limitType").combobox("setValue",1);  
167 - } 166 +
168 }); 167 });
169 168
170 $("#promotionEditForm #initStatus").combobox({ 169 $("#promotionEditForm #initStatus").combobox({
@@ -259,7 +258,7 @@ @@ -259,7 +258,7 @@
259 //商品限制范围 258 //商品限制范围
260 var scope = loadData.productScopeList; 259 var scope = loadData.productScopeList;
261 var productScopeType = scope[0].productScopeType; 260 var productScopeType = scope[0].productScopeType;
262 - var limitType = productScopeType == 0 ? 1 : productScopeType; 261 + var limitType = productScopeType == 1 ? 1 : scope[0].limitType;
263 $("#limitType").combobox("setValue", limitType); 262 $("#limitType").combobox("setValue", limitType);
264 $("#limitValues").textbox("setValue", scope[0].scopeValue); 263 $("#limitValues").textbox("setValue", scope[0].scopeValue);
265 $("#productScopeType").combobox("setValue",productScopeType); 264 $("#productScopeType").combobox("setValue",productScopeType);