bugCommit

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

@@ -150,7 +150,7 @@
                    <div  class="btnBox" v-if="priceObj.priceFlag==2 && userIdentity!=2">
                       <a class="upgrade" href="/upgrade.html">升级会员查看价格</a>
                    </div>
-                    <div class="btnBox" v-else-if="priceObj.priceFlag==0">
+                    <div class="btnBox" v-else-if="priceObj.priceFlag==2">
                         <a href="javascript:void(0);" class="cart icon" @click='addShopCart()'>加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()">立即购买</a>
                     </div>

src/main/resources/templates/shopping/confirm.html

@@ -302,7 +302,7 @@
                 </div>
             </div>
             <div class="right mfbt">
-                <div class="item">总价：<em v-text="'¥'+toFloat(totalPrice)"></em></div>
+                <div class="item">总价：<em>¥{{payInfo.orderShouldPayFee | NumFormat}}</em></div>
                 <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder()">提交订单</a>
             </div>
         </div>

src/main/resources/templates/user-center/order/detail.html

@@ -70,7 +70,7 @@
                                     <p v-if="orderInfo.freePostFlag == '-1'">运费：<span>到付</span> </p>
                                     <p v-if="orderInfo.freePostFlag == '1'">运费：<span>￥{{orderInfo.freight | NumFormat}}</span> </p>
                                     <p v-if="orderInfo.discountFee!=0">经理折扣：<span>￥{{orderInfo.discountFee | NumFormat}}</span> </p>
-                                    <p>促销满减：<span>￥{{orderInfo.payTotalFee | NumFormat}}</span> </p>
+                                    <p>促销满减：<span>￥{{orderInfo.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>赠品数：<span>{{orderInfo.presentCount}}</span></p>
                                 </div>
                             </div>