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

src/main/resources/static/css/article/article.css

@@ -33,7 +33,7 @@ dl,dd,dt{zoom:1}
 .list-select{width:200px;height:32px;margin:5px 0;border:1px solid #e1dedd;border-radius:3px}
 .loadData{position:fixed;left:0;top:0;width:100%;height:100%;display:-webkit-box;-webkit-box-pack:center;-webkit-box-align:center}
 .light-grey{width:50px;height:36px;border:1px solid #ddd;color:#666;border-radius:5px;vertical-align:1px}
-.article img{max-width:100% !important;height:auto !important}
+.article img{width:100% !important;height:auto !important}
 
 @-webkit-keyframes pointerFlashing {from{opacity: 1} to{opacity: 0.1}}
 @keyframes pointerFlashing {from{opacity: 1} to{opacity: 0.1}}
@@ -175,7 +175,7 @@ dl,dd,dt{zoom:1}
 	.article .title{line-height:40px;font-size:28px;color:#333}
 	.article .xinxi{margin-top:5px;padding-bottom:14px;border-bottom:solid 1px #ededed}
 	.article .new-mian{margin:23px 0;width:760px}
-	.article .new-mian img{max-width:100%;display:inline-block;display:block;margin:0 auto;height:auto !important}
+	.article .new-mian img{width:100% !important;display:inline-block;display:block;margin:0 auto;height:auto !important}
 	.article p{font-size:16px;line-height:30px;color:#777;margin-bottom:15px}
 	.dianzan{width:auto;text-align:center}
 	.article .like{color: #e15616; cursor: pointer;display: inline-block;height: 80px;width: 80px;line-height: 110px;margin: 30px auto;border-radius: 50%;background: #fef6f3;text-align: center;position: relative}

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

@@ -17,7 +17,7 @@ header li,footer li{list-style:none;}
 [v-cloak]{display:none;}
 table{border-collapse: collapse;}
 table,td,th{border: 1px solid #EBECEF;}
-figure.image{margin:0 auto;padding:0;}
+figure.image{margin:0 auto;padding:0;width: 100% !important;}
 .favicon.ico{background: url(/img/web.ico)}
 .fl{float: left;}
 .fr{float: right;}

src/main/resources/static/css/help/details.css

@@ -7,8 +7,8 @@ li{list-style:none}
     .pageWrap{width: 968px;}
     .navLayout{min-height: 500px;}
     .news-container{width: 100%;min-height: 600px;background-color: #FFFFFF;margin-top: 24px;box-sizing: border-box;padding:0 32px 32px 32px;border-radius: 8px;}
-    .news-title{width: 100%;line-height: 80px;font-size: 20px;font-weight: bold;text-align: center;color: #333333;}
-    .news-container-html{width: 100%;min-height: 600px;}
+    .news-title{width: 100%;line-height: 100px;font-size: 20px;font-weight: bold;text-align: center;color: #333333;}
+    .news-container-html{width: 800px;margin: 0 auto;min-height: 600px;}
 }
 
 /**

src/main/resources/static/css/product/detail.pc.css

@@ -155,7 +155,7 @@ li{list-style:none;}
 .productInfo .tabTit span:hover{color:#E15621}
 .productInfo .tabTit span.on,.productInfo .tabTit span.on:hover{background:#ffe6dc;color:#e15616;font-weight: bold;}
 .productInfo .tabCon{padding:16px;text-align:center}
-.productInfo .tabCon img{max-width:100%;}
+.productInfo .tabCon img{width:100%;height: auto;}
 .productInfo .tabCon table{width:100%;text-align:left}
 .productInfo .tabCon td{padding:10px 12px;line-height:20px}
 .productInfo .tabCon td a{color: #4688fa;}

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

@@ -170,7 +170,6 @@
                         <a th:href="${supplier.medicalPracticeLicenseImg3}" target="_blank" th:if="not${#strings.isEmpty(supplier.medicalPracticeLicenseImg3)}">
                             <img th:src="${supplier.medicalPracticeLicenseImg3}">
                         </a>
-                         <div class="cont" th:if="${#strings.isEmpty(supplier.medicalPracticeLicenseImg1)}">暂无</div>
                     </div>
                 </div>
                 <div class="part" >