Merge branch 'master' into zyj

2023-07-10 10:06:57 +08:00
parent 6ad01cd6e8 e49eab5fa1
commit aa4b4d004e
14 changed files with 655 additions and 668 deletions
--- a/src/views/order/components/billOfLading.vue
+++ b/src/views/order/components/billOfLading.vue
@@ -362,7 +362,7 @@ export default {
      if (refineryInfo) {
        let balance = refineryInfo.balance * 10000
        let costTotal = orderInfo.floorPrice * orderInfo.preQuantity * 10000
-        let total = this.$utils.fixedHandle((balance + costTotal) / 10000)
+        let total = this.$utils.fixedHandle((balance - costTotal) / 10000)
        return total
      }
      return 0