From 9cef926543d4e3fc6152cf7a8be507287c022af4 Mon Sep 17 00:00:00 2001
From: minimaxagent1 <minimaxagent1@gmail.com>
Date: Mon, 4 Aug 2025 16:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E8=AF=A6=E7=BB=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E7=BB=86=E5=8C=96=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/activity-card/activity-card.vue |  7 +++-
 enum/common.js                             |  4 +-
 pages/activity/activityDetail.vue          | 45 ++++++++++++++--------
 pages/nearbystores/index.vue               | 12 +++---
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/components/activity-card/activity-card.vue b/components/activity-card/activity-card.vue
index 8081907..49b81e6 100644
--- a/components/activity-card/activity-card.vue
+++ b/components/activity-card/activity-card.vue
@@ -20,7 +20,7 @@
         
         <!-- 活动名称 -->
         <view class="activity-name">
-          <text class="name-text">{{ activity.name }}</text>
+          <text class="name-text">{{ activityName }}</text>
         </view>
         
         <!-- 活动状态 -->
@@ -102,7 +102,10 @@ export default {
     // 状态样式类
     statusClass() {
       return ACTIVITY_STATUS_CLASS[this.activity.status] || ''
-    }
+    },
+    activityName() {
+      return this.activity.name.split(' ')[0] || this.activity.name
+    },
   },
   methods: {
     // 获取默认背景图片
diff --git a/enum/common.js b/enum/common.js
index 66931e9..c565e8d 100644
--- a/enum/common.js
+++ b/enum/common.js
@@ -8,7 +8,9 @@ export const CommonEnum = {
     TILE: "https://api.ccttiot.com/image-1753750309203.png", //瓦片图片
     FILTER: "https://api.ccttiot.com/image-1753954149098.png", //筛选图标
     REFRESH:"https://api.ccttiot.com/%E5%AE%B9%E5%99%A8-1754011714179.png", //刷新图标
-    NAV_ARROW:"https://api.ccttiot.com/image-1754127104177.png" //导航箭头
+    NAV_ARROW:"https://api.ccttiot.com/image-1754127104177.png", //导航箭头
+    PHONE:"https://api.ccttiot.com/image-1754292810234.png",//电话图标
+    ADDRESS:"https://api.ccttiot.com/image-1754292905805.png"//地址图标
 
 };
 export default CommonEnum;
\ No newline at end of file
diff --git a/pages/activity/activityDetail.vue b/pages/activity/activityDetail.vue
index 198a122..bdfeaa3 100644
--- a/pages/activity/activityDetail.vue
+++ b/pages/activity/activityDetail.vue
@@ -64,11 +64,11 @@
         <!-- 底部操作按钮 -->
         <view class="bottom-actions">
           <view class="action-button phone-button" @click="handlePhoneCall">
-            <text class="button-icon">📞</text>
+            <image class="button-icon" :src="CommonEnum.PHONE" mode="aspectFit"></image>
             <text class="button-text">电话</text>
           </view>
           <view class="action-button location-button" @click="handleLocation">
-            <text class="button-icon">📍</text>
+            <image class="button-icon" :src="CommonEnum.ADDRESS" mode="aspectFit"></image>
             <text class="button-text">地址</text>
           </view>
           <view class="action-button register-button" @click="handleRegister">
@@ -319,7 +319,7 @@ page {
   align-items: flex-start;
   flex-direction: column;
   padding: 0 15rpx;
-  padding-bottom: 40rpx;
+  padding-bottom: 200rpx; /* 为固定底部按钮留出空间 */
 }
 
 .activity-detail {
@@ -391,11 +391,9 @@ page {
 
 .activity-description {
   width: 100%;
-  background: #fff;
   border-radius: 16rpx;
   padding: 30rpx;
   margin-bottom: 30rpx;
-  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
   
   .description-title {
     margin-bottom: 20rpx;
@@ -418,41 +416,54 @@ page {
 }
 
 .bottom-actions {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
   width: 100%;
   display: flex;
   align-items: center;
   gap: 20rpx;
-  padding: 20rpx 0;
+  height: 62px;
+  padding: 30rpx 40rpx;
+  background: #fff;
+  border-top: 1rpx solid #f0f0f0;
+  border-radius: 20rpx 20rpx 0 0;
+  margin-bottom: 12rpx;
   
   .action-button {
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    padding: 20rpx;
     border-radius: 12rpx;
-    background: #fff;
-    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
     
     &.phone-button, &.location-button {
       flex: 1;
       min-height: 120rpx;
-      
+      background: transparent;
+
       .button-icon {
-        font-size: 40rpx;
-        margin-bottom: 10rpx;
+        width: 48rpx;
+        height: 48rpx;
+        margin-bottom: 12rpx;
+        filter: brightness(0) saturate(100%) invert(27%) sepia(51%) saturate(2878%) hue-rotate(346deg) brightness(104%) contrast(97%);
       }
       
       .button-text {
-        font-size: 24rpx;
-        color: #666;
+        font-size: 26rpx;
+        color: #522510;
+        font-weight: 400;
       }
     }
     
     &.register-button {
-      flex: 2;
-      min-height: 120rpx;
-      background: #E74C3C;
+      flex: 4;
+      background: #A24242;
+      border-radius: 60rpx;
+      padding: 0 40rpx;
+      width: 227px;
+      height: 38px;
       
       .button-text {
         font-size: 32rpx;
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 219ee7c..cc0513b 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -39,8 +39,8 @@
 			<view class="hua">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uyz1LDPTjPqeOzBMjLZ7" mode=""></image>
 			</view>
-              <view class="list-scroll">
-			<view class="list">
+      <view class="list-scroll">
+			  <view class="list">
             <view 
               class="li" 
               v-for="item in navigationItems" 
@@ -48,12 +48,12 @@
               @click="navigateToPage(item.page)"
             >
               <image :src="item.img" mode=""></image>
-					<view class="da">
+					  <view class="da">
                 {{ item.title }}
-					</view>
-					<view class="xiao">
+					  </view>
+					  <view class="xiao">
                 {{ item.subtitle }}
-					</view>
+					  </view>
 					</view>
 				</view>
 			</view>