From 297734ace4c05848b28a792fa89f38bee67be3c1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 09:41:34 +0800
Subject: [PATCH] 合并

---
 mini-program/pages/mall/mall.vue |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/mini-program/pages/mall/mall.vue b/mini-program/pages/mall/mall.vue
index 5b43004..e8821cc 100644
--- a/mini-program/pages/mall/mall.vue
+++ b/mini-program/pages/mall/mall.vue
@@ -8,7 +8,7 @@
 					<text>鍟嗗煄</text>
 					<view class="head-search-input">
 						<u-search placeholder="鎼滅储鍟嗗搧" height="30" searchIconColor="#999999" borderColor="#eeeeee"
-							bgColor="rgba(255,255,255,0.9)" @custom="search" :showAction="false" v-model="form.goodsName" @search="search" />	
+							bgColor="rgba(255,255,255,0.9)" @clear="search" :showAction="false" v-model="form.goodsName" @search="search" />	
 					</view>
 				</view>
 				<view class="head-tabs">
@@ -44,8 +44,9 @@
 				</view>
 			</view>
 			<!-- 鍝佺墝 -->
-			<view class="list" style="padding-top: 30rpx; box-sizing: border-box; justify-content: flex-start;" v-if="show === 2">
+			<view class="list" style="padding-top: 30rpx; box-sizing: border-box;" v-if="show === 2">
 				<view :class="item.active ? 'list-cate active' : 'list-cate'" v-for="(item, index) in pingpai" :key="index" @click="getXiLie(item.id, index)">{{item.name}}</view>
+				<view style="width: 216rpx; height: 0;"></view>
 			</view>
 			<!-- 绯诲垪 -->
 			<view class="list" v-if="show === 3">
@@ -61,7 +62,7 @@
 			</view>
 			<view class="commodity-item" v-else v-for="(item, i) in goodsList" :key="i" @click="jumpDetails(item.id)">
 				<view class="commodity-item-image">
-					<image :src="item.imgurl" mode="widthFix"></image>
+					<image :src="item.imgurl?item.imgurl:'/static/icon/default2.png'" mode="widthFix"></image>
 				</view>
 				<view class="commodity-item-box">
 					<view class="commodity-item-box-title">
@@ -83,7 +84,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="cart">
+		<view class="cart" @click="jumpCart">
 			<view class="cart-box">
 				<image src="/static/icon/ic_cart@2x.png" mode="widthFix"></image>
 				<text>璐墿杞�</text>
@@ -99,7 +100,7 @@
 	} from 'vuex'
 	export default {
 		computed: {
-			...mapState(['navHeight', 'statusbarHeight'])
+			...mapState(['navHeight', 'statusbarHeight', 'userInfo'])
 		},
 		watch: {
 			paixu: {
@@ -165,14 +166,24 @@
 			};
 		},
 		onLoad() {
-			this.getCartNum()
 			this.getLabels()
 			this.getGoodsList()
+		},
+		async onShow() {
+			await this.$onLaunched;
+			if (this.userInfo) {
+				this.getCartNum()
+			}
 		},
 		onReachBottom() {
 			this.getGoodsList()
 		},
 		methods: {
+			jumpCart() {
+				uni.navigateTo({
+					url: '/pages/shopping-cart/shopping-cart'
+				})
+			},
 			getCartNum() {
 				this.$u.api.cartGoodsTypeNum()
 					.then(res => {
@@ -528,10 +539,10 @@
 					font-size: 28rpx;
 					color: #333333;
 					margin-bottom: 24rpx;
-					margin-right: 20rpx;
-					&:last-child {
-						margin-right: 0 !important;
-					}
+					// margin-right: 20rpx;
+					// &:last-child {
+					// 	margin-right: 0 !important;
+					// }
 				}
 				.red {
 					text {

--
Gitblit v1.9.3