Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd

backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientActivityController.java

@@ -49,6 +49,7 @@ public class ClientActivityController {
                   t1.endTime,
                   t1.signStartTime,
                   t1.signEndTime,
+                  t1.coHostUnit,
                   t1.cover
                 FROM
                   activity t1

frontend/src/pages/activity/detail/index.vue

@@ -5,7 +5,8 @@
       <view style="flex: 1;overflow-y: auto">
         <!-- 活动图片 -->
         <view class="event-header">
-          <image :src="detailData.cover" mode="aspectFill" class="event-cover"/>
+          <t-image :src=config.fileDomain+detailData.cover shape="round"
+                   class="event-cover" fit="fill"/>
         </view>
 
         <!-- 活动标题与标签 -->
@@ -76,11 +77,13 @@
                   <!-- 项目图片区域 -->
                   <!--                  v-if="item.img"-->
                   <!--                  :src="item.img"-->
-                  <image
+<!--                  <image
                       src="https://api.zzzmh.cn/v2/bz/v3/getUrl/c9d3deb2880411ebb6edd017c2d2eca220"
                       mode="aspectFill"
                       class="event-item-image"
-                  />
+                  />-->
+                  <t-image :src=config.fileDomain+item.img shape="round"
+                           class="event-item-image" fit="fill"/>
 
                   <!-- 项目信息区域 -->
                   <view class="event-item-info">
@@ -170,6 +173,7 @@ import {ref, onMounted, computed} from 'vue';
 import {onLoad} from '@dcloudio/uni-app';
 import {Toast} from 'tdesign-mobile-vue';
 import {useRequest} from "@/utils/request";
+import {config} from "@/utils/config";
 
 const request = useRequest();
 const actId = ref(null);

frontend/src/pages/activity/list/index.vue

@@ -34,6 +34,7 @@
 
           <view>
             <view style="display: flex;align-items: center;margin-bottom: 10px">
+
               <image
                   src="https://assets.cumen.fun/upload/017cdaf1-c5fa-788e-eea2-d0ee249f902b/0187376a-3cfa-07b3-3cd6-7479bf463865?x-oss-process=style/720-jpg"
                   style="width: 30px;height: 30px;flex-shrink: 0"
@@ -44,7 +45,8 @@
               </view>
             </view>
             <view style="display: flex;">
-              <image :src="item.cover" mode="aspectFill" style="flex-shrink:0;width: 120px;height: 90px;border-radius: 5px;"></image>
+              <t-image :src=config.fileDomain+item.cover shape="round"
+                       style="flex-shrink:0;width: 120px;height: 90px;border-radius: 5px;" fit="fill"/>
               <view
                   style="margin-left:10px;flex:1;overflow:hidden;display: flex;flex-direction: column;justify-content:space-around;color: #534d4d;">
                 <view
@@ -64,7 +66,7 @@
             </view>
             <view style="border-top: 1px solid #f0f0f0;margin-top: 10px;padding-top: 12px;display: flex;align-items: center;justify-content: space-between">
               <view>
-                100人已报名
+<!--                100人已报名-->
               </view>
               <t-button theme="primary" shape="round" size="small">立即报名</t-button>
             </view>
@@ -92,6 +94,7 @@ import {ref, reactive, onMounted} from 'vue';
 import {Toast} from 'tdesign-mobile-vue';
 import {useRequest} from "@/utils/request";
 import moment from "moment";
+import {config} from "@/utils/config";
 
 // 活动状态筛选选项
 const statusOptions = [

frontend/src/pages/index/index.vue

@@ -55,9 +55,8 @@
         <t-swiper-item v-for="(item, index) in actList" :key="index" style="height: 192px">
           <view class="activity-list" @click="navigateTo('/pages/activity/detail/index?id=' + item.id)">
             <view class="activity-item">
-              <image class="activity-image"
-                     :src="item.cover"
-                     mode="widthFix"></image>
+              <t-image :src=config.fileDomain+item.cover shape="round"
+                       class="activity-image" fit="fill"/>
               <view class="activity-info">
                 <view class="activity-title">{{ item.title }}</view>
                 <view class="activity-meta">
@@ -84,9 +83,8 @@
       <view class="activity-list" v-if="wonderfulMomentList.length > 0">
         <view class="moment-item" v-for="item in wonderfulMomentList" :key="item.id"
               @click="handleWonderfulMoment(item)">
-          <image class="moment-image"
-                 :src="item.cover"
-                 mode="widthFix"></image>
+          <t-image :src=config.fileDomain+item.cover shape="round"
+                   class="moment-image" fit="fill"/>
           <view class="moment-content">
             <view class="moment-title">{{ item.title }}</view>
             <view class="moment-sub-content">
@@ -111,6 +109,7 @@ import {onMounted, ref} from "vue";
 import {Toast} from "tdesign-mobile-vue";
 import {useRequest} from "@/utils/request";
 import moment from "moment";
+import {config} from "@/utils/config";
 
 const request = useRequest()
 
@@ -332,6 +331,7 @@ uni-page-body {
 }
 
 .activity-image {
+  height: 200px;
   width: 100%;
 }