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

src/main/resources/templates/components/footer.html

@@ -3,7 +3,7 @@
         <div class="wrap mf">
             <span class="icon mIcon mfi">国内首家美业共享平台</span>
             <span class="icon mIcon mfi">采美正品联盟货源保证</span>
-            <span class="icon mIcon mfi">5000+美容机构入驻</span>
+            <span class="icon mIcon mfi">6000+美容机构入驻</span>
             <span class="icon mIcon mfi">100+国际国内知名供应商</span>
         </div>
     </div>

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

@@ -157,7 +157,9 @@
                         <a class="image" th:href="'/product-'+ *{productId} +'.html'">
                             <img src="/img/base/placeholder.png"  th:attr="data-original=*{image}" th:alt="*{name}">
                             <p class="name">
-                                <span th:if="*{beautyActFlag}==1" class="tag">美博会</span>
+                                <th:block th:if="${product.containsKey('beautyActFlag')}">
+                                    <span th:if="*{beautyActFlag}==1" class="tag">美博会</span>
+                                </th:block>
                                 <th:block th:text="*{name}"></th:block>
                             </p>
                             <div class="price">

src/main/resources/templates/supplier-center/order/list.html

@@ -109,12 +109,12 @@
                                 </div>
                                  <div class="userinfo" >
                                         <div class="username">
-                                             <p>买家名称：<span class="blcak">{{order.userInfo.name}}</span> </p>
-                                             <p >收货人：<span class="blcak">{{order.userInfo.receiver}}</span> </p>
-                                             <p >联系方式：<span class="blcak">{{order.userInfo.mobile}}</span> </p>
+                                             <p>买家名称：<span class="blcak">{{ order.userInfo ? order.userInfo.name : ''}}</span> </p>
+                                             <p >收货人：<span class="blcak">{{ order.userInfo ? order.userInfo.receiver : ''}}</span> </p>
+                                             <p >联系方式：<span class="blcak">{{ order.userInfo ? order.userInfo.mobile : ''}}</span> </p>
                                         </div>
                                         <div class="address">
-                                            <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
+                                            <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{ order.userInfo ? order.userInfo.address : ''}}</span> </p>
                                         </div>
                                  </div>
                             </div>