From c529688932ec3802ed710b324239434c71c3f54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 9 Sep 2021 11:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/address/address.vue   | 24 ++++++++++++------------
 pages/passport/wechatMPLogin.vue |  2 +-
 pages/product/shopPage.vue       | 22 ++++++++++++----------
 utils/request.js                 |  4 ++--
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/pages/mine/address/address.vue b/pages/mine/address/address.vue
index 7964f6e..1b50987 100644
--- a/pages/mine/address/address.vue
+++ b/pages/mine/address/address.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="address">
 
-    <u-empty class="empty" v-if="empty" text="暂无收货地址" mode="address"></u-empty>
+    <u-empty class="empty" v-if="addressList.length == 0" text="暂无收货地址" mode="address"></u-empty>
     <view class="list" v-else>
       <view class="item c-content" v-for="(item, index) in addressList" :key="index">
         <view class="basic" @click="selectAddressData(item)">
@@ -50,7 +50,6 @@ export default {
     return {
       addressList: [], //地址列表
       showAction: false, //是否显示下栏框
-      empty: false, //是否为空
       removeList: [
         {
           text: "确定",
@@ -67,11 +66,16 @@ export default {
       },
     };
   },
-
+  onPullDownRefresh() {
+    //下拉刷新
+    this.addressList = [];
+    this.getAddressList();
+  },
   onLoad: function (val) {
     this.routerVal = val;
   },
   onShow() {
+    console.log("onshow");
     this.addressList = [];
     this.getAddressList();
   },
@@ -92,15 +96,11 @@ export default {
         this.params.pageNumber,
         this.params.pageSize
       ).then((res) => {
-        if (res.data.result.records.length == 0) {
-          this.empty = true;
-        } else {
-          res.data.result.records.forEach((item) => {
-            item.consigneeAddressPath = item.consigneeAddressPath.split(",");
-          });
-
-          this.$set(this, "addressList", res.data.result.records);
-        }
+        res.data.result.records.forEach((item) => {
+          item.consigneeAddressPath = item.consigneeAddressPath.split(",");
+        });
+        this.addressList = res.data.result.records;
+        console.log(this.addressList);
 
         uni.hideLoading();
       });
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index 2b5dcb2..0d26346 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -244,7 +244,7 @@ text.shop {
 .btn-callback {
   text-align: center;
   font-size: 30rpx;
-  border: 1rpx solid #ededed;
+  background: #ededed;
   height: 90rpx;
   line-height: 90rpx;
   border-radius: 100px;
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 40b432f..70e0d96 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -6,7 +6,8 @@
     <div class="wrapper">
       <!-- 店铺信息模块 -->
       <div class="store flex">
-        <u-image border-radius="10" width="150" height="150" :src="storeInfo.storeLogo || config.logo" mode="aspectFit"></u-image>
+        <u-image border-radius="10" width="150" height="150" :src="storeInfo.storeLogo || config.logo" mode="aspectFit">
+        </u-image>
         <div class="box">
           <div class="store-name" @click="getStoreLicencePhoto">
             {{ storeInfo.storeName || ''}}
@@ -83,7 +84,8 @@
         </div>
         <!-- 分类子级 -->
         <div class="child-list" v-if="item.children && item.children.length!=0">
-          <div class="child" @click="getCategoryGoodsList(child)" v-for="(child,i) in item.children">{{child.labelName}}</div>
+          <div class="child" @click="getCategoryGoodsList(child)" v-for="(child,i) in item.children">{{child.labelName}}
+          </div>
         </div>
       </div>
     </div>
@@ -99,7 +101,7 @@ import {
   collectionGoods,
   getGoodsIsCollect,
 } from "@/api/members.js";
-import config from '@/config/config'
+import config from "@/config/config";
 import storage from "@/utils/storage";
 import { getGoodsList } from "@/api/goods.js";
 import { getAllCoupons } from "@/api/promotions.js";
@@ -137,18 +139,18 @@ export default {
   onPageScroll(e) {
     this.scrollTop = e.scrollTop;
   },
+  onPullDownRefresh() {
+   
+     this.init();
+  },
   mounted() {
-    // #ifdef MP-WEIXIN
+     // #ifdef MP-WEIXIN
     // 小程序默认分享
     uni.showShareMenu({ withShareTicket: true });
     // #endif
     this.init();
   },
-  onShow() {
-    if (this.goodsList.length == 0) {
-      this.init();
-    }
-  },
+ 
   // 下拉加载
   onReachBottom() {
     this.goodsParams.pageNumber++;
@@ -322,7 +324,7 @@ export default {
           duration: 3000,
           title: "请先登录！",
         });
-      
+
         this.$options.filters.navigateToLogin("redirectTo");
         return false;
       }
diff --git a/utils/request.js b/utils/request.js
index aa33e95..0a202de 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -84,7 +84,7 @@ function cleanStorage() {
     uni.navigateTo({
       url: "/pages/passport/wechatMPLogin",
     });
-  }, 1000);
+  }, 500);
   // #endif
 
   // #ifndef MP-WEIXIN
@@ -92,7 +92,7 @@ function cleanStorage() {
     uni.navigateTo({
       url: "/pages/passport/login",
     });
-  }, 1000);
+  }, 500);
   //  #endif
 }