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

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

@@ -159,12 +159,12 @@ body{background: #fff}
      .paybtn .thegopay {border: 1px solid #E0E0E0;height: 8.5vw;line-height: 8.5vw;border-radius: .53vw;color: #333333;padding: 0 1.3vw 0 1.3vw}
      .gosecond {color: #1683E1;border-right: .27vw solid #F2F2F2;}
      .close {position: absolute;right: 0;top: 0;width: 10.7vw;height: 10.7vw;line-height: 10.7vw;text-align: center;cursor: pointer;font-size: 6.4vw;}
-    .selected.mIcon:before{
+    .brand.mIcon:before{
     width: 5.3vw;
     height: 5.3vw;
     background-position: -51.2vw -.27vw;
     position: absolute;
-    top: 9vw;
+    top: 2vw;
     right: 2.7vw
 }
  }

src/main/resources/templates/flea-market/form.html

@@ -46,7 +46,7 @@
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品品牌：</div>
 
                         <div class="select" @click="showBrand">
-                            <span class="placeholder" ><i class="icon selected mIcon"></i>{{brandname}}</span>
+                            <span class="placeholder" ><i class="icon brand mIcon"></i>{{brandname}}</span>
                             <ul v-show="selectBrand">
                                 <li  v-for="(item,index) in BrandList"   :key="index" :value='item.id' @click="ChangeBrand(item)">{{item.name}}</li>
                             </ul>

src/main/resources/templates/product/detail.html

@@ -247,10 +247,14 @@
                     <a th:href="@{'/supplier/index.html?id=' + ${product.shopId}}">
                         <div class="name"><span th:text="${product.shopTitle}"></span><i th:if="not${#strings.isEmpty(product.license)}" class="icon shop"></i></div>
                     </a>
-                    <div class="tit">经营范围：</div>
-                    <div class="con" th:text="${product.businessScope}"></div>
-                    <div class="tit">所在地区：</div>
-                    <div class="con" th:text="${product.shopAddress}"></div>
+                    <template th:if="not${#strings.isEmpty(product.businessScope)}">
+                        <div class="tit">经营范围：</div>
+                        <div class="con" th:text="${product.businessScope}"></div>
+                    </template>
+                    <template  th:if="not${#strings.isEmpty(product.shopAddress)}">
+                        <div class="tit">所在地区：</div>
+                        <div class="con" th:text="${product.shopAddress}"></div>
+                    </template>
                     <div class="tit">满意度：<i th:each="i:${#numbers.sequence(1,5)}" class="icon heart"></i></div>
                     <a th:href="@{'/supplier/index.html?id=' + ${product.shopId}}" class="btn">查看主页</a>
                 </div>

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

@@ -155,13 +155,13 @@
                     <div class="title">公司基本信息</div>
                     <p><span class="l">公司</span>：<span th:text="${supplier.name}"></span></p>
                     <p><span class="l">满意度</span>：<span><i v-for="i in 5" class="icon mIcon heart"></i></span></p>
-                    <p><span class="l">经营范围</span>：<span><em class="tag" th:each="bus: ${supplier.businessScopeArr}" th:text="${bus}"></em></span></p>
+                    <p th:if="not${#strings.isEmpty(supplier.businessScopeArr)}"><span class="l">经营范围</span>：<span><em class="tag" th:each="bus: ${supplier.businessScopeArr}" th:text="${bus}"></em></span></p>
                 </div>
-                <div class="part">
+                <div class="part" th:if="not${#strings.isEmpty(supplier.info)}">
                     <div class="title">公司介绍</div>
                     <div class="cont" th:utext="${supplier.info}"></div>
                 </div>
-                <div class="part">
+                <div class="part" th:if="not${#strings.isEmpty(supplier.productDesc)}">
                     <div class="title">主打系列产品说明</div>
                     <div class="cont" th:utext="${supplier.productDesc}"></div>
                 </div>
@@ -173,7 +173,7 @@
                         </a>
                     </div>
                 </div>
-                <div class="part">
+                <div class="part" th:if="not${#strings.isEmpty(supplier.taxCertificate)}">
                     <div class="title">公司资质</div>
                     <div class="photo">
                         <a th:href="${supplier.taxCertificate}" target="_blank">