邹能昇 преди 4 месеца
родител
ревизия
c0ff72cd34

+ 2 - 1
app.json

@@ -9,7 +9,8 @@
             "pages": [
                 "pages/index/index",
                 "pages/circle-detail/index",
-                "pages/send-circle/index"
+                "pages/send-circle/index",
+                "pages/my-circle/index"
             ]
         },
         {

+ 2 - 1
nova-werun/components/circle-card/index.js

@@ -7,7 +7,8 @@ Component({
      */
     properties: {
         objectId: '',
-        type: ''
+        type: '',
+        permission:''
     },
 
     /**

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

@@ -52,7 +52,7 @@
     <view class="timebox">
         <view class="time-box">
             <view class="time">{{time}}</view>
-            <!-- <van-icon name="delete-o" size='20' /> -->
+            <van-icon wx:if="{{ permission=='delete'}}" name="delete-o" size='20' />
         </view>
         <!-- 点赞评论 -->
         <view class="functionbox" wx:if="{{isgood}}">

+ 6 - 1
nova-werun/components/my/index.js

@@ -18,6 +18,11 @@ Component({
      * 组件的方法列表
      */
     methods: {
-
+        gourl(e) {
+            const url = e.currentTarget.dataset.url
+            wx.navigateTo({
+                url: `${url}`// 目标页面的路径
+            });
+        },
     }
 })

+ 4 - 1
nova-werun/components/my/index.wxml

@@ -1,2 +1,5 @@
 <!--nova-werun/components/my/index.wxml-->
-<text>nova-werun/components/my/index.wxml</text>
+<nav type="title"  background-color="{{'#87ceeb'}}" front-color="{{'#ffffff'}}"></nav>
+<view class="all" style="height: {{contentHeight}}rpx;">
+    <view bindtap="gourl" data-url="../../pages/my-circle/index">我的动态</view>
+</view>

+ 119 - 0
nova-werun/pages/my-circle/index.js

@@ -0,0 +1,119 @@
+// nova-werun/pages/my-circle/index.js
+const Parse = getApp().Parse;
+const company = getApp().globalData.company;
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        //屏幕高度
+        statusBarHeight: 0, // 状态栏高度
+        screenHeight: 0, // 屏幕高度
+        customHeight: 0, // 自定义导航栏高度(如小程序右上角胶囊按钮)
+        bottomNavHeight: 0, // 底部导航栏高度
+        contentHeight: 0, // 可用内容高度
+        contentpadding: 0, //顶部padding高度
+
+        //朋友圈
+        cardList: [],
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        // 计算
+        const systemInfo = wx.getSystemInfoSync();
+        const statusBarHeight = systemInfo.statusBarHeight || 0;
+        const screenHeight = systemInfo.screenHeight || 0;
+        const custom = wx.getMenuButtonBoundingClientRect();
+        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;
+        this.setData({
+            statusBarHeight,
+            screenHeight,
+            customHeight,
+            bottomNavHeight,
+            contentHeight
+        });
+        console.log('123', contentHeight);
+        this.getcircle()
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    },
+            //查全部朋友圈
+            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 Profilequery = new Parse.Query('AIMoment');
+                Profilequery.equalTo('company', company);
+                Profilequery.equalTo('isVisible', true);
+                Profilequery.notEqualTo('isDeleted', true)
+                Profilequery.equalTo('profile', profile1List2[0].objectId);
+
+                let P = await Profilequery.find();
+                let profile1List = P.map(item => item.toJSON());
+                profile1List.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
+                console.log(profile1List);
+                this.setData({
+                    cardList: profile1List
+                })
+                console.log(this.data.cardList);
+            },
+})

+ 5 - 0
nova-werun/pages/my-circle/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "circle-card":"../../components/circle-card/index"
+  }
+}

+ 15 - 0
nova-werun/pages/my-circle/index.less

@@ -0,0 +1,15 @@
+/* nova-werun/pages/my-circle/index.wxss */
+.all{
+    width: 100vw;
+    position: relative;
+    .trends{
+        width: 100%;
+        border-top: grey solid 1px;
+        overflow-y: scroll;
+        padding-top: 20rpx;
+    }
+    .trends::-webkit-scrollbar {
+        display: none; /* 隐藏滚动条 */
+    }
+
+}

+ 9 - 0
nova-werun/pages/my-circle/index.wxml

@@ -0,0 +1,9 @@
+<!--nova-werun/pages/my-circle/index.wxml-->
+<nav type="back" title="我的动态" background-color="{{'#87ceeb'}}" front-color="{{'#ffffff'}}"></nav>
+<view class="all" style="height: {{contentHeight}}rpx;">
+    <view class="trends" style="height: {{contentHeight}}rpx;">
+        <block wx:for="{{cardList}}" wx:key="{{item.objectId}}">
+            <circle-card bindonChange="onChange" objectId='{{item.objectId}}' type='surface' permission='delete'></circle-card>
+        </block>
+    </view>
+</view>

+ 1 - 0
nova-werun/pages/my-circle/index.wxss

@@ -0,0 +1 @@
+.all{width:100vw;position:relative}.all .trends{width:100%;border-top:grey solid 1px;overflow-y:scroll;padding-top:20rpx}.all .trends::-webkit-scrollbar{display:none}