Merge branch 'developer' into developerC

src/main/resources/static/js/shopping/confirm.js

@@ -659,7 +659,7 @@ var shoppingConfirm = new Vue({
         },
         submitOrder: function(){// 提交按钮点击
             var _self = this;
-            if( _self.hanldShouldPayFee<1000){
+            if( _self.totalPrice<1000){
                 _self.isModelAlert = true;
                 _self.isModelAlertText = '采购金额过小，将扣除500采美豆。建议您使用微信扫描 以下二维码，进入采美旗下“呵呵商城”小程序购买小额 商品。';
             }else{

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">