From 18d59ca85b2bc9ccac4a90203c3b2486acf3b113 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 12 九月 2024 09:19:55 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0

---
 components/banner3d/banner3d.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/banner3d/banner3d.vue b/components/banner3d/banner3d.vue
index 6e0722d..a4004cf 100644
--- a/components/banner3d/banner3d.vue
+++ b/components/banner3d/banner3d.vue
@@ -39,7 +39,7 @@
 							<view class="desc">
 								<span
 									v-if="bannerList[i].point.end">{{bannerList[i].point.current || 0}}/{{bannerList[i].point.end}},升级还需{{bannerList[i].point.end-bannerList[i].point.current}}成长值</span>
-								<span v-else>成长值:{{bannerList[i].point.current || 0}}</span>
+								<span v-else>当前成长值:{{bannerList[i].point.current || 0}}</span>
 							</view>
 						</view>
 					</view>
@@ -149,8 +149,8 @@
 				background-color: #9DBEDF;
 				padding: 8rpx 14rpx;
 				color: #fff;
-				border-top-left-radius: 16rpx;
-				border-bottom-right-radius: 16rpx;
+				border-top-left-radius: 8rpx;
+				border-bottom-right-radius: 8rpx;
 				text-align: center;
 				line-height: 48rpx;
 				min-width: 132rpx;

--
Gitblit v1.9.3