diff --git a/app.js b/app.js index de47ff3..93a202a 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 2, // 0: 开发版本;1:测试版本;2:生产版本 + evn: 0, // 0: 开发版本;1:测试版本;2:生产版本 tmplIds: [''], version: 162, xAppId: '503258978847953926', diff --git a/components/transition/index.js b/components/transition/index.js index f3c96e4..3dd4c2e 100644 --- a/components/transition/index.js +++ b/components/transition/index.js @@ -1,8 +1,8 @@ 'use strict'; Object.defineProperty(exports, '__esModule', { value: true }); -var component_1 = require('../common/component'); -var transition_1 = require('../mixins/transition'); -component_1.VantComponent({ +var component = require('../common/component'); +var transition = require('../mixins/transition'); +component.VantComponent({ classes: [ 'enter-class', 'enter-active-class', @@ -11,5 +11,5 @@ component_1.VantComponent({ 'leave-active-class', 'leave-to-class', ], - mixins: [transition_1.transition(true)], + mixins: [transition.transition(true)], }); diff --git a/pages/formate.wxs b/pages/formate.wxs index 94892a3..f4f5c9a 100644 --- a/pages/formate.wxs +++ b/pages/formate.wxs @@ -52,11 +52,14 @@ function formateDate(datetime) { return datetime + week } -function formateAmount(amount) { +function formateAmount(amount, fix) { if (isEmpty(amount)) { return '' } - return Number(amount).toFixed(2) + if(!fix){ + fix = 3 + } + return Number(amount).toFixed(fix) } function formateWeight(weight) { diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml index a60eec1..45277c9 100644 --- a/pages/process/order-info/index.wxml +++ b/pages/process/order-info/index.wxml @@ -93,7 +93,7 @@ 过毛重照片 - @@ -106,7 +106,7 @@ 过皮重照片 - @@ -137,7 +137,7 @@ 结算金额(元) - {{formate.formateAmount(form.settlePrice) || '- -'}} + {{formate.formateAmount(form.settlePrice, 2) || '- -'}} diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index 8238f73..05fa7bc 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -108,7 +108,7 @@ 过毛重照片 - diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index dea077f..07c63a2 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -6,7 +6,7 @@ 付款金额(元) - {{formate.formateAmount(amount)}} + {{formate.formateAmount(amount, 2)}} @@ -147,7 +147,7 @@ 过毛重照片 - @@ -160,7 +160,7 @@ 过皮重照片 - diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml index fee0818..8f990c3 100644 --- a/pages/storage/order-create/index.wxml +++ b/pages/storage/order-create/index.wxml @@ -59,7 +59,7 @@ - @@ -73,7 +73,7 @@ - diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml index 2e95074..fd24d51 100644 --- a/pages/storage/order-info/index.wxml +++ b/pages/storage/order-info/index.wxml @@ -50,7 +50,7 @@ - @@ -64,7 +64,7 @@ - @@ -181,7 +181,7 @@ - @@ -195,7 +195,7 @@ - diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml index 3821dd2..7996c16 100644 --- a/pages/storage/order-settlement/index.wxml +++ b/pages/storage/order-settlement/index.wxml @@ -114,7 +114,7 @@ - @@ -128,7 +128,7 @@ - diff --git a/pages/storage/pound-info/index.wxml b/pages/storage/pound-info/index.wxml index 63c756d..d4b3224 100644 --- a/pages/storage/pound-info/index.wxml +++ b/pages/storage/pound-info/index.wxml @@ -11,7 +11,7 @@ - @@ -25,7 +25,7 @@ -