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

@@ -239,11 +239,11 @@ g.__e.on("callback", function(obj) {
 $(document).on("click",".sortadd",function(){
 	var text=$(this).text();
 	if(!Bll.validateSort()){
-		common.util.__tip("请选择完整的分类目录");
+		common.util.__tip("请选择完整的分类目录","warning");
 		return;
 	}
 	if ($.trim($("#salesPriceStr").val())=="") {
-		common.util.__tip("请填写销售价");
+		common.util.__tip("请填写销售价","warning");
 		return;
 	}
 	if(g.__e.validate()){
@@ -298,9 +298,11 @@ $(document).on("change",".salesPriceStr",function(){
 	ENUM.goodsSizeList.salePrice=$.trim($(this).val());
 });
 $(document).on("click",".sortdelete",function(){
-	var index=$(this).data("index");
-	[].splice.call(g.__rows,index,1);
-	g.reload();
+	common.dialog.confirm("温馨提示","你确定删除吗？",function(){
+		var index=$(this).data("index");
+		[].splice.call(g.__rows,index,1);
+		g.reload();
+	});
 	// g.__e.init();
 });
 $(document).on("change",".factoryCode",function(){
@@ -425,8 +427,8 @@ e.on("validate",function(){
 	if(_count>0){
 		return "同一颜色包含两组相同尺码";
 	}
-	if(_count1>0&&common.util.__input("supplierId")){
-		return "JIT商品条码不能重复";
+	if(_count1>0){
+		return "商品条码不能重复";
 	}
 });
 e.on("validate",function(){
@@ -443,9 +445,6 @@ e.on("validate",function(){
 
 
 $(document).on("click","#btnReview",function(){
-	console.log(ag.rows);
-
-
 	if(e.validate()){
 		common.dialog.confirm("温馨提示","<p>你确定提交吗？</p>",function(){
 			e.submit($("#basicForm").attr("action"),function(option){

 exports.domain = require('../config/common.js').domain;
 
 exports.res = [{
-	route: '/supplier/shop/decoration',
+	route: '/supplier/shop/decoration1111',
 	method: 'GET',
 	src: '/store/shop',
 	view: 'pages/store/shop2'
-}, {
-	//店铺装修管理 -> 页面渲染
-	route: '/shop/decoration/index',
-	method: 'GET',
-	src: '/store/decoration-index',
-	view: 'pages/store/index',
-	data: {
-		pagetitle: {
-			level1title: '店铺装修管理',
-			level2title: '店铺装修管理',
-			level3title: '店铺装修管理'
-		},
-		checkStatus: true,
-		selectShop: true,
-		gridurl: '/shop/ShopsDecoratorRest/findShopsDecorator'
-	}
-}, {
-	//店铺装修管理 -> 列表数据
-	route: '/shop/ShopsDecoratorRest/findShopsDecorator',
-	method: 'POST',
-	url: '/ShopsDecoratorRest/findShopsDecorator',
-	params: [{
-		name: 'page',
-		type: 'number'
-	}, {
-		name: 'size',
-		type: 'number'
-	}, {
-		name: 'shopsId',
-		type: 'number'
-	}, {
-		name: 'checkStatus',
-		type: 'number'
-	}, {
-		name: 'supplierId',
-		type: 'number'
-	}, {
-		name: 'brandId',
-		type: 'number'
-	}]
 }]
\ No newline at end of file

@@ -302,7 +302,48 @@ exports.res = [
         params:[
             {name:"brandId",type:"Number"}
         ]
+    },
+    {
+    //店铺装修管理 -> 页面渲染
+    route: '/supplier/shop/decoration',
+    method: 'GET',
+    src: '/store/decoration-index',
+    view: 'pages/store/index',
+    data: {
+        pagetitle: {
+            level1title: '店铺装修管理',
+            level2title: '店铺装修管理',
+            level3title: '店铺装修管理'
+        },
+        checkStatus: true,
+        selectShop: true,
+        gridurl: '/shop/ShopsDecoratorRest/findShopsDecorator'
     }
+}, {
+    //店铺装修管理 -> 列表数据
+    route: '/shop/ShopsDecoratorRest/findShopsDecorator',
+    method: 'POST',
+    url: '/ShopsDecoratorRest/findShopsDecorator',
+    params: [{
+        name: 'page',
+        type: 'number'
+    }, {
+        name: 'size',
+        type: 'number'
+    }, {
+        name: 'shopsId',
+        type: 'number'
+    }, {
+        name: 'checkStatus',
+        type: 'number'
+    }, {
+        name: 'supplierId',
+        type: 'number'
+    }, {
+        name: 'brandId',
+        type: 'number'
+    }]
+}
 ]
 
\ No newline at end of file

@@ -111,7 +111,7 @@
                 <thead>
                 <tr>
                     <th>SKC</th>
-                    <th>SKU</th>
+                    <th>SKN</th>
                     <th>销售价</th>
                     <th>款型编码</th>
                     <th>条码</th>