Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

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

@@ -167,7 +167,7 @@
 .jconfirm .jconfirm-box .jconfirm-buttons button{font-size:3.4vw!important;}
 /* 咨询，回到顶部 */
 #scrollTop{display:none;position:fixed;right:3.2vw;z-index:9999;bottom:4vw;}
-#scrollTop .item{width:15vw;background-color:rgba(190,194,201,.3);box-sizing:border-box;text-align:center;margin-bottom:2.5vw;font-size:3vw;position:relative}
+#scrollTop .item{width:15vw;background-color:rgba(190,194,201,.3);box-sizing:border-box;text-align:center;margin-bottom:2.5vw;font-size:3vw;position:relative;border-radius: 0.2vw;}
 #scrollTop .item>span{box-sizing:border-box;display:block;padding:1.5vw;line-height:3.4vw;}
 #scrollTop .item .phone,#scrollTop .item .toTop{width:100%;height:100%;}
 #scrollTop .item .phone:before,#scrollTop .item .toTop:before{display:block;margin:0 auto;width:5.8vw;height:5.8vw;}

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

@@ -279,7 +279,7 @@ iframe{width:320px !important;height: 280px !important}
 .priceTag .tag.on:before{background-position:-117px 3px}
 .priceTag .ladder,.priceTag .promotion{position:absolute;background:#fff;box-shadow:0 3px 6px 0 #d7dfec;border-radius:2px;line-height:42px;left:0;top:28px;z-index:9;transition:all .8s;display:none}
 .priceTag .ladder>span{padding:0 20px 10px;text-align:center;font-size:16px;display:block;}
-.priceTag .ladder em{white-space:nowrap}
+.priceTag .ladder em{white-space:nowrap;width: 240px;display: block;}
 .priceTag .ladder i{font-style:normal;display:inline-block;width:120px;text-align:center}
 .priceTag .ladder .t{color:#627386}
 .priceTag .ladder .p{color:#f94b4b}

src/main/resources/static/css/flea-market/list.css

@@ -86,8 +86,8 @@
     .no-content{padding:26.6vw 5.3vw;background-color: #fff;margin: auto;}
     .no-content img{width: 50%;display: block;margin: 0 auto;padding: 0.5rem 0;}
     .error-message{text-align: center;margin-top: 5.3vw;font-size: 3.7vw;color: #53504D}
-    .fabu{width: 15vw;height: 12vw;text-align: center;font-size: 2.5vw;background: #fff;position: fixed;bottom: 35.5vw;right: 3.2vw;}
-    .fabu a{ color: #fff;display: block;background: #e15616;height: 12vw;width:15vw;box-sizing: border-box;padding: 1.2vw 0;}
+    .fabu{width: 15vw;height: 12vw;text-align: center;font-size: 3vw;background: #fff;position: fixed;bottom: 35.5vw;right: 3.2vw;border-radius: 0.2vw;}
+    .fabu a{ color: #fff;display: block;background: #e15616;height: 12vw;width:15vw;box-sizing: border-box;padding: 1.2vw 0;border-radius: 0.2vw;}
     .fabu a .mIcon{width: 4.6vw;height: 4.6vw;display: block;margin: 0 auto;}
     .fabu a .mIcon:before{width: 4.6vw;height: 4.6vw;display: block;background-position: -93vw -53vw;}
     .fabu a p{line-height: 4.2vw;text-align: center;margin-top: 1vw;}