huodong

nova-werun/components/circle/index.js

@@ -20,7 +20,7 @@ Component({
         bottomNavHeight: 0, // 底部导航栏高度
         contentHeight: 0, // 可用内容高度
         contentpadding: 0, //顶部padding高度
-        navheight:0,//nav栏高度
+        navheight: 0, //nav栏高度
         //朋友圈
         cardList: [],
 
@@ -28,7 +28,7 @@ Component({
         pageSize: 6, // 每次加载的商品数量
         noMoreItems: false, // 是否还有更多商品
 
-
+        ActivityList:[],
     },
     lifetimes: {
 
@@ -45,10 +45,10 @@ Component({
             const customHeight = custom.height + 10 + 2 || 0;
             const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
             const contentHeight = (screenHeight - 50 - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-            const navheight = (statusBarHeight+customHeight) * 750 / systemInfo.windowWidth;
+            const navheight = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
             this.setData({
                 statusBarHeight,
-                screenHeight:(screenHeight-50-bottomNavHeight) * 750 / systemInfo.windowWidth,
+                screenHeight: (screenHeight - 50 - bottomNavHeight) * 750 / systemInfo.windowWidth,
                 customHeight,
                 bottomNavHeight,
                 contentHeight,
@@ -57,6 +57,7 @@ Component({
             // console.log('123', contentHeight);
             // this.iddepe()
             this.getcircle()
+            this.getact()
         },
 
     },
@@ -128,8 +129,8 @@ Component({
         getcircle2() {
             this.setData({
                 cardList: [],
-                loadedItems:0,
-                noMoreItems:false
+                loadedItems: 0,
+                noMoreItems: false
             })
             console.log('运行了');
             this.getcircle()
@@ -142,23 +143,38 @@ Component({
             });
         },
         //判断是否有部门
-    //    async  iddepe(){
-    //         const currentUser = Parse.User.current();
-    //         let Profilequery2 = new Parse.Query('Profile');
-    //         Profilequery2.equalTo('company', company);
-    //         Profilequery2.equalTo('user', currentUser.id);
-    //         Profilequery2.equalTo('isCheck', true);
-    //         Profilequery2.notEqualTo('isDeleted', true)
-    //         let P2 = await Profilequery2.first();
-    //         if(P2){
-    //             this.getcircle()
-    //         }else{
-    //             wx.navigateTo({
-    //                 url: '../../pages/my/my-profile/index?type='+'资料认证'// 目标页面的路径
-    //             });
-    //         }
-    //     }
-
+        //    async  iddepe(){
+        //         const currentUser = Parse.User.current();
+        //         let Profilequery2 = new Parse.Query('Profile');
+        //         Profilequery2.equalTo('company', company);
+        //         Profilequery2.equalTo('user', currentUser.id);
+        //         Profilequery2.equalTo('isCheck', true);
+        //         Profilequery2.notEqualTo('isDeleted', true)
+        //         let P2 = await Profilequery2.first();
+        //         if(P2){
+        //             this.getcircle()
+        //         }else{
+        //             wx.navigateTo({
+        //                 url: '../../pages/my/my-profile/index?type='+'资料认证'// 目标页面的路径
+        //             });
+        //         }
+        //     }
 
+        //首页活动
+        async getact() {
+            let Activityquery = new Parse.Query('Activity');
+            Activityquery.equalTo('company', company);
+            Activityquery.notEqualTo('isDeleted', true);
+            Activityquery.equalTo('isEnabled', true);
+            Activityquery.ascending('index'); // 按index升序排序
+            Activityquery.limit(4); // 限制结果为前四个
+        
+            let P = await Activityquery.find();
+            let ActivityList = P.map(item => item.toJSON());
+        
+            this.setData({
+                ActivityList,
+            });
+        }
     }
 })

nova-werun/components/circle/index.less

@@ -78,13 +78,15 @@
                 }
                 .acbox{
                     width: 100%;
-                    height: 177rpx;
+                    justify-content: space-around;
                     margin-top: 20rpx;
                     display: flex;
+                    flex-wrap: wrap;
                     .ac-picbox{
                         width: 310rpx;
                         height: 177rpx;
                         position: relative;
+                        margin-top: 20rpx;
                         image{
                             width: 310rpx;
                             height: 177rpx;
@@ -111,41 +113,6 @@
                         }
                     }
                 }
-                .paihangbox{
-                    width: 662rpx;
-                    height: 185rpx;
-                    display: flex;              /* 使用 Flexbox 布局 */
-                    // justify-content: space-between; /* 均匀分布 */
-                    justify-content: center;
-                    align-items: center;
-                    border-radius: 20rpx;
-                    margin-top: 26rpx;
-                    position: relative;
-                    image{
-                        width: 662rpx;
-                        height: 185rpx;
-                        border-radius: 20rpx;
-                    }
-                    .picbox{
-                        width: 100rpx;
-                        height: 44rpx;
-                        display: flex;
-                        justify-content: center;
-                        align-items: center;
-                        background-image: url(https://file-cloud.fmode.cn/qpFbRRSZrO/20241224/u1uhl1104441535.png);
-                        background-position: center; /* 背景图片居中 */
-                        background-size: cover; /* 背景图片覆盖整个元素 */
-                        background-repeat: no-repeat; /* 不重复背景图片 */
-                        position: absolute;
-                        bottom: 0rpx;
-                        right: 0rpx;
-                        .pic-tex{
-                            font-family: MicrosoftYaHei;
-                            font-size: 18rpx;
-                            color: #FFFEFE;
-                        }
-                    }
-                }
             }
             .no-more{
                 width: 100%;

nova-werun/components/circle/index.wxml

@@ -17,26 +17,14 @@
                 </view>
             </view>
             <view class="acbox">
-                <view class="ac-picbox">
-                    <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20241224/if1tgq043014423.png"></image>
-                    <view class="picbox">
-                        <view class="pic-tex">立即报名</view>
-                    </view>
-                </view>
-                <view class="ac-picbox" style="margin-left: auto;">
-                    <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250114/9p4gl1115625428.jpg"></image>
+                <view class="ac-picbox" wx:for="{{ActivityList}}">
+                    <image src="{{item.cover[0]}}"></image>
                     <view class="picbox">
                         <view class="pic-tex">立即报名</view>
                     </view>
                 </view>
 
             </view>
-            <view class="paihangbox">
-                <image src="https://file-cloud.fmode.cn/qpFbRRSZrO/20250114/2g19mh115625957.jpg"></image>
-                <view class="picbox">
-                        <view class="pic-tex">立即报名</view>
-                    </view>
-            </view>
         </view>
         <view style="width: 100%;padding-left: 32rpx;padding-right: 32rpx;">
             <block wx:for="{{cardList}}" wx:key="{{item.objectId}}">

nova-werun/components/home/index.js

@@ -301,7 +301,7 @@ Component({
                         // }
                         if (res.data.data) {
                             const stepInfoList = res.data.data.stepInfoList
-                            console.log(stepInfoList);
+                            console.log('时间戳',stepInfoList);
                             const todaylist = stepInfoList.filter(item => {
                                 console.log(this.isToday(item));
                                 return this.isToday(item); // 使用 isToday 函数判断是否是今天