diff --git a/pages/cart/index.vue b/pages/cart/index.vue index 0f76900..5baa75a 100644 --- a/pages/cart/index.vue +++ b/pages/cart/index.vue @@ -86,6 +86,7 @@ import { back, go2 } from '@/utils/hook.js' import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue' import { getShoppingCarList, removeShoppingCar, closePaperReserve } from '@/apis/cartApi.js' import noData from './no-data.vue' +import { round } from '@/utils/index.js' export default { components: { uGap, qnInputNumber, qnFooter, noData }, data() { @@ -151,12 +152,12 @@ export default { this.list.forEach(shop => { shop.carItemList.forEach(good => { if (good.checked) { - num += Number(good.price) * Number(good.weight) + num += round( good.price * good.weight, 4) } }) }) } - return num.toFixed(4) + return num } }, methods: { @@ -333,8 +334,9 @@ export default { */ change(num, shop, good) { good.quantity = num - let buyTon = Number(good.gramWeight) * Number(good.quantity) - good.weight = (buyTon / (1000 * 1000)).toFixed(4) + good.weight = round(good.gramWeight * good.width * good.length * good.quantity * 1e-12, 4) + // let buyTon = Number(good.gramWeight) * Number(good.quantity) + // good.weight = (buyTon / (1000 * 1000)).toFixed(4) } } } diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue index 57c74ef..616ff56 100644 --- a/pages/enquiry-list/index.vue +++ b/pages/enquiry-list/index.vue @@ -11,7 +11,7 @@ - {{ item.belongEnterpriseName }} + {{ item.id }} {{ item.status | statusName }} diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue index b4098b4..36b7fff 100644 --- a/pages/paper-details/index.vue +++ b/pages/paper-details/index.vue @@ -143,6 +143,7 @@ import qnFooter from '@/components/qn-footer/qn-footer.vue' import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue' import { go2 } from '@/utils/hook.js' import { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js' +import { round } from '@/utils/index.js' export default { components: { uGap, qnFooter, qnInputNumber }, data() { @@ -213,10 +214,8 @@ export default { computed: { buyTon() { let num = 0 - num = Number(this.buyPaperDto.gramWeight) * Number(this.buyPaperDto.pieceQuantity) - - this.buyPaperDto.buyTon = num / (1000 * 1000) - return this.buyPaperDto.buyTon.toFixed(4) + num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4) + return num } }, methods: { diff --git a/utils/index.js b/utils/index.js index 9b0d029..70fc59d 100644 --- a/utils/index.js +++ b/utils/index.js @@ -116,3 +116,11 @@ export const makeSocket = async ({ pageInfo = '', retry = false }) => { return socket } +/** + * 正数的四舍五入 + * @value {number} num 需要四舍五入的数字 + * @value {number} precision 小数点后保留的位数 + */ +export function round(number, precision) { + return Math.round(+number + 'e' + precision) / Math.pow(10, precision) +}