diff --git a/src/pages.json b/src/pages.json index 25acc6a..91e9320 100644 --- a/src/pages.json +++ b/src/pages.json @@ -242,12 +242,6 @@ "navigationBarTitleText": "客户详情" } } - // { - // "path": "uni_modules/lime-echart", - // "style": { - // "navigationBarTitleText": "组件库" - // } - // } ] }, { diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue index df07150..6b78190 100644 --- a/src/pagesShipment/form/settlementForm.vue +++ b/src/pagesShipment/form/settlementForm.vue @@ -462,9 +462,9 @@ watch( (model1.order.unitPrice || 0) * (model1.order.settlementWeight || 0) ).toFixed(2) ); - if (!model1.order.totalPrice) { - model1.order.totalPrice = model1.order.estimatePrice; - } + // if (!model1.order.totalPrice) { + // model1.order.totalPrice = model1.order.estimatePrice; + // } model1.order.realIncome = (model1.order.totalPrice || 0) -