Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/css/supplier-center/setting/password.css

@@ -17,7 +17,6 @@ li{list-style:none}
     .container{width: 100%;min-height:485px;box-sizing: border-box;padding: 16px 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .formLine p{color: #627386}
     input::placeholder{color: #9aa5b5;}
-    .formLine .showPwd{right: 8px}
 }
 
 /**

src/main/resources/static/css/supplier-center/shop/goods.css

@@ -21,7 +21,7 @@ li{list-style: none}
   .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
   .goods-main .goods-table ul li:last-child{width: 23%;position: relative}
   .tbody ul li{height: 96px;font-size: 12px;}
-  .tbody ul{overflow: hidden;padding: 0 20px;position: relative;}
+  .tbody ul{padding: 0 20px;position: relative;}
   .tbodyle ul li:nth-child(2){width: 25%;}
   .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 16%}
   .tbody ul li:last-child{width: 20%}

src/main/resources/static/js/supplier-center/setting/information.js

@@ -374,7 +374,7 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
             }else{
                 CAIMEI.Alert(response.msg, '确定', false);
             }
-        })
+        });
      $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
      $('.navLayout').find('.navList').eq(2).addClass("on").find('.con').show().find('a').eq(0).addClass("on");
     }

src/main/resources/static/js/supplier-center/setting/password.js

@@ -217,7 +217,7 @@ var passwordPage = new Vue({
     },
     mounted: function () {
         var _self = this;
-       $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
-       $('.navLayout').find('.navList').eq(3).addClass("on").find('.con').show().find('a').eq(0).addClass("on");
+        $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
+        $('.navLayout').find('.navList').eq(3).addClass("on").find('.con').show().find('a').eq(0).addClass("on");
     }
 });

src/main/resources/static/js/supplier-center/shop/release.js

@@ -872,7 +872,7 @@ var releaseContainer = new Vue({
             SupplierApi.AddSupplierReleaseProduct(_this.releaseParams,function(response){
                 if(response.code == 0){
                     CAIMEI.dialog('提交成功，等待审核',true,function () {
-                        location.href = '/supplier/myProduct.html';
+                        location.href = '/supplier/goods.html';
                         if(CAIMEI.Storage.getItem('adProductPeview')){
                             CAIMEI.Storage.removeItem('adProductPeview');
                         }