fix 活动卡片文字显示位置调整

hookehuyr
Commit 24388e42635fa65e2c60cffc6f4e61094a0f4cff 24388e42 1 parent b762822a
Showing 2 changed files with 21 additions and 16 deletions
src/components/activity-card.vue
src/pages/my/index.vue
--- a/src/components/activity-card.vue
View file @24388e4
+++ b/src/components/activity-card.vue
View file @24388e4
 <!--
  * @Date: 2022-09-20 15:39:37
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-11-03 18:05:26
+ * @LastEditTime: 2022-11-03 18:21:01
  * @FilePath: /swx/src/components/activity-card.vue
  * @Description: 活动卡片组件
 -->
@@ -14,7 +14,7 @@
         </van-col>
         <van-col :span="14" offset="0">
           <view @tap="goTo(data.id, formatStatus(data))" class="card-main-text">
-            <view style="font-size: 1.1rem;">{{ data.name }}</view>
+            <view style="font-size: 0.95rem; text-align: justify;">{{ data.name }}</view>
             <view class="status-text">
               <van-tag v-if="data.mode === 'offline'" :round="true" color="#E9FAF4" text-color="#199A74" size="large">现场活动</van-tag>
               <van-tag v-if="data.mode === 'online'" :round="true" color="#E9FAF4" text-color="#199A74" size="large">线上活动</van-tag>
@@ -22,19 +22,20 @@
               <van-tag v-else-if="formatStatus(data) === '已结束'" :round="true" color="#EDEDED" text-color="#909090" size="large">{{ formatStatus(data) }}</van-tag>
               <van-tag v-else-if="formatStatus(data)" :round="true" color="#D7FFD7" text-color="#019200" size="large">{{ formatStatus(data) }}</van-tag>
             </view>
-            <view style="font-size: 0.95rem;">
+            <!-- <view style="font-size: 0.95rem;">
               <van-icon name="clock-o" color="#BBBBBB" />&nbsp;{{ formatDate(data.activity_time) }}
-            </view>
+            </view> -->
           </view>
         </van-col>
       </van-row>
       <view v-if="status === 'creator'">
         <view @tap="editActivity(data)" class="edit-button">编辑</view>
-        <view @tap="finishActivity(data)" v-if="formatStatus(data) === '报名未开始' || formatStatus(data) === '报名中' || formatStatus(data) === '报名结束' || formatStatus(data) === '活动进行中'" class="finish-button">结束</view>
-        <view @tap="delActivity(data)" v-if="formatStatus(data) === '未发布' || formatStatus(data) === '已结束'" class="close-button">删除</view>
       </view>
     </view>
     <view class="card-sub">
+      <view style="font-size: 0.9rem; margin-bottom: 0.25rem;">
+        <van-icon name="clock-o" color="#BBBBBB" />&nbsp;{{ formatDate(data.activity_time) }}
+      </view>
       <van-row v-if="data.address">
         <van-col :span="24" offset="0">
           <view>
@@ -56,6 +57,8 @@
           </view>
         </van-col>
       </van-row>
+      <view @tap="finishActivity(data)" v-if="formatStatus(data) === '报名未开始' || formatStatus(data) === '报名中' || formatStatus(data) === '报名结束' || formatStatus(data) === '活动进行中'" class="finish-button">结束</view>
+      <view @tap="delActivity(data)" v-if="formatStatus(data) === '未发布' || formatStatus(data) === '已结束'" class="close-button">删除</view>
       <view v-if="status === 'creator' && formatStatus(data) !== '已结束'" @tap="copyActivity(data.id)" class="copy-button">复制</view>
     </view>
   </view>
@@ -131,6 +134,7 @@ const delActivity = ({ id }) => {
   margin-bottom: 1rem;
   .card-main {
     padding: 0.8rem;
+    padding-right: 0;
     border-bottom: 1px solid #F2F2F2;
     position: relative;
     .card-main-text {
@@ -139,7 +143,7 @@ const delActivity = ({ id }) => {
     .edit-button {
       position: absolute;
       right: 0;
-      bottom: 1rem;
+      bottom: 1.2rem;
       background-color: #BBBBBB;
       color: white;
       padding: 0.25rem;
@@ -149,10 +153,16 @@ const delActivity = ({ id }) => {
       border-bottom-left-radius: 1rem;
       font-size: 0.85rem;
     }
+
+  }
+  .card-sub {
+    padding: 0.85rem;
+    font-size: 0.85rem;
+    position: relative;
     .finish-button {
       position: absolute;
       right: 0;
-      bottom: 4rem;
+      bottom: 3.5rem;
       background-color: #DABE73;
       color: white;
       padding: 0.25rem;
@@ -165,7 +175,7 @@ const delActivity = ({ id }) => {
     .close-button {
       position: absolute;
       right: 0;
-      bottom: 4rem;
+      bottom: 3.5rem;
       background-color: #E32525;
       color: white;
       padding: 0.25rem;
@@ -175,11 +185,6 @@ const delActivity = ({ id }) => {
       border-bottom-left-radius: 1rem;
       font-size: 0.85rem;
     }
-  }
-  .card-sub {
-    padding: 0.85rem;
-    font-size: 0.85rem;
-    position: relative;
     .copy-button {
       position: absolute;
       right: 0;
--- a/src/pages/my/index.vue
View file @24388e4
+++ b/src/pages/my/index.vue
View file @24388e4
 <!--
  * @Date: 2022-09-21 14:51:44
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-11-03 16:13:18
+ * @LastEditTime: 2022-11-03 18:14:22
  * @FilePath: /swx/src/pages/my/index.vue
  * @Description: 我的页面
 -->
@@ -169,7 +169,7 @@ export default {
           url: '../myFollowUser/index?host_id=' + this.join_hosts[0]['id']
         })
       } else {
-        Toast('您还未加入过义工')
+        Toast('您还不是义工')
       }
     }
   }