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

src/main/resources/static/css/supplier/index.css

@@ -27,10 +27,10 @@ li{list-style:none}
 .supplierTit .search .searchBtn{position:absolute;right:0;top:0;font-size:0;padding:7px 12px;height:30px;line-height:30px}
 .supplierTit .search .searchBtn:before{width:30px;height:30px;background-position:4px 4px}
 .supplierInfo{width:1184px;margin:0 auto;}
-.supplierInfo .tabTit{width:100%;height:40px;line-height:40px;margin:16px auto;background:#FFF;border-bottom:1px solid #E15621;font-size:16px;color:#93979F}
+.supplierInfo .tabTit{width:100%;height:40px;line-height:40px;margin:16px auto;background:#FFF;border-bottom:1px solid #ffe6dc;font-size:16px;color:#93979F}
 .supplierInfo .tabTit span{display:inline-block;box-sizing:border-box;min-width:130px;text-align:center;height:100%;padding:0 32px;cursor:pointer}
 .supplierInfo .tabTit span:hover{color:#E15621}
-.supplierInfo .tabTit span.on,.supplierInfo .tabTit span.on:hover{background:#E15621;color:#FFF}
+.supplierInfo .tabTit span.on,.supplierInfo .tabTit span.on:hover{color:#E15621;background:#ffe6dc;font-weight:bold;}
 .supplierInfo .tabCon{width:100%;}
 .supplierInfo .infoBox{box-sizing:border-box;padding:16px;font-size:16px;line-height:22px;color:#4A4F58;background:#FFF;}
 .supplierInfo .infoBox .part{margin-top:30px}

src/main/resources/templates/supplier/index.html

@@ -32,7 +32,7 @@
             <a class="swiper-button-next" href="javascript:void(0)"></a>
         </div>
         <div class="title">
-            <img th:src="${supplier.logo}">
+            <img th:src="${supplier.logo}" onerror="javascript:this.src='/img/default/suppliver.jpg';">
             <h1 th:text="${supplier.name}"></h1>
             <a th:if="not${#strings.isEmpty(supplier.license)}" th:href="${supplier.license}" target="_blank"><i class="icon mIcon shop"><em class="tips">点击查看授权牌照</em></i></a>
         </div>