From ef7e2ed9697787de81d852d2e43140bfb8f05914 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Tue, 7 May 2024 18:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/index.vue | 7 +++++++
pages/users/order_list/index.vue | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/pages/user/index.vue b/pages/user/index.vue
index e448404..034fda6 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -664,6 +664,13 @@
openType = 1;
else
openType = 2;
+ // 没有同意协议 就是一般用户 不是商户
+ let user = this.$store.state.app.userInfo;
+ if (!user.mer_info || !user.mer_info.mer_settlement_agree_status || user
+ .mer_info.mer_settlement_agree_status != 1) {
+ openType = 1;
+ }
+
item.url = '/pages/users/order_list/index?status=2&openType=' + openType
break
case '待评价':
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 2ce0bbe..a240c14 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -31,7 +31,8 @@
待收货
- {{orderData.noDeliver || 0}}
+ {{(Number(orderData.noDeliver)) || 0}}
+ {{( Number(orderData.mer_noDeliver)) || 0}}
待评价