From 32a6bbacd0b2cc78676e22f503e356b27f27751f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Sat, 25 Dec 2021 10:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A2=86=E5=8A=B5=E5=88=A4=E6=96=AD=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E4=B8=AD=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=87=BA=E7=8E=B0=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     |  3 ++-
 pages/cart/coupon/myCoupon.vue |  1 +
 pages/tabbar/cart/cartList.vue | 11 +++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index f776bdf..9b10a21 100644
--- a/pages.json
+++ b/pages.json
@@ -19,7 +19,8 @@
 			"path": "pages/tabbar/cart/cartList",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"navigationBarBackgroundColor": "#fff"
+				"navigationBarBackgroundColor": "#fff",
+				"enablePullDownRefresh":true    //实现下拉刷新样式
 
 			}
 		}, {
diff --git a/pages/cart/coupon/myCoupon.vue b/pages/cart/coupon/myCoupon.vue
index 3732497..41b562c 100644
--- a/pages/cart/coupon/myCoupon.vue
+++ b/pages/cart/coupon/myCoupon.vue
@@ -116,6 +116,7 @@ export default {
   },
 
   onShow() {
+    this.navList[this.tabCurrentIndex].params.pageNumber = 1
     this.navList[this.tabCurrentIndex].dataList = [];
     this.getData();
   },
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 525684a..e8691d7 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -27,10 +27,11 @@
               <!-- #endif -->
             </u-checkbox-group>
             <span class="store-name store-line-desc" @click.stop="navigateToStore(item)">{{
-              item.storeName
+              item.storeName 
             }}</span>
+            <u-icon @click="navigateToStore(item)"  size="24" style="margin-left:10rpx;"  name="arrow-right"></u-icon>
           </view>
-          <view class="right-col" @click="navigateToConpon(item)">
+          <view class="right-col" v-if="item.canReceiveCoupon" @click="navigateToConpon(item)">
             <div class="right-line"></div>
             <span>领劵</span>
           </view>
@@ -214,6 +215,10 @@ export default {
     uni.showShareMenu({ withShareTicket: true });
     // #endif
   },
+  onPullDownRefresh(){
+    console.log("132")
+    this.getCardData();
+  },
   /**
    * 初始化信息
    */
@@ -508,6 +513,7 @@ export default {
         });
         API_Trade.getCarts()
           .then((result) => {
+            uni.stopPullDownRefresh();
             if (result.data.success) {
               this.cartDetail = result.data.result;
               this.checkout = true;
@@ -596,6 +602,7 @@ page {
 
 .store-name {
   font-weight: bold;
+  font-size: 28rpx;
 }
 .invalid {
   filter: grayscale(1);