From 7f40887829f1e46cd8399ca3cd2b69b83c19749c Mon Sep 17 00:00:00 2001
From: lin <342011128@qq.com>
Date: Mon, 21 Mar 2022 17:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.修改折扣1折显示问题
2.修改取消订单请求两次的问题
---
 rc-busness/pages/personal/discount.vue        |  2 +-
 rc-busness/pages/personal/settlement.vue      |  2 +-
 rc-busness/pages/personal/useraddress.vue     | 12 +++++++-----
 rc-busness/pages/productdetails/producted.vue |  3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue
index f1fb7b69..56e1dd01 100644
--- a/rc-busness/pages/personal/discount.vue
+++ b/rc-busness/pages/personal/discount.vue
@@ -37,7 +37,7 @@
 						￥
 					</i>
 					<span>
-						{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
+						{{ item.couponAmount?item.couponAmount:(parseInt(10 - item.discount*10)+'折') }}
 					</span>
                 </div>
                 <strong>{{ item.couponName }}</strong>
diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index 368fc431..e3caa8c6 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/rc-busness/pages/personal/settlement.vue
@@ -167,7 +167,7 @@
 						￥
 					</i>
 					<span>
-						{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
+						{{ item.couponAmount?item.couponAmount:(parseInt(10 - item.discount*10)+'折') }}
 					</span>
 				</div>
 				<strong>{{ item.couponName }}</strong>
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index 2daaac97..dec7612b 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -356,11 +356,13 @@ export default {
           type: "warning",
           message: "取消订单成功",
         });
-        setTimeout(() => {
-            this.indet(this.userdata);
-            this.activeIndex=0;
-            this.useralllist=[];
-        }, 500);
+		/* 这个在全部变量去除的时候 记得加 */
+   //      setTimeout(() => {
+   //          this.indet(this.userdata);
+   //          this.activeIndex=0;
+   //          this.useralllist=[];
+			// console.log('2222');
+   //      }, 500);
          
       }
     },
diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue
index 9b72952b..345747fc 100644
--- a/rc-busness/pages/productdetails/producted.vue
+++ b/rc-busness/pages/productdetails/producted.vue
@@ -237,7 +237,8 @@
 		  			￥
 		  		</i>
 		  		<span>
-		  			{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
+					<!-- 不合并 因为0.1计算器不是0.1 -->
+		  			{{ item.couponAmount?item.couponAmount:(parseInt(10 - item.discount*10)+'折') }}
 		  		</span>
 		  	</div>
 		  	<strong>{{ item.couponName }}</strong>