Merge branch 'hotfix_预上架时间修复' into grey

@@ -72,14 +72,14 @@ var t = new common.tab2({
     active: 4,
     click: function () {
         var columnname = t.options.columns[t.options.active].name;
-        g.options.columns[11].hidden = true;
-        g.options.columns[8].hidden = true;
+        g.options.columns[12].hidden = true;
+        g.options.columns[9].hidden = true;
         if (columnname == 3) {
             isInfoMiss = 'Y';
-            g.options.columns[11].hidden = false;
+            g.options.columns[12].hidden = false;
         } else {
             isInfoMiss = '';
-            g.options.columns[8].hidden = false;
+            g.options.columns[9].hidden = false;
         }
 
         if (columnname == 1 || columnname == 2 || columnname == 3) {
@@ -766,8 +766,8 @@ $(document).on("click", ".chima-btn", function () {
     }, true);
 });
 /**
-*品牌排序
-*/
+ *品牌排序
+ */
 $(document).on("click", ".brandSort-btn", function () {
     var item = g.rows[$(this).data("index")];
     var num = $("input:text[name='brandSort']").eq($(this).data("index")).val();
@@ -787,11 +787,11 @@ $(document).on("click", ".brandSort-btn", function () {
             }
         }
     );
-    });
+});
 
 /**
-*店铺商品排序
-*/
+ *店铺商品排序
+ */
 $(document).on("click", ".shopsSort-btn", function () {
     var item = g.rows[$(this).data("index")];
     var num = $("input:text[name='shopsSort']").eq($(this).data("index")).val();
@@ -811,7 +811,7 @@ $(document).on("click", ".shopsSort-btn", function () {
             }
         }
     );
-    });
+});
 
 //当点击“无需测量”，该列输入框不可编辑
 common.sizeInfo.check();
\ No newline at end of file