From 346eb13d504f75b0e21983a01e16138c8432c289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 7 Jul 2021 10:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8B=BC=E5=9B=A2=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BC=98=E5=8C=96=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/deposit/operation.vue | 15 +++++++++++++--
 pages/promotion/joinGroup.vue    | 10 +++++-----
 pages/tabbar/user/my.vue         |  2 +-
 pages/tabbar/user/utils/tool.vue |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/pages/mine/deposit/operation.vue b/pages/mine/deposit/operation.vue
index 693ecba..9e53816 100644
--- a/pages/mine/deposit/operation.vue
+++ b/pages/mine/deposit/operation.vue
@@ -27,8 +27,19 @@ export default {
     };
   },
   async mounted() {
-    let result = await getUserWallet(); //预存款
-    this.walletNum = result.data.result.memberWallet;
+    if (this.$options.filters.isLogin("auth")) {
+      let result = await getUserWallet(); //预存款
+      this.walletNum = result.data.result.memberWallet;
+    } else {
+      uni.showToast({
+        icon: "none",
+        duration: 3000,
+        title: "请先登录！",
+      });
+      uni.redirectTo({
+        url: "/pages/passport/login",
+      });
+    }
   },
   methods: {
     back() {
diff --git a/pages/promotion/joinGroup.vue b/pages/promotion/joinGroup.vue
index 8e3267b..95bde10 100644
--- a/pages/promotion/joinGroup.vue
+++ b/pages/promotion/joinGroup.vue
@@ -23,7 +23,7 @@
     <!-- 商品栏 -->
     <div class="swiper">
 
- 
+      <div v-if="groupBuy.length !=0">
         <view class="view-item" v-for="(groupItem, groupIndex) in groupBuy" :key="groupIndex">
           <view class="view-left">
             <u-image border-radius="10" shape="square" :src="groupItem.goodsImage" width="186rpx" height="186rpx">
@@ -54,7 +54,8 @@
           </view>
         </view>
         <u-loadmore bg-color='#f8f8f8' :status="status" />
-  
+      </div>
+      <u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
 
     </div>
 
@@ -91,8 +92,8 @@ export default {
       val ? (this.title = "") : (this.title = "拼团活动");
     },
   },
-  onReachBottom(){
-    this.loadMore()
+  onReachBottom() {
+    this.loadMore();
   },
   // 点击搜索按钮
   onNavigationBarButtonTap(e) {
@@ -151,5 +152,4 @@ export default {
 
 <style lang="scss" scoped>
 @import "./style.scss";
-
 </style>
diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index 9874d32..5501b1d 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -71,7 +71,7 @@
 
     <!-- 常用工具 -->
 
-    <tool class="box" />
+    <tool  />
 
   </view>
 </template>
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 16f196f..7f17354 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -116,7 +116,7 @@ export default {
 .interact-tools {
   border-left: none;
   border-right: none;
-  margin-top: 30rpx;
+
 
   .interactBox {
     height: 156rpx;