From 41426416bd250130129fb8a547bee874375768a8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:47:15 +0800
Subject: [PATCH] 1.付款：改成15分钟，并使用服务器时间进行倒计时 2.优惠券中心：已经领取（达到最大次数），显示已领取且置灰，未领取根据创建时间放前面，已领取根据首次时间正序排序 3.购物车-提交订单：自动根据订单金额选择合适优惠券
---
sub_pages/supplier/order-manage/order-manage-settlement.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index a79379d..9de9b62 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -9,7 +9,7 @@
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
<view v-if="list&&list.length>0">
<view class="flex title-bold tj-money bg-white m-t-12 p10">
- <view class="m-r-20">待结算：￥{{tj_total-tj_has||0}}</view>
+ <view class="m-r-20">待结算：￥{{ (tj_total-tj_has).toFixed(2)||0}}</view>
<view class="t-red">已结算：￥{{tj_has||0}}</view>
</view>
</view>
@@ -245,7 +245,8 @@
if (this.list) {
for (var item of this.list) {
if (!item.status) {
- v += item.totalAmount || 0
+ // v += item.totalAmount || 0
+ v += item.income || 0
} else {
v += (item.income || 0)
}
--
Gitblit v1.9.3