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

@@ -144,10 +144,10 @@ function ajaxUploadSubmit(importAuditorId){
             productPrices: JSON.stringify(importYohoCoinData)
             productPrices: JSON.stringify(importYohoCoinData)
         }
         }
     },function(rs){
     },function(rs){
-        if(rs.code == 200){
+        if(rs.data.code == 200){
             common.util.__tip("批量导入保存成功！", "success");
             common.util.__tip("批量导入保存成功！", "success");
         }else{
         }else{
-            common.util.__tip(rs.message);
+            common.util.__tip(rs.data.message);
         }
         }
     },true);
     },true);
 }
 }

@@ -5,7 +5,7 @@ var $ = require('jquery'),
     common=require('../common/common');
     common=require('../common/common');
 
 
 var ENUM={
 var ENUM={
-    shopNature:{1:'旗舰店',2:'直营店'},
+    shopNature:{1:'旗舰店',2:'专卖店'},
     shopsType:{1:'单品店',2:'多品店'},
     shopsType:{1:'单品店',2:'多品店'},
     checkStatus:{100:'暂存',200:'审核中',300:'通过',900:'驳回'},
     checkStatus:{100:'暂存',200:'审核中',300:'通过',900:'驳回'},
     opt:{"add":"添加","delete":"删除"},
     opt:{"add":"添加","delete":"删除"},

@@ -46,7 +46,7 @@
 					<select name="shopNature" id="shopNature" value='{{shopNature}}' required  class="form-control">
 					<select name="shopNature" id="shopNature" value='{{shopNature}}' required  class="form-control">
 						<option value="-1">店铺类型</option>
 						<option value="-1">店铺类型</option>
 							<option value="1">旗舰店</option>
 							<option value="1">旗舰店</option>
-							<option value="2">直营店</option>
+							<option value="2">专卖店</option>
 					</select>
 					</select>
 					</div>
 					</div>
 				</div>
 				</div>