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

src/main/resources/static/css/base/base.pc.css

@@ -313,7 +313,7 @@ iframe{width:320px !important;height: 280px !important}
 #scrollTop .item .phone:before{width:32px;height:32px;background-position:0 -254px;position:absolute;top:4px;left:16px}
 #scrollTop .item .toTop{padding:12px 16px 12px 48px;line-height:16px;}
 #scrollTop .item .toTop:before{width:32px;height:32px;background-position:-42px -254px;position:absolute;top:4px;left:16px}
-#scrollTop .item .phoneHover{display:none;position:absolute;left:-238px;top:-145px;z-index:999;width:236px;height:320px;background:url(/img/common/hotline.png) no-repeat left top;box-sizing:border-box;padding:100px 20px 0 0;line-height:28px;font-size:14px;white-space:nowrap}
+#scrollTop .item .phoneHover{display:none;position:absolute;left:-245px;top:-143px;z-index:999;width:240px;height:383px;background:url(/img/common/hotline.png) no-repeat left top;box-sizing:border-box;padding:90px 15px 0 0;line-height:32px;font-size:16px;white-space:nowrap}
 #scrollTop .item .phoneHover a{color:#E15616}
 #scrollTop .item .phoneHover span{color:#93979F;margin-top:10px}
 #scrollTop .item .phoneHover a:hover{text-decoration:underline}

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

@@ -186,6 +186,8 @@ var releaseContainer = new Vue({
                     _this.releaseParams.commodityType =data.commodityType;
                     _this.releaseParams.brandName = data.brandName;
                     _this.GoodsImagesList = _this.EchoGoodsImagesListFn(data.imageList);
+                    _this.classificationTwoList = data.smallTypeName;
+                    _this.classificationThreeList = data.tinyTypeName;
                     if(data.commodityType !=null){
                         _this.releaseParams.commodityTyp = data.commodityType;
                         _this.GetFistClassFn(_this.releaseParams.commodityTyp);