From b902b40fda2f1dccca0825277d07908119deecfd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/mall/mall.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/mini-program/pages/mall/mall.vue b/mini-program/pages/mall/mall.vue
index e8821cc..28dd9e1 100644
--- a/mini-program/pages/mall/mall.vue
+++ b/mini-program/pages/mall/mall.vue
@@ -12,7 +12,7 @@
</view>
</view>
<view class="head-tabs">
- <u-tabs lineColor="#E4001D" :list="list" @click="clickCate"></u-tabs>
+ <u-tabs lineColor="#E4001D" :itemStyle="{ height: '100rpx' }" :list="list" @click="clickCate"></u-tabs>
</view>
</view>
@@ -88,9 +88,10 @@
<view class="cart-box">
<image src="/static/icon/ic_cart@2x.png" mode="widthFix"></image>
<text>璐墿杞�</text>
- <view class="cart-num">{{cardTotal}}</view>
+ <view class="cart-num" v-if="cardTotal>0">{{cardTotal}}</view>
</view>
</view>
+ <Login ref="login" />
</view>
</template>
@@ -98,7 +99,9 @@
import {
mapState
} from 'vuex'
+ import Login from '@/components/login/login.vue'
export default {
+ components: { Login },
computed: {
...mapState(['navHeight', 'statusbarHeight', 'userInfo'])
},
@@ -180,6 +183,10 @@
},
methods: {
jumpCart() {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
uni.navigateTo({
url: '/pages/shopping-cart/shopping-cart'
})
@@ -199,6 +206,10 @@
this.getGoodsList()
},
addCard(e) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
this.$u.api.addCart({
goodsId: e.id,
goodsSkuId: e.skuResponsesList[0].id,
@@ -508,8 +519,8 @@
.head-tabs {
width: 100%;
height: 100rpx;
- display: flex;
- align-items: flex-end;
+ // display: flex;
+ // align-items: flex-end;
border-bottom: 1rpx solid #E5E5E5;
}
}
--
Gitblit v1.9.3