diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml index 41788f0..b3051f7 100644 --- a/pages/process/order-list/index.wxml +++ b/pages/process/order-list/index.wxml @@ -58,7 +58,7 @@ 结算金额(元): - {{item.adjustedPrice || '- -'}} + {{item.adjustedPrice || item.settlePrice || '- -'}} @@ -76,8 +76,8 @@ bind:click="paymentItem" wx:if="{{item.status == 4 && admin}}">去支付 去结算 - 恢复订单 + 查看日志 diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index c0de98c..0546793 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -32,8 +32,11 @@ - - 订单信息 + + + 订单信息 + + 取消订单 @@ -147,8 +150,7 @@ - 取消订单 - 提交订单 + 提交订单 diff --git a/pages/process/outside-add/index.wxml b/pages/process/outside-add/index.wxml index 0cf6645..26c24a7 100644 --- a/pages/process/outside-add/index.wxml +++ b/pages/process/outside-add/index.wxml @@ -4,8 +4,11 @@ - - 订单信息 + + + 订单信息 + + 取消订单 @@ -83,11 +86,7 @@ - - 取消订单 - 提交订单 - - + 提交订单 diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml index 6ea8081..0853c35 100644 --- a/pages/process/outside-list/index.wxml +++ b/pages/process/outside-list/index.wxml @@ -54,7 +54,7 @@ 结算金额(元): - {{item.adjustedPrice || '- -'}} + {{item.adjustedPrice || item.settlePrice || '- -'}} diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index e4ad59b..dddddd5 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -61,7 +61,7 @@ 品类:{{item.productName}} 重量:{{item.settleWeight}}公斤 - 金额:{{formate.formateAmount(item.adjustedPrice, 2)}}元 + 金额:{{formate.formateAmount(item.adjustedPrice || item.settlePrice, 2)}}元