From 2bdbe5c962f3a2ee2f6a25224a589f517abe71f8 Mon Sep 17 00:00:00 2001
From: Sun_sun <469361609@qq.com>
Date: Fri, 24 Oct 2025 16:55:40 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-24=20=E7=BB=86=E8=8A=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/finance/production.vue |  2 +-
 pages/my/car.vue             | 19 +++++++++++++++----
 pages/my/my.vue              | 18 +++++++++++++-----
 pages/my/order.vue           |  3 ++-
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/pages/finance/production.vue b/pages/finance/production.vue
index 0c51a9e..88b24ea 100644
--- a/pages/finance/production.vue
+++ b/pages/finance/production.vue
@@ -54,7 +54,7 @@
 
 		<!-- 底部按钮 -->
 		<view class="bottom-actions">
-			<u-button class="consult-btn" @click="handleConsult">立即咨询</u-button>
+			<u-button hover-class="none" class="consult-btn" @click="handleConsult">立即咨询</u-button>
 		</view>
 	</view>
 
diff --git a/pages/my/car.vue b/pages/my/car.vue
index c68bf77..6d20311 100644
--- a/pages/my/car.vue
+++ b/pages/my/car.vue
@@ -56,7 +56,11 @@
 		<view class="box-bottom" id="boxBottom">
 			<u-checkbox v-model="isAllCheck" shape="circle" @change="handleSelectAll">全选</u-checkbox>
 			<view class="right">
-				合计：豆{{rongdou}} 分{{point}}
+				合计：
+				<image class="icon" src="/static/icon/rongdou.png" mode=""></image>
+				{{rongdou}}
+				<image class="icon" src="/static/icon/jifen.png" mode=""></image>
+				{{point}}
 				<u-button class="u-m-l-10" @click="handleSubmit">{{isManage?'删除':'结算'}}</u-button>
 			</view>
 		</view>
@@ -81,7 +85,9 @@
 	import {
 		getImageUrl
 	} from '../../util/common.js';
-	import {onShow} from '@dcloudio/uni-app'
+	import {
+		onShow
+	} from '@dcloudio/uni-app'
 
 	const msgRef = ref()
 
@@ -200,8 +206,8 @@
 			cartList.value.forEach(item => item.isCheck = false)
 		})
 	}
-	
-	onShow(()=>{
+
+	onShow(() => {
 		loadData()
 	})
 
@@ -280,6 +286,11 @@
 				display: flex;
 				justify-content: flex-end;
 				align-items: center;
+
+				.icon {
+					width: 30rpx;
+					height: 30rpx;
+				}
 			}
 		}
 	}
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 3fb414b..b6e77c5 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="my-container">
-		<scroll-view scroll-y="true" style="height: 100%;" :refresher-threshold="50" :refresher-triggered="isRefresher" refresher-background="transparent"
-			refresher-enabled="true" @refresherrefresh="reflash">
+		<scroll-view scroll-y="true" style="height: 100%;" :refresher-threshold="50" :refresher-triggered="isRefresher"
+			refresher-background="transparent" refresher-enabled="true" @refresherrefresh="reflash">
 			<view v-if="user!=null">
 				<view class="header">
 					<view class="header-user">
@@ -48,7 +48,7 @@
 					</view>
 					<view class="item" @click="shop_car">
 						<view class="count">
-							283
+							{{totalCartCount}}
 						</view>
 						<view class="title">
 							购物车
@@ -159,10 +159,13 @@
 	} from '../../api/auth.js';
 	import {
 		onShow
-	} from '@dcloudio/uni-app'
+	} from '@dcloudio/uni-app';
+	import {
+		mallAPI
+	} from '../../api/mall.js'
 
 	const user = ref()
-	
+
 	const isRefresher = ref(false)
 	const reflash = () => {
 		isRefresher.value = true
@@ -181,12 +184,17 @@
 		})
 	}
 
+	const totalCartCount = ref(0)
+
 	const loadData = () => {
 		authAPI.me().then(res => {
 			user.value = res.user
 		}).finally(() => {
 			isRefresher.value = false
 		})
+		mallAPI.getCartList().then(res => {
+			totalCartCount.value = res.data.items.length
+		})
 	}
 
 	onShow(() => {
diff --git a/pages/my/order.vue b/pages/my/order.vue
index 8251101..9c7e1af 100644
--- a/pages/my/order.vue
+++ b/pages/my/order.vue
@@ -188,7 +188,7 @@
 					<image class="icon" src="/static/icon/rongdou.png" mode=""></image>
 					{{detailInfo.real_rongdou}}
 				</view>
-				<view class="info-value" v-if="detailInfo.real_points">
+				<view class="info-value" v-else-if="detailInfo.real_points">
 					<image class="icon" src="/static/icon/jifen.png" mode=""></image>
 					{{detailInfo.real_points}}
 				</view>
@@ -363,6 +363,7 @@
 				if (maxPage.value < params.value.page) {
 					loadStatus.value = 'nomore'
 				}
+				console.log(orderList.value);
 			})
 		} else if (currentTab.value == 2) {
 			// 理财产品