From a860c8bb43bc26ff5a5d180529e87d5a5cc2a526 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Wed, 17 Aug 2022 17:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8=E4=B8=8D=E7=94=A8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=9C=B0=E5=9D=80=EF=BC=8C2=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=B7=A6=E4=BE=A7=E7=9A=84=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=AF=B9=E5=BA=94=E5=9C=B0=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabbar/my/my.vue                 | 4 ++--
 pagesB/add-address/add-address.vue     | 2 +-
 pagesB/confirm-order/confirm-order.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index 7eb35b2..a549e97 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -16,11 +16,11 @@
 		</view>
 		<view class="pad-zy30">
 			<view class="disjbac pad-sx30" style="background: linear-gradient(to bottom, #fefcfc 0%, #f8efed 100%);border-radius: 24rpx 24rpx 0 0;">
-				<view class="width33 disjcac fc">
+				<view class="width33 disjcac fc" @tap="$toolAll.tools.goPage('/pagesA/my-integral/my-integral')">
 					<view class="fon20" style="color: #3e3e3e;">我的积分</view>
 					<view class="fon36 bold">{{userInfo.score}}</view>
 				</view>
-				<view class="width33 disjcac fc" style="border-left: 2rpx solid #f1e8e7;border-right: 2rpx solid #f1e8e7;">
+				<view class="width33 disjcac fc" @tap="$toolAll.tools.goPage('/pagesA/my-coupon/my-coupon')" style="border-left: 2rpx solid #f1e8e7;border-right: 2rpx solid #f1e8e7;">
 					<view class="fon20" style="color: #3e3e3e;">我的优惠券(张)</view>
 					<view class="fon36 bold">{{userInfo.coupon_count}}</view>
 				</view>
diff --git a/pagesB/add-address/add-address.vue b/pagesB/add-address/add-address.vue
index 5e98e87..e594dfc 100644
--- a/pagesB/add-address/add-address.vue
+++ b/pagesB/add-address/add-address.vue
@@ -84,7 +84,7 @@
 				// 调用查看地址详情
 				this.getAddressDetail();
 			} else {
-				this.getDistrict();
+				// this.getDistrict();
 			}
 		},
 		methods: {
diff --git a/pagesB/confirm-order/confirm-order.vue b/pagesB/confirm-order/confirm-order.vue
index a5753f9..c36b815 100644
--- a/pagesB/confirm-order/confirm-order.vue
+++ b/pagesB/confirm-order/confirm-order.vue
@@ -129,7 +129,7 @@
 			goPay(){
 				if(this.flag){
 					this.flag = false;
-					if(this.addressInfo){
+					if(this.addressInfo || this.orderInfo.list[0].spu_type=='coupon'){
 						this.$toolAll.tools.showToast('正在调起支付...');
 						let params = {
 							sku_list:uni.getStorageSync('skuList'),