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

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

@@ -288,7 +288,7 @@
                 <span v-if="payInfo.freePostFlag==1"><em>¥{{payInfo.freight | NumFormat}}</em></span>
             </p>
             <p v-if="balance.deductMoney>0">抵扣账户余额: <span><em>¥{{balance.deductMoney | NumFormat}}</em></span></p>
-            <p>总价: <span><em>¥{{totalPrice | NumFormat}}</em></span></p>
+            <p>总价: <span><em>¥{{payInfo.orderShouldPayFee | NumFormat}}</em></span></p>
         </div>
     </div>