diff --git a/pages/client/factory-list/index.wxml b/pages/client/factory-list/index.wxml index ed93ec8..1136cca 100644 --- a/pages/client/factory-list/index.wxml +++ b/pages/client/factory-list/index.wxml @@ -22,7 +22,7 @@ 客户名称:{{item.factoryCustomerName}} ({{item.factoryCustomerMobile}}) - 毛重:{{item.totalWeight}}KG + 毛重:{{item.totalWeight}}公斤 待付款 diff --git a/pages/client/order-list/index.wxml b/pages/client/order-list/index.wxml index 4ebd372..e27550b 100644 --- a/pages/client/order-list/index.wxml +++ b/pages/client/order-list/index.wxml @@ -28,7 +28,7 @@ 客户名称:{{item.factoryCustomerName}} ({{item.factoryCustomerMobile}}) - 毛重:{{item.totalWeight}}KG + 毛重:{{item.totalWeight}}公斤 待付款 diff --git a/pages/htmls/auths/index.wxss b/pages/htmls/auths/index.wxss index 42103d6..7435e4b 100644 --- a/pages/htmls/auths/index.wxss +++ b/pages/htmls/auths/index.wxss @@ -22,5 +22,8 @@ } .dialog-input { - padding:0rpx 16rpx;border:1rpx solid #eee;height:80rpx;margin:64rpx + padding:0rpx 16rpx; + border:1rpx solid #eee; + height:80rpx; + margin:64rpx } diff --git a/pages/process/check-list/index.wxml b/pages/process/check-list/index.wxml index 818942c..54ffb29 100644 --- a/pages/process/check-list/index.wxml +++ b/pages/process/check-list/index.wxml @@ -22,7 +22,7 @@ 客户名称:{{item.factoryCustomerName}} ({{item.factoryCustomerMobile}}) - 毛重:{{item.totalWeight}}KG + 毛重:{{item.totalWeight}}公斤 - 毛重(KG) + 毛重(公斤) {{form.totalWeight}} - 皮重(KG) + 皮重(公斤) {{form.emptyWeight || '- -'}} - 净重(KG) + 净重(公斤) {{form.netWeight || '- -'}} - 扣重(KG) + 扣重(公斤) -{{form.deductWeight}} @@ -111,7 +111,7 @@ - 单价(元/KG) + 单价(元/公斤) {{formate.formateAmount(form.settleUnitPrice)}} diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml index 84f2c85..941d700 100644 --- a/pages/process/order-list/index.wxml +++ b/pages/process/order-list/index.wxml @@ -28,7 +28,7 @@ 客户名称:{{item.factoryCustomerName}} ({{item.factoryCustomerMobile}}) - 毛重:{{item.totalWeight}}KG + 毛重:{{item.totalWeight}}公斤 Number(this.data.nowItem.highestUnitPrice)){ - util.showToast('输入单价过高,价格范围:' + this.data.nowItem.lowestUnitPrice + '元/KG-'+ this.data.nowItem.highestUnitPrice + '元/KG') + util.showToast('输入单价过高,价格范围:' + this.data.nowItem.lowestUnitPrice + '元/公斤-'+ this.data.nowItem.highestUnitPrice + '元/公斤') return } if(this.data.nowItem.lowestUnitPrice && Number(this.data.form.unitPrice) < Number(this.data.nowItem.lowestUnitPrice)){ - util.showToast('输入单价过低,价格范围:' + this.data.nowItem.lowestUnitPrice + '元/KG-'+ this.data.nowItem.highestUnitPrice + '元/KG') + util.showToast('输入单价过低,价格范围:' + this.data.nowItem.lowestUnitPrice + '元/公斤-'+ this.data.nowItem.highestUnitPrice + '元/公斤') return } } diff --git a/pages/process/order-price/index.json b/pages/process/order-price/index.json index acef63c..9956fd2 100644 --- a/pages/process/order-price/index.json +++ b/pages/process/order-price/index.json @@ -9,6 +9,7 @@ "van-picker": "/components/picker/index", "van-popup": "/components/popup/index", "van-dialog": "/components/dialog/index", + "van-field": "/components/field/index", "vehicle-keyboard": "/components/vehicle-keyboard/index" } } \ No newline at end of file diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index 0c0e064..f14a9d2 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -30,7 +30,7 @@ - 单价(元/KG) + 单价(元/公斤) * - 扣重(KG) + 扣重(公斤) - + @@ -52,7 +54,9 @@ 扣点(%) - + @@ -64,10 +68,11 @@ + - 毛重(KG) + 毛重(公斤) {{form.totalWeight}} @@ -86,9 +91,11 @@ - + 取消 - 提交 + 提交 + diff --git a/pages/process/payment-list/index.wxml b/pages/process/payment-list/index.wxml index 4a62dbc..f084ac3 100644 --- a/pages/process/payment-list/index.wxml +++ b/pages/process/payment-list/index.wxml @@ -29,7 +29,6 @@ 废纸品类:{{item.productName}} - 金额:{{formate.formateAmount(item.settlePrice)}}元 diff --git a/project.config.json b/project.config.json index edc4de4..1e50666 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ "newFeature": false, "coverView": true, "nodeModules": true, - "autoAudits": false, + "autoAudits": true, "showShadowRootInWxmlPanel": true, "scopeDataCheck": false, "uglifyFileName": true,