bug

nova-werun/components/circle-card/index.js

@@ -118,7 +118,9 @@ Component({
             let AIMomentquery = new Parse.Query('AIMoment');
             AIMomentquery.equalTo('company', company);
             AIMomentquery.equalTo('objectId', this.data.objectId);
-            AIMomentquery.equalTo('isVisible', true);
+            if(!this.data.permission){
+                AIMomentquery.equalTo('isVisible', true);
+            }
             AIMomentquery.include('profile.user');
             AIMomentquery.include('profile');
             AIMomentquery.include('user');

nova-werun/components/circle-card/index.wxml

@@ -2,8 +2,8 @@
 <view class="trends-one" bindtouchstart="onTouchStart" wx:if="{{objectId&&type=='detail'}}">
     <!-- 详细-->
     <view wx:if="{{type=='detail'}}" class="namebax">
-        <image src="{{cicleList[0].profile.user.avatar}}"></image>
-        <view class="name">{{cicleList[0].profile.user.nickname}}</view>
+        <image src="{{cicleList[0].user.avatar}}"></image>
+        <view class="name">{{cicleList[0].user.nickname}}</view>
     </view>
     <view class="text" wx:if="{{type=='detail'}}">{{cicleList[0].content}}</view>
     <!-- 图片 -->
@@ -27,8 +27,8 @@
     <view class="picture3" wx:if="{{images.length==1}}">
         <image mode="scaleToFill" bindtap="openpreviewImg" data-index="{{index}}" class="{{imageclass}}" wx:for="{{images}}" src="{{item}}" bindload="onImageLoad"> </image>
     </view>
-        <!-- 预览组件 -->
-        <previewImg id="previewComponent" previewImgList = "{{imgList}}" previewImg = "{{currentImg}}"  />
+    <!-- 预览组件 -->
+    <previewImg id="previewComponent" previewImgList="{{imgList}}" previewImg="{{currentImg}}" />
     <!-- 地址 -->
     <view class="addbox" wx:if="{{cicleList[0].location}}">
         <van-icon name="location-o" size='28rpx' />
@@ -129,6 +129,8 @@
     <view class="namebax" wx:if="{{type=='surface'}}" bindtap="gourl" data-url="../../pages/circle/circle-detail/index" data-id="{{cicleList[0].objectId}}">
         <image src="{{cicleList[0].user.avatar}}"></image>
         <view class="name">{{cicleList[0].user.nickname}}</view>
+        <view style="margin-left: auto;font-family: MicrosoftYaHei;font-size: 28rpx;color: #333333;" wx:if="{{ permission=='delete'&&cicleList[0].isVisible==true}}">已发布</view>
+        <view style="margin-left: auto;font-family: MicrosoftYaHei;font-size: 28rpx;color: #333333;" wx:if="{{ permission=='delete'&&cicleList[0].isVisible!=true}}">待审核</view>
     </view>
     <view wx:if="{{!showFull}}" class="text">
         <view wx:if="{{cicleList[0].content.length > maxLength}}">
@@ -179,7 +181,7 @@
         <image mode="scaleToFill" class="{{imageclass}}" data-index="{{index}}" wx:for="{{images}}" wx:key="index" src="{{item}}" bindload="onImageLoad" bindtap="openpreviewImg"> </image>
     </view>
     <!-- 预览组件 -->
-    <previewImg id="previewComponent" previewImgList = "{{imgList}}" previewImg = "{{currentImg}}"  />
+    <previewImg id="previewComponent" previewImgList="{{imgList}}" previewImg="{{currentImg}}" />
 
 
     <view class="addbox" wx:if="{{cicleList[0].location}}">

nova-werun/components/home/index.js

@@ -112,7 +112,6 @@ Component({
             this.order()
             this.Getlocation()
             this.gettoday()
-            this.getBackgroundColor(this.data.steps)
         },
     },
 

nova-werun/components/my/index.js

@@ -117,41 +117,41 @@ Component({
             this.setData({
                 profile1List2,
             })
-            if (profile1List2.length != 0) {
-                console.log('信息', this.data.profile1List2);
-                let Profilequery = new Parse.Query('AIMoment');
-                Profilequery.equalTo('company', company);
-                Profilequery.equalTo('isVisible', true);
-                Profilequery.notEqualTo('isDeleted', true);
-                Profilequery.equalTo('profile', profile1List2[0].objectId);
-                Profilequery.descending('createdAt');
-
-                let moments = await Profilequery.find(); // 查找所有动态
-
-                if (moments.length) {
-                    this.setData({
-                        circlecount: moments.length
-                    });
-
-                    // 获取所有动态的ID
-                    let momentIds = moments.map(moment => moment.id);
-
-                    // 创建对 AIMomentLike 表的查询
-                    let LikeQuery = new Parse.Query('AIMomentLike');
-                    LikeQuery.equalTo('isLiked', true);
-                    LikeQuery.equalTo('company', company);
-                    LikeQuery.notEqualTo('isDeleted', true);
-                    LikeQuery.containedIn('moment', momentIds); // 使用 containedIn 来一次性查询多个动态的点赞
-
-                    // 统计点赞数量
-                    let likesCount = await LikeQuery.count();
-
-                    // 这里可以进一步处理 likesCount，按动态分配点赞数量
-                    console.log(`总点赞数量: ${likesCount}`);
-                    this.setData({
-                        likesCount,
-                    })
-                }
+
+            console.log('信息', this.data.profile1List2);
+            let Profilequery = new Parse.Query('AIMoment');
+            Profilequery.equalTo('company', company);
+            Profilequery.equalTo('isVisible', true);
+            Profilequery.notEqualTo('isDeleted', true);
+            // Profilequery.equalTo('profile', profile1List2[0].objectId);
+            Profilequery.equalTo('user', currentUser.id);
+            Profilequery.descending('createdAt');
+
+            let moments = await Profilequery.find(); // 查找所有动态
+
+            if (moments.length) {
+                this.setData({
+                    circlecount: moments.length
+                });
+
+                // 获取所有动态的ID
+                let momentIds = moments.map(moment => moment.id);
+
+                // 创建对 AIMomentLike 表的查询
+                let LikeQuery = new Parse.Query('AIMomentLike');
+                LikeQuery.equalTo('isLiked', true);
+                LikeQuery.equalTo('company', company);
+                LikeQuery.notEqualTo('isDeleted', true);
+                LikeQuery.containedIn('moment', momentIds); // 使用 containedIn 来一次性查询多个动态的点赞
+
+                // 统计点赞数量
+                let likesCount = await LikeQuery.count();
+
+                // 这里可以进一步处理 likesCount，按动态分配点赞数量
+                console.log(`总点赞数量: ${likesCount}`);
+                this.setData({
+                    likesCount,
+                })
             }
 
         },

nova-werun/pages/circle/my-circle/index.js

@@ -96,20 +96,25 @@ Page({
     //查全部朋友圈
     async getcircle() {
         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.find();
-        let profile1List2 = P2.map(item => item.toJSON());
+        // 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.find();
+        // let profile1List2 = P2.map(item => item.toJSON());
+
+
 
         let Profilequery = new Parse.Query('AIMoment');
         Profilequery.equalTo('company', company);
-        Profilequery.equalTo('isVisible', true);
+        // Profilequery.equalTo('isVisible', true);
         Profilequery.notEqualTo('isDeleted', true)
-        Profilequery.equalTo('profile', profile1List2[0].objectId);
+        // Profilequery.equalTo('profile', profile1List2[0].objectId);
+        Profilequery.equalTo('user', currentUser.id);
+        Profilequery.include('user');
         Profilequery.descending('createdAt');
+
         // 设置查询的限制和偏移
         Profilequery.limit(this.data.pageSize);
         Profilequery.skip(this.data.loadedItems);

nova-werun/pages/index/index.js

@@ -145,7 +145,7 @@ Page({
     if (!componentPage) {
       return
     }
-    // componentPage.updatetoday()
+    componentPage.order()
     componentPage.gettarget()
   },
   //我的页面