Merge branch 'master' into zhongqi-chat

mallApp/src/pages/callback/pay.vue

@@ -106,7 +106,9 @@ export default {
       this.orderSn = this.option.orderSn ? this.option.orderSn : ''
       this.getPayType = this.option.getPayType
       if(this.option.totalPrice){
-        this.totalPrice = parseFloat(Number(this.option.totalPrice))
+        this.totalPrice = Number(this.option.totalPrice)
+        this.totalPrice = this.totalPrice.toFixed(2)
+        this.totalPrice = parseFloat(this.totalPrice)
       }
       this.pageStatus = this.option.pageStatus;
       this.payDiscountPrice = this.option.payDiscountPrice;